Changeset 161100 in webkit

Timestamp:

Dec 27, 2013 12:44:24 AM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL][WK2] MiniBrowser scale up/down infinitely after r161087
​https://bugs.webkit.org/show_bug.cgi?id=126254

Reviewed by Gyuyoung Kim.

After r161087, contentScaleFactor of WebView is synced with pageScaleFactor
of WebPage. It means that WKViewGetContentScaleFactor might not be same
with PageViewportController's current scale value until received PageScaleFactorDidChange.

• UIProcess/efl/PageViewportControllerClientEfl.cpp:

(WebKit::PageViewportControllerClientEfl::setViewportPosition):
Use controller's current scale just to update and sync the position.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/efl/PageViewportControllerClientEfl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-27  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL][WK2] MiniBrowser scale up/down infinitely after r161087
+        https://bugs.webkit.org/show_bug.cgi?id=126254
+
+        Reviewed by Gyuyoung Kim.
+
+        After r161087, contentScaleFactor of WebView is synced with pageScaleFactor
+        of WebPage. It means that WKViewGetContentScaleFactor might not be same
+        with PageViewportController's current scale value until received PageScaleFactorDidChange.
+
+        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
+        (WebKit::PageViewportControllerClientEfl::setViewportPosition):
+        Use controller's current scale just to update and sync the position.
+
 2013-12-26  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp

@@ -54 +54 @@
     m_contentPosition = contentsPoint;
 
-    float scaleFactor = WKViewGetContentScaleFactor(m_view->wkView());
     WKViewSetContentPosition(m_view->wkView(), WKPointMake(contentsPoint.x(), contentsPoint.y()));
 
-    m_controller->didChangeContentsVisibility(m_contentPosition, scaleFactor);
+    m_controller->didChangeContentsVisibility(m_contentPosition, m_controller->currentScale());
 }