<!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>[166748] 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/166748">166748</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-04-03 15:44:58 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Pixelated WebView when display is changed from hiDPI to regularDPI
https://bugs.webkit.org/show_bug.cgi?id=131185
Reviewed by Tim Horton.
<a href="http://trac.webkit.org/projects/webkit/changeset/166309">r166309</a> added a short circuit in GraphicsLayerCA::updateContentsScale()
when the scale didn't change. This broke layers which expected to
unconditionally receive a setContentsScale(), namely the WebTiledBackingLayer
which owns the TileController. WebTiledBackingLayer overrode -setContentsScale:
to pass the scale down to the TileController; however, it didn't override
-contentsScale, and it mucked with the scale passed in.
Fix by having setting and fetching contentsScale on a WebTiledBackingLayer
work as expected. Also rename the TileController functions to mirror the
CALayer functions better.
* WebCore.exp.in:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateContentsScale):
* platform/graphics/ca/mac/TileController.h:
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::TileController):
(WebCore::TileController::contentsScale):
(WebCore::TileController::setContentsScale):
(WebCore::TileController::scale): Deleted.
(WebCore::TileController::setScale): Deleted.
* platform/graphics/ca/mac/WebTiledBackingLayer.mm:
(-[WebTiledBackingLayer setContentsScale:]):
(-[WebTiledBackingLayer contentsScale]):
Source/WebKit2: Pixelated WebView when display is changed from hiDPI to regularDPI
https://bugs.webkit.org/show_bug.cgi?id=131185
<rdar://problem/16512184&16503714>
Reviewed by Tim Horton.
TileController function was renamed.
* WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
(WebKit::PlatformCALayerRemoteTiledBacking::setContentsScale):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllerh">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacTileControllermm">trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscamacWebTiledBackingLayermm">trunk/Source/WebCore/platform/graphics/ca/mac/WebTiledBackingLayer.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingcpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebCore/ChangeLog 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2014-04-03 Simon Fraser <simon.fraser@apple.com>
+
+ Pixelated WebView when display is changed from hiDPI to regularDPI
+ https://bugs.webkit.org/show_bug.cgi?id=131185
+
+ Reviewed by Tim Horton.
+
+ r166309 added a short circuit in GraphicsLayerCA::updateContentsScale()
+ when the scale didn't change. This broke layers which expected to
+ unconditionally receive a setContentsScale(), namely the WebTiledBackingLayer
+ which owns the TileController. WebTiledBackingLayer overrode -setContentsScale:
+ to pass the scale down to the TileController; however, it didn't override
+ -contentsScale, and it mucked with the scale passed in.
+
+ Fix by having setting and fetching contentsScale on a WebTiledBackingLayer
+ work as expected. Also rename the TileController functions to mirror the
+ CALayer functions better.
+
+ * WebCore.exp.in:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateContentsScale):
+ * platform/graphics/ca/mac/TileController.h:
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::TileController):
+ (WebCore::TileController::contentsScale):
+ (WebCore::TileController::setContentsScale):
+ (WebCore::TileController::scale): Deleted.
+ (WebCore::TileController::setScale): Deleted.
+ * platform/graphics/ca/mac/WebTiledBackingLayer.mm:
+ (-[WebTiledBackingLayer setContentsScale:]):
+ (-[WebTiledBackingLayer contentsScale]):
+
</ins><span class="cx"> 2014-04-03 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] LineSegment logicalLeft and logicalRight members should be floats
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -432,13 +432,13 @@
</span><span class="cx"> __ZN7WebCore14TileController14setTilesOpaqueEb
</span><span class="cx"> __ZN7WebCore14TileController15containerLayersEv
</span><span class="cx"> __ZN7WebCore14TileController15setNeedsDisplayEv
</span><ins>+__ZN7WebCore14TileController16setContentsScaleEf
</ins><span class="cx"> __ZN7WebCore14TileController21setAcceleratesDrawingEb
</span><span class="cx"> __ZN7WebCore14TileController21setNeedsDisplayInRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore14TileController23setTileDebugBorderColorENS_5ColorE
</span><span class="cx"> __ZN7WebCore14TileController23setTileDebugBorderWidthEf
</span><span class="cx"> __ZN7WebCore14TileController27tileCacheLayerBoundsChangedEv
</span><span class="cx"> __ZN7WebCore14TileController6createEPNS_15PlatformCALayerE
</span><del>-__ZN7WebCore14TileController8setScaleEf
</del><span class="cx"> __ZN7WebCore14decodeHostNameEP8NSString
</span><span class="cx"> __ZN7WebCore14encodeHostNameEP8NSString
</span><span class="cx"> __ZN7WebCore14endOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> void setNeedsDisplay();
</span><span class="cx"> void setNeedsDisplayInRect(const IntRect&);
</span><span class="cx">
</span><del>- void setScale(float);
- float scale() const;
</del><ins>+ void setContentsScale(float);
+ float contentsScale() const { return m_contentsScale; }
</ins><span class="cx">
</span><span class="cx"> bool acceleratesDrawing() const { return m_acceleratesDrawing; }
</span><span class="cx"> void setAcceleratesDrawing(bool);
</span><span class="lines">@@ -191,6 +191,7 @@
</span><span class="cx">
</span><span class="cx"> RepaintCountMap m_tileRepaintCounts;
</span><span class="cx">
</span><ins>+ float m_contentsScale;
</ins><span class="cx"> float m_deviceScaleFactor;
</span><span class="cx">
</span><span class="cx"> TileCoverage m_tileCoverage;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> , m_tileSize(defaultTileWidth, defaultTileHeight)
</span><span class="cx"> , m_exposedRect(FloatRect::infiniteRect())
</span><span class="cx"> , m_tileRevalidationTimer(this, &TileController::tileRevalidationTimerFired)
</span><ins>+ , m_contentsScale(1)
</ins><span class="cx"> , m_deviceScaleFactor(1)
</span><span class="cx"> , m_tileCoverage(CoverageForVisibleArea)
</span><span class="cx"> , m_marginTop(0)
</span><span class="lines">@@ -156,13 +157,10 @@
</span><span class="cx"> return owningGraphicsLayer()->platformCALayerShowRepaintCounter(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float TileController::scale() const
</del><ins>+void TileController::setContentsScale(float scale)
</ins><span class="cx"> {
</span><del>- return tileGrid().scale();
-}
-
-void TileController::setScale(float scale)
-{
</del><ins>+ m_contentsScale = scale;
+
</ins><span class="cx"> ASSERT(owningGraphicsLayer()->isCommittingChanges());
</span><span class="cx">
</span><span class="cx"> float deviceScaleFactor = platformCALayerDeviceScaleFactor();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacWebTiledBackingLayermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/WebTiledBackingLayer.mm (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/WebTiledBackingLayer.mm 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/WebTiledBackingLayer.mm 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -115,9 +115,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)setContentsScale:(CGFloat)contentsScale
</span><span class="cx"> {
</span><del>- _tileController->setScale(contentsScale);
</del><ins>+ _tileController->setContentsScale(contentsScale);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (CGFloat)contentsScale
+{
+ return _tileController->contentsScale();
+}
+
</ins><span class="cx"> - (WebCore::TiledBacking*)tiledBacking
</span><span class="cx"> {
</span><span class="cx"> return _tileController.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-03 Simon Fraser <simon.fraser@apple.com>
+
+ Pixelated WebView when display is changed from hiDPI to regularDPI
+ https://bugs.webkit.org/show_bug.cgi?id=131185
+ <rdar://problem/16512184&16503714>
+
+ Reviewed by Tim Horton.
+
+ TileController function was renamed.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp:
+ (WebKit::PlatformCALayerRemoteTiledBacking::setContentsScale):
+
</ins><span class="cx"> 2014-04-03 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Promote user script SPI to API
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteTiledBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp (166747 => 166748)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2014-04-03 22:34:34 UTC (rev 166747)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemoteTiledBacking.cpp 2014-04-03 22:44:58 UTC (rev 166748)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemoteTiledBacking::setContentsScale(float scale)
</span><span class="cx"> {
</span><del>- m_tileController->setScale(scale);
</del><ins>+ m_tileController->setContentsScale(scale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemoteTiledBacking::setBorderWidth(float borderWidth)
</span></span></pre>
</div>
</div>
</body>
</html>