Changeset 166572 in webkit

Timestamp:

Apr 1, 2014 1:34:12 AM (10 years ago)

Author:

eunmi15.lee@samsung.com

Message:

[CoordinatedGraphics] Content scale factor should not be applied to draw contents when fixed layout is not used.
​https://bugs.webkit.org/show_bug.cgi?id=130962

Reviewed by Gyuyoung Kim.

Delegating scaling is turned off when fixed layout is not used in the
coordinated graphics, so page scale factor is applied to the contents
directly.
In that case, we should not apply page scale factor to coordinated
graphics to draw contents and calculate visible content rect.

Currently, page scale factor is applied twice to the coordinated
graphics and contents, so result of scaling is abnormal.

• UIProcess/CoordinatedGraphics/WebView.cpp:

(WebKit::WebView::transformToScene):
(WebKit::WebView::visibleContentsSize):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-01  Eunmi Lee  <eunmi15.lee@samsung.com>
+
+        [CoordinatedGraphics] Content scale factor should not be applied to draw contents when fixed layout is not used.
+        https://bugs.webkit.org/show_bug.cgi?id=130962
+
+        Reviewed by Gyuyoung Kim.
+
+        Delegating scaling is turned off when fixed layout is not used in the
+        coordinated graphics, so page scale factor is applied to the contents
+        directly.
+        In that case, we should not apply page scale factor to coordinated
+        graphics to draw contents and calculate visible content rect.
+
+        Currently, page scale factor is applied twice to the coordinated
+        graphics and contents, so result of scaling is abnormal.
+
+        * UIProcess/CoordinatedGraphics/WebView.cpp:
+        (WebKit::WebView::transformToScene):
+        (WebKit::WebView::visibleContentsSize):
+
 2014-04-01  Ryuan Choi  <ryuan.choi@samsung.com>
 

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

@@ -235 +235 @@
 {
     FloatPoint position = -m_contentPosition;
-    float effectiveScale = contentScaleFactor() * m_page->deviceScaleFactor();
+    float effectiveScale = m_page->deviceScaleFactor();
+    if (m_page->useFixedLayout())
+        effectiveScale *= contentScaleFactor();
     position.scale(effectiveScale, effectiveScale);
 
@@ -275 +277 @@
 {
     FloatSize visibleContentsSize(dipSize());
-    visibleContentsSize.scale(1 / contentScaleFactor());
+    if (m_page->useFixedLayout())
+        visibleContentsSize.scale(1 / contentScaleFactor());
 
     return visibleContentsSize;