Source/WebKit/efl: Fix EFL.
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jan 2014 02:04:26 +0000 (02:04 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 24 Jan 2014 02:04:26 +0000 (02:04 +0000)
* ewk/ewk_frame.cpp:
(ewk_frame_visible_content_geometry_get):

Source/WebKit2: Fix GTK.

* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(webkitWebPageDidReceiveMessage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@162671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_frame.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp

index c17fbc2..579b2ac 100644 (file)
@@ -1,3 +1,10 @@
+2014-01-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix EFL.
+
+        * ewk/ewk_frame.cpp:
+        (ewk_frame_visible_content_geometry_get):
+
 2014-01-22  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Remove unnecessary smart method since ewk_view_tiled removed
index aaf5a93..c7ae4fc 100644 (file)
@@ -818,7 +818,7 @@ Eina_Bool ewk_frame_visible_content_geometry_get(const Evas_Object* ewkFrame, Ei
     EWK_FRAME_SD_GET_OR_RETURN(ewkFrame, smartData, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame, false);
     EINA_SAFETY_ON_NULL_RETURN_VAL(smartData->frame->view(), false);
-    WebCore::IntRect rect = smartData->frame->view()->visibleContentRect(includeScrollbars ? WebCore::ScrollableArea::IncludeScrollbars : WebCore::ScrollableArea::ExcludeScrollbars);
+    WebCore::IntRect rect = includeScrollbars ? smartData->frame->view()->visibleContentRectIncludingScrollbars() : smartData->frame->view()->visibleContentRect();
     if (x)
         *x = rect.x();
     if (y)
index 0b470f1..c8a50e8 100644 (file)
@@ -1,3 +1,10 @@
+2014-01-23  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix GTK.
+
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+        (webkitWebPageDidReceiveMessage):
+
 2014-01-23  Anders Carlsson  <andersca@apple.com>
 
         Add an APILoaderClient base class
index ce2ed2f..16bd8eb 100644 (file)
@@ -384,7 +384,7 @@ void webkitWebPageDidReceiveMessage(WebKitWebPage* page, const String& messageNa
             WebCore::IntRect snapshotRect;
             switch (region) {
             case SnapshotRegionVisible:
-                snapshotRect = frameView->visibleContentRect(WebCore::ScrollableArea::ExcludeScrollbars);
+                snapshotRect = frameView->visibleContentRect();
                 break;
             case SnapshotRegionFullDocument:
                 snapshotRect = WebCore::IntRect(WebCore::IntPoint(0, 0), frameView->contentsSize());