Changeset 170953 in webkit

Timestamp:

Jul 9, 2014, 10:06:30 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

[iOS][WK2] Disable text quantization while actively changing the page's scale factor
​https://bugs.webkit.org/show_bug.cgi?id=134781

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2014-07-09
Reviewed by Tim Horton and Myles C. Maxfield.

Source/WebCore:
Query the chrome client to setup quantization on each layers.

• page/ChromeClient.h:

(WebCore::ChromeClient::hasStablePageScaleFactor):

• platform/graphics/mac/FontMac.mm:

(WebCore::Font::drawGlyphs):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::setupFontSubpixelQuantization):

Source/WebKit2:
While zooming a page, text quantization causes glyphs to "move" in order to get to the closest
boundary for the current scale factor.

We do not want this to happen while dynamically changing the scale factor because the effect
is visible. To avoid this, we disable text quantization if the page's scale factor changes
in response to a non-stable contentRect update.

• WebProcess/WebCoreSupport/WebChromeClient.h:
• WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:

(WebKit::WebChromeClient::hasStablePageScaleFactor):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):

• WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::hasStablePageScaleFactor):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::updateVisibleContentRects):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ChromeClient.h (modified) (1 diff)
• WebCore/platform/graphics/mac/FontMac.mm (modified) (1 diff)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-09  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Disable text quantization while actively changing the page's scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=134781
+
+        Reviewed by Tim Horton and Myles C. Maxfield.
+
+        Query the chrome client to setup quantization on each layers.
+
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::hasStablePageScaleFactor):
+        * platform/graphics/mac/FontMac.mm:
+        (WebCore::Font::drawGlyphs):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::setupFontSubpixelQuantization):
+
 2014-07-09  peavo@outlook.com  <peavo@outlook.com>
 

trunk/Source/WebCore/page/ChromeClient.h

@@ -288 +288 @@
     
     virtual bool shouldPaintEntireContents() const { return false; }
+    virtual bool hasStablePageScaleFactor() const { return true; }
 
     // Allows ports to customize the type of graphics layers created by this page.

trunk/Source/WebCore/platform/graphics/mac/FontMac.mm

@@ -304 +304 @@
 #if PLATFORM(IOS)
     CGContextSetFontSize(cgContext, 1);
+    CGContextSetShouldSubpixelQuantizeFonts(cgContext, context->shouldSubpixelQuantizeFonts());
 #else
     wkSetCGFontRenderingMode(cgContext, drawFont, context->shouldSubpixelQuantizeFonts());

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3756 +3756 @@
     // things on the scrolling thread.
     bool contentsScrollByPainting = (renderer().hasOverflowClip() && !usesCompositedScrolling()) || (renderer().frame().ownerElement());
-    if (scrollingOnMainThread || contentsScrollByPainting) {
+    bool isZooming = false;
+    if (Page* page = renderer().frame().page())
+        isZooming = !page->chrome().client().hasStablePageScaleFactor();
+    if (scrollingOnMainThread || contentsScrollByPainting || isZooming) {
         didQuantizeFonts = context->shouldSubpixelQuantizeFonts();
         context->setShouldSubpixelQuantizeFonts(false);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-09  Benjamin Poulain  <bpoulain@apple.com>
+
+        [iOS][WK2] Disable text quantization while actively changing the page's scale factor
+        https://bugs.webkit.org/show_bug.cgi?id=134781
+
+        Reviewed by Tim Horton and Myles C. Maxfield.
+
+        While zooming a page, text quantization causes glyphs to "move" in order to get to the closest
+        boundary for the current scale factor.
+
+        We do not want this to happen while dynamically changing the scale factor because the effect
+        is visible. To avoid this, we disable text quantization if the page's scale factor changes
+        in response to a non-stable contentRect update.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+        (WebKit::WebChromeClient::hasStablePageScaleFactor):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::hasStablePageScaleFactor):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::updateVisibleContentRects):
+
 2014-07-09  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -171 +171 @@
     virtual void didStartOverflowScroll() override;
     virtual void didEndOverflowScroll() override;
+    virtual bool hasStablePageScaleFactor() const override;
 
     // FIXME: See <rdar://problem/5975559>

trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm

@@ -101 +101 @@
 }
 
+bool WebChromeClient::hasStablePageScaleFactor() const
+{
+    return m_page->hasStablePageScaleFactor();
+}
+
 void WebChromeClient::suppressFormNotifications()
 {

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -299 +299 @@
     , m_scaleWasSetByUIProcess(false)
     , m_userHasChangedPageScaleFactor(false)
+    , m_hasStablePageScaleFactor(true)
     , m_userIsInteracting(false)
     , m_hasPendingBlurNotification(false)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -465 +465 @@
     double maximumPageScaleFactor() const;
     bool allowsUserScaling() const;
+    bool hasStablePageScaleFactor() const { return m_hasStablePageScaleFactor; }
 
     void handleTap(const WebCore::IntPoint&);
@@ -1227 +1228 @@
     bool m_scaleWasSetByUIProcess;
     bool m_userHasChangedPageScaleFactor;
+    bool m_hasStablePageScaleFactor;
     bool m_userIsInteracting;
     bool m_hasPendingBlurNotification;

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -2448 +2448 @@
     IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());
 
+    if (!m_hasStablePageScaleFactor && visibleContentRectUpdateInfo.inStableState())
+        m_hasStablePageScaleFactor = true;
+
     float floatBoundedScale = boundedScale;
     bool hasSetPageScale = false;
     if (floatBoundedScale != currentScale) {
         m_scaleWasSetByUIProcess = true;
+        m_hasStablePageScaleFactor = visibleContentRectUpdateInfo.inStableState();
 
         m_dynamicSizeUpdateHistory.clear();