<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170953] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170953">170953</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-09 22:06:30 -0700 (Wed, 09 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageChromeClienth">trunk/Source/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontMacmm">trunk/Source/WebCore/platform/graphics/mac/FontMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-07-09 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Curl] Cache entry invalidated too early.
</span></span></pre></div>
<a id="trunkSourceWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ChromeClient.h (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ChromeClient.h 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebCore/page/ChromeClient.h 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -287,6 +287,7 @@
</span><span class="cx"> virtual void elementDidBlur(const Node*) { };
</span><span class="cx">
</span><span class="cx"> virtual bool shouldPaintEntireContents() const { return false; }
</span><ins>+ virtual bool hasStablePageScaleFactor() const { return true; }
</ins><span class="cx">
</span><span class="cx"> // Allows ports to customize the type of graphics layers created by this page.
</span><span class="cx"> virtual GraphicsLayerFactory* graphicsLayerFactory() const { return nullptr; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -303,6 +303,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CGContextSetFontSize(cgContext, 1);
</span><ins>+ CGContextSetShouldSubpixelQuantizeFonts(cgContext, context->shouldSubpixelQuantizeFonts());
</ins><span class="cx"> #else
</span><span class="cx"> wkSetCGFontRenderingMode(cgContext, drawFont, context->shouldSubpixelQuantizeFonts());
</span><span class="cx"> if (drawFont)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -3755,7 +3755,10 @@
</span><span class="cx"> // FIXME: We shouldn't have to disable subpixel quantization for overflow clips or subframes once we scroll those
</span><span class="cx"> // things on the scrolling thread.
</span><span class="cx"> bool contentsScrollByPainting = (renderer().hasOverflowClip() && !usesCompositedScrolling()) || (renderer().frame().ownerElement());
</span><del>- if (scrollingOnMainThread || contentsScrollByPainting) {
</del><ins>+ bool isZooming = false;
+ if (Page* page = renderer().frame().page())
+ isZooming = !page->chrome().client().hasStablePageScaleFactor();
+ if (scrollingOnMainThread || contentsScrollByPainting || isZooming) {
</ins><span class="cx"> didQuantizeFonts = context->shouldSubpixelQuantizeFonts();
</span><span class="cx"> context->setShouldSubpixelQuantizeFonts(false);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-07-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Use UIAlertController API in WKFileUploadPanel instead of SPI
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> virtual void didLayout(LayoutType = NormalLayout) override;
</span><span class="cx"> virtual void didStartOverflowScroll() override;
</span><span class="cx"> virtual void didEndOverflowScroll() override;
</span><ins>+ virtual bool hasStablePageScaleFactor() const override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: See <rdar://problem/5975559>
</span><span class="cx"> virtual void suppressFormNotifications() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -100,6 +100,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebChromeClient::hasStablePageScaleFactor() const
+{
+ return m_page->hasStablePageScaleFactor();
+}
+
</ins><span class="cx"> void WebChromeClient::suppressFormNotifications()
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -298,6 +298,7 @@
</span><span class="cx"> , m_hasReceivedVisibleContentRectsAfterDidCommitLoad(false)
</span><span class="cx"> , m_scaleWasSetByUIProcess(false)
</span><span class="cx"> , m_userHasChangedPageScaleFactor(false)
</span><ins>+ , m_hasStablePageScaleFactor(true)
</ins><span class="cx"> , m_userIsInteracting(false)
</span><span class="cx"> , m_hasPendingBlurNotification(false)
</span><span class="cx"> , m_useTestingViewportConfiguration(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -464,6 +464,7 @@
</span><span class="cx"> double minimumPageScaleFactor() const;
</span><span class="cx"> double maximumPageScaleFactor() const;
</span><span class="cx"> bool allowsUserScaling() const;
</span><ins>+ bool hasStablePageScaleFactor() const { return m_hasStablePageScaleFactor; }
</ins><span class="cx">
</span><span class="cx"> void handleTap(const WebCore::IntPoint&);
</span><span class="cx"> void potentialTapAtPosition(uint64_t requestID, const WebCore::FloatPoint&);
</span><span class="lines">@@ -1226,6 +1227,7 @@
</span><span class="cx"> bool m_hasReceivedVisibleContentRectsAfterDidCommitLoad;
</span><span class="cx"> bool m_scaleWasSetByUIProcess;
</span><span class="cx"> bool m_userHasChangedPageScaleFactor;
</span><ins>+ bool m_hasStablePageScaleFactor;
</ins><span class="cx"> bool m_userIsInteracting;
</span><span class="cx"> bool m_hasPendingBlurNotification;
</span><span class="cx"> bool m_useTestingViewportConfiguration;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (170952 => 170953)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-10 04:38:13 UTC (rev 170952)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-07-10 05:06:30 UTC (rev 170953)
</span><span class="lines">@@ -2447,10 +2447,14 @@
</span><span class="cx">
</span><span class="cx"> IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());
</span><span class="cx">
</span><ins>+ if (!m_hasStablePageScaleFactor && visibleContentRectUpdateInfo.inStableState())
+ m_hasStablePageScaleFactor = true;
+
</ins><span class="cx"> float floatBoundedScale = boundedScale;
</span><span class="cx"> bool hasSetPageScale = false;
</span><span class="cx"> if (floatBoundedScale != currentScale) {
</span><span class="cx"> m_scaleWasSetByUIProcess = true;
</span><ins>+ m_hasStablePageScaleFactor = visibleContentRectUpdateInfo.inStableState();
</ins><span class="cx">
</span><span class="cx"> m_dynamicSizeUpdateHistory.clear();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>