Changeset 159864 in webkit

Timestamp:

Nov 28, 2013 11:51:24 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CoordinatedGraphics][WK2] Correct wrong usage of m_contentPosition variable in the WebView.
​https://bugs.webkit.org/show_bug.cgi?id=118548

Patch by Eunmi Lee <​eunmi15.lee@samsung.com> on 2013-11-28
Reviewed by Noam Rosenthal.

CoordinatedGraphics uses its own scaling logic - contents scaling - and
WebView of CoordinatedGraphics maintains contents position by scaling
with contents scaling factor.
However transformToScene() and updateViewportSize() of WebView regard
the contents position as a non-scaled value, so it should be fixed.

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::transformToScene):
(WebKit::WebView::updateViewportSize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/CoordinatedGraphics/WebView.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-28  Eunmi Lee  <eunmi15.lee@samsung.com>
+
+        [CoordinatedGraphics][WK2] Correct wrong usage of m_contentPosition variable in the WebView.
+        https://bugs.webkit.org/show_bug.cgi?id=118548
+
+        Reviewed by Noam Rosenthal.
+
+        CoordinatedGraphics uses its own scaling logic - contents scaling - and
+        WebView of CoordinatedGraphics maintains contents position by scaling
+        with contents scaling factor.
+        However transformToScene() and updateViewportSize() of WebView regard
+        the contents position as a non-scaled value, so it should be fixed.
+
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::transformToScene):
+        (WebKit::WebView::updateViewportSize):
+
 2013-11-28  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

@@ -237 +237 @@
     FloatPoint position = -m_contentPosition;
     float effectiveScale = m_contentScaleFactor * m_page->deviceScaleFactor();
-    position.scale(effectiveScale, effectiveScale);
+    position.scale(m_page->deviceScaleFactor(), m_page->deviceScaleFactor());
 
     TransformationMatrix transform = m_userViewportTransform;
@@ -259 +259 @@
         // Web Process expects sizes in UI units, and not raw device units.
         drawingArea->setSize(roundedIntSize(dipSize()), IntSize(), IntSize());
-        FloatRect visibleContentsRect(contentPosition(), visibleContentsSize());
+        FloatPoint position = contentPosition();
+        position.scale(1 / m_contentScaleFactor, 1 / m_contentScaleFactor);
+        FloatRect visibleContentsRect(position, visibleContentsSize());
         visibleContentsRect.intersect(FloatRect(FloatPoint(), contentsSize()));
         drawingArea->setVisibleContentsRect(visibleContentsRect, FloatPoint());