Changeset 71360 in webkit

Timestamp:

Nov 4, 2010 3:38:16 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-04 Ryuan Choi <​ryuan.choi@samsung.com>

Reviewed by Adam Barth.

[EFL] Reflect latest EFL changes related to stride.
​https://bugs.webkit.org/show_bug.cgi?id=48971

Remove adjustment code to compare stride of cairo_image_surfece and evas_object_image, as following changes of latest EFL.

• ewk/ewk_util.cpp: (ewk_util_image_from_cairo_surface_add):

Location:

trunk/WebKit/efl

Files:

• ChangeLog (modified) (1 diff)
• ewk/ewk_util.cpp (modified) (1 diff)

trunk/WebKit/efl/ChangeLog

@@ +1 @@
+2010-11-04  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Adam Barth.
+
+        [EFL] Reflect latest EFL changes related to stride.
+        https://bugs.webkit.org/show_bug.cgi?id=48971
+
+        Remove adjustment code to compare stride of cairo_image_surfece and evas_object_image, as following changes of latest EFL.
+
+        * ewk/ewk_util.cpp:
+        (ewk_util_image_from_cairo_surface_add):
+
 2010-11-03  Daniel Bates  <dbates@rim.com>
 

trunk/WebKit/efl/ewk/ewk_util.cpp

@@ -82 +82 @@
     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;