[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[paroga at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit c9b0ca94763e1a523b777b1903516b0d1144176c
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 15 02:22:03 2011 +0000

    2011-01-14  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed. Try to fix EFL build.
    
            * ewk/ewk_frame.cpp:
            (ewk_frame_scroll_add): Added WebCore namespace to IntSize.
            * ewk/ewk_view.cpp:
            (_ewk_view_viewport_attributes_compute): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75863 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index dbc93f4..5dcc5cf 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed. Try to fix EFL build.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_scroll_add): Added WebCore namespace to IntSize.
+        * ewk/ewk_view.cpp:
+        (_ewk_view_viewport_attributes_compute): Ditto.
+
 2011-01-14  Tony Gentilcore  <tonyg at chromium.org>
 
         Unreviewed build fix.
diff --git a/WebKit/efl/ewk/ewk_frame.cpp b/WebKit/efl/ewk/ewk_frame.cpp
index fa7075c..f41caae 100644
--- a/WebKit/efl/ewk/ewk_frame.cpp
+++ b/WebKit/efl/ewk/ewk_frame.cpp
@@ -1186,7 +1186,7 @@ ewk_frame_scroll_add(Evas_Object* o, int dx, int dy)
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame->view(), EINA_FALSE);
-    sd->frame->view()->scrollBy(IntSize(dx, dy));
+    sd->frame->view()->scrollBy(WebCore::IntSize(dx, dy));
     return EINA_TRUE;
 }
 
diff --git a/WebKit/efl/ewk/ewk_view.cpp b/WebKit/efl/ewk/ewk_view.cpp
index b96769b..ce09f64 100644
--- a/WebKit/efl/ewk/ewk_view.cpp
+++ b/WebKit/efl/ewk/ewk_view.cpp
@@ -1022,7 +1022,7 @@ static WebCore::ViewportAttributes _ewk_view_viewport_attributes_compute(Evas_Ob
     int device_width = (int) priv->page->chrome()->client()->windowRect().width();
     int device_height = (int) priv->page->chrome()->client()->windowRect().height();
 
-    IntSize available_size = IntSize(available_width, available_height);
+    WebCore::IntSize available_size = WebCore::IntSize(available_width, available_height);
     WebCore::ViewportAttributes attributes = WebCore::computeViewportAttributes(priv->viewport_arguments, desktop_width, device_width, device_height, device_dpi, available_size);
 
     return attributes;

-- 
WebKit Debian packaging