[webkit-changes] [144975] trunk/Source/WebKit2

[commit-queue]

Title: [144975] trunk/Source/WebKit2

Revision

144975

Author

commit-qu...@webkit.org

Date

2013-03-06 13:35:22 -0800 (Wed, 06 Mar 2013)

Log Message

[EFL][WK2] REGRESSION(r143582): API test EWK2UnitTestBase.ewk_view_contents_size_changed failing
https://bugs.webkit.org/show_bug.cgi?id=110608

Patch by Sudarsana Nagineni <sudarsana.nagin...@intel.com> on 2013-03-06
Reviewed by Kenneth Rohde Christiansen.

Test was expecting ContentsSizeChanged signal from ViewClientEfl, but
WebView was not calling client callback if useFixedLayout() is true.

This patch prevent early return if useFixedLayout() is true and call
client callback didChangeContentsSize(), which will emit the signal.

* UIProcess/efl/ViewClientEfl.cpp:
(WebKit::ViewClientEfl::didChangeContentsSize):
* UIProcess/efl/WebView.cpp:
(WebKit::WebView::didChangeContentsSize):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp
• trunk/Source/WebKit2/UIProcess/efl/WebView.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (144974 => 144975)

--- trunk/Source/WebKit2/ChangeLog	2013-03-06 21:25:35 UTC (rev 144974)
+++ trunk/Source/WebKit2/ChangeLog	2013-03-06 21:35:22 UTC (rev 144975)
@@ -1,3 +1,21 @@
+2013-03-06  Sudarsana Nagineni  <sudarsana.nagin...@intel.com>
+
+        [EFL][WK2] REGRESSION(r143582): API test EWK2UnitTestBase.ewk_view_contents_size_changed failing
+        https://bugs.webkit.org/show_bug.cgi?id=110608
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Test was expecting ContentsSizeChanged signal from ViewClientEfl, but
+        WebView was not calling client callback if useFixedLayout() is true.
+
+        This patch prevent early return if useFixedLayout() is true and call
+        client callback didChangeContentsSize(), which will emit the signal.
+
+        * UIProcess/efl/ViewClientEfl.cpp:
+        (WebKit::ViewClientEfl::didChangeContentsSize):
+        * UIProcess/efl/WebView.cpp:
+        (WebKit::WebView::didChangeContentsSize):
+
 2013-03-06  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [WK2][GTK] Fix unit test WebKit2APITests/WebKitWebView/mouse-target

Modified: trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp (144974 => 144975)

--- trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp	2013-03-06 21:25:35 UTC (rev 144974)
+++ trunk/Source/WebKit2/UIProcess/efl/ViewClientEfl.cpp	2013-03-06 21:35:22 UTC (rev 144975)
@@ -27,6 +27,7 @@
 #include "ViewClientEfl.h"
 
 #include "EwkView.h"
+#include "PageViewportController.h" 
 #include <WebKit2/WKString.h>
 #include <WebKit2/WKView.h>
 
@@ -47,7 +48,11 @@
 void ViewClientEfl::didChangeContentsSize(WKViewRef, WKSize size, const void* clientInfo)
 {
     EwkView* ewkView = toEwkView(clientInfo);
-    ewkView->scheduleUpdateDisplay();
+    if (WKPageUseFixedLayout(ewkView->wkPage()))
+        ewkView->pageViewportController()->didChangeContentsSize(toIntSize(size));
+    else
+        ewkView->scheduleUpdateDisplay();
+
     ewkView->smartCallback<ContentsSizeChanged>().call(size);
 }
 

Modified: trunk/Source/WebKit2/UIProcess/efl/WebView.cpp (144974 => 144975)

--- trunk/Source/WebKit2/UIProcess/efl/WebView.cpp	2013-03-06 21:25:35 UTC (rev 144974)
+++ trunk/Source/WebKit2/UIProcess/efl/WebView.cpp	2013-03-06 21:35:22 UTC (rev 144975)
@@ -205,10 +205,6 @@
 
 void WebView::didChangeContentsSize(const WebCore::IntSize& size)
 {
-    if (m_page->useFixedLayout()) {
-        m_ewkView->pageViewportController()->didChangeContentsSize(size);
-        return;
-    }
     m_client.didChangeContentsSize(this, size);
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes