diff options
Diffstat (limited to 'WebKit/efl/ewk')
| -rw-r--r-- | WebKit/efl/ewk/ewk_frame.cpp | 4 | ||||
| -rw-r--r-- | WebKit/efl/ewk/ewk_util.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp index 1395fa5..5076be5 100644 --- a/WebKit/efl/ewk/ewk_frame.cpp +++ b/WebKit/efl/ewk/ewk_frame.cpp @@ -474,7 +474,7 @@ const char* ewk_frame_name_get(const Evas_Object* o) return 0; } - WTF::String s = sd->frame->tree()->name(); + WTF::String s = sd->frame->tree()->uniqueName(); WTF::CString cs = s.utf8(); sd->name = eina_stringshare_add_length(cs.data(), cs.length()); return sd->name; @@ -1623,11 +1623,11 @@ Evas_Object* ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame> } cf = child.get(); - sd->frame->tree()->appendChild(child); if (cf->tree()) cf->tree()->setName(name); else ERR("no tree for child object"); + sd->frame->tree()->appendChild(child); if (!ewk_frame_init(frame, sd->view, cf)) { evas_object_del(frame); diff --git a/WebKit/efl/ewk/ewk_util.cpp b/WebKit/efl/ewk/ewk_util.cpp index bf82695..6830f76 100644 --- a/WebKit/efl/ewk/ewk_util.cpp +++ b/WebKit/efl/ewk/ewk_util.cpp @@ -81,9 +81,9 @@ Evas_Object* ewk_util_image_from_cairo_surface_add(Evas* canvas, cairo_surface_t evas_object_image_size_set(image, w, h); evas_object_image_alpha_set(image, format == CAIRO_FORMAT_ARGB32); - if (evas_object_image_stride_get(image) * 4 != stride) { + if (evas_object_image_stride_get(image) != stride) { ERR("evas' stride %d diverges from cairo's %d.", - evas_object_image_stride_get(image) * 4, stride); + evas_object_image_stride_get(image), stride); evas_object_del(image); return 0; } |