Changeset 139300 in webkit

Timestamp:

Jan 10, 2013 1:59:46 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r139189): pixel alignment must be performed in device units.
​https://bugs.webkit.org/show_bug.cgi?id=106504

Patch by Huang Dongsung <​luxtella@company100.net> on 2013-01-10
Reviewed by Kenneth Rohde Christiansen.

After r139189, pixel alignment is performed in UI units. If deviceScaleFactor is
fractional number, adjusted scroll position can blur non-composited layer.

• UIProcess/PageViewportController.cpp:

(WebKit::PageViewportController::pixelAlignedFloatPoint):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-10  Huang Dongsung  <luxtella@company100.net>
+
+        REGRESSION(r139189): pixel alignment must be performed in device units.
+        https://bugs.webkit.org/show_bug.cgi?id=106504
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        After r139189, pixel alignment is performed in UI units. If deviceScaleFactor is
+        fractional number, adjusted scroll position can blur non-composited layer.
+
+        * UIProcess/PageViewportController.cpp:
+        (WebKit::PageViewportController::pixelAlignedFloatPoint):
+
 2013-01-10  Arnaud Renevier  <a.renevier@sisa.samsung.com>
 

trunk/Source/WebKit2/UIProcess/PageViewportController.cpp

@@ -96 +96 @@
 {
 #if PLATFORM(EFL)
-    if (!isIntegral(m_pageScaleFactor)) {
+    float effectiveScale = m_pageScaleFactor * deviceScaleFactor();
+    if (!isIntegral(effectiveScale)) {
         // To avoid blurryness, modify the position so that it maps into a discrete device position.
         FloatPoint scaledPos(framePosition);
 
         // Scale by the effective scale factor to compute the screen-relative position.
-        scaledPos.scale(m_pageScaleFactor, m_pageScaleFactor);
+        scaledPos.scale(effectiveScale, effectiveScale);
 
         // Round to integer boundaries.
@@ -107 +108 @@
 
         // Convert back to CSS coordinates.
-        alignedPos.scale(1 / m_pageScaleFactor, 1 / m_pageScaleFactor);
+        alignedPos.scale(1 / effectiveScale, 1 / effectiveScale);
 
         return alignedPos;