[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 5963d15caa3069347b4b83fda2e8d6bf0139d5ee
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 22:38:16 2010 +0000

    2010-11-04  Ryuan Choi  <ryuan.choi at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71360 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 9d002f6..b85ddde 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-04  Ryuan Choi  <ryuan.choi at 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 at rim.com>
 
         For unnamed frames, window.name returns a generated name
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;
     }

-- 
WebKit Debian packaging