<!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>[167138] 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/167138">167138</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-04-11 11:58:07 -0700 (Fri, 11 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pipe initial scale factor to TileController
https://bugs.webkit.org/show_bug.cgi?id=131521
Reviewed by Tim Horton.
Source/WebCore:
* WebCore.exp.in:
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::setZoomedOutPageScaleFactor):
* page/Page.h:
(WebCore::Page::zoomedOutPageScaleFactor):
* platform/graphics/GraphicsLayerClient.h:
(WebCore::GraphicsLayerClient::zoomedOutPageScaleFactor):
* platform/graphics/TiledBacking.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::updateContentsScale):
* platform/graphics/ca/GraphicsLayerCA.h:
* platform/graphics/ca/mac/TileController.h:
* platform/graphics/ca/mac/TileController.mm:
(WebCore::TileController::TileController):
(WebCore::TileController::setContentsScale):
(WebCore::TileController::setZoomedOutContentsScale):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::zoomedOutPageScaleFactor):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::zoomedOutPageScaleFactor):
* rendering/RenderLayerCompositor.h:
Source/WebKit2:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::viewportConfigurationChanged):</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="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth">trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingh">trunk/Source/WebCore/platform/graphics/TiledBacking.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h</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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/ChangeLog 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-04-11 Antti Koivisto <antti@apple.com>
+
+ Pipe initial scale factor to TileController
+ https://bugs.webkit.org/show_bug.cgi?id=131521
+
+ Reviewed by Tim Horton.
+
+ * WebCore.exp.in:
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::setZoomedOutPageScaleFactor):
+ * page/Page.h:
+ (WebCore::Page::zoomedOutPageScaleFactor):
+ * platform/graphics/GraphicsLayerClient.h:
+ (WebCore::GraphicsLayerClient::zoomedOutPageScaleFactor):
+ * platform/graphics/TiledBacking.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::updateContentsScale):
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ * platform/graphics/ca/mac/TileController.h:
+ * platform/graphics/ca/mac/TileController.mm:
+ (WebCore::TileController::TileController):
+ (WebCore::TileController::setContentsScale):
+ (WebCore::TileController::setZoomedOutContentsScale):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::zoomedOutPageScaleFactor):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::zoomedOutPageScaleFactor):
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2014-04-10 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> Heap-use-after-free in WebCore::SpeechSynthesisUtterance::startTime
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -1072,6 +1072,7 @@
</span><span class="cx"> __ZN7WebCore4Page25suspendScriptedAnimationsEv
</span><span class="cx"> __ZN7WebCore4Page27enableLegacyPrivateBrowsingEb
</span><span class="cx"> __ZN7WebCore4Page27invalidateStylesForAllLinksEv
</span><ins>+__ZN7WebCore4Page27setZoomedOutPageScaleFactorEf
</ins><span class="cx"> __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb
</span><span class="cx"> __ZN7WebCore4Page33synchronousScrollingReasonsAsTextEv
</span><span class="cx"> __ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/page/Page.cpp 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -158,6 +158,7 @@
</span><span class="cx"> , m_areMemoryCacheClientCallsEnabled(true)
</span><span class="cx"> , m_mediaVolume(1)
</span><span class="cx"> , m_pageScaleFactor(1)
</span><ins>+ , m_zoomedOutPageScaleFactor(0)
</ins><span class="cx"> , m_deviceScaleFactor(1)
</span><span class="cx"> , m_topContentInset(0)
</span><span class="cx"> , m_suppressScrollbarAnimations(false)
</span><span class="lines">@@ -690,6 +691,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Page::setZoomedOutPageScaleFactor(float scale)
+{
+ if (m_zoomedOutPageScaleFactor == scale)
+ return;
+ m_zoomedOutPageScaleFactor = scale;
+
+ mainFrame().deviceOrPageScaleFactorChanged();
+}
+
</ins><span class="cx"> void Page::setPageScaleFactor(float scale, const IntPoint& origin)
</span><span class="cx"> {
</span><span class="cx"> Document* document = mainFrame().document();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/page/Page.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -275,6 +275,9 @@
</span><span class="cx"> void setPageScaleFactor(float scale, const IntPoint& origin);
</span><span class="cx"> float pageScaleFactor() const { return m_pageScaleFactor; }
</span><span class="cx">
</span><ins>+ void setZoomedOutPageScaleFactor(float);
+ float zoomedOutPageScaleFactor() const { return m_zoomedOutPageScaleFactor; }
+
</ins><span class="cx"> float deviceScaleFactor() const { return m_deviceScaleFactor; }
</span><span class="cx"> void setDeviceScaleFactor(float);
</span><span class="cx">
</span><span class="lines">@@ -490,6 +493,7 @@
</span><span class="cx"> float m_mediaVolume;
</span><span class="cx">
</span><span class="cx"> float m_pageScaleFactor;
</span><ins>+ float m_zoomedOutPageScaleFactor;
</ins><span class="cx"> float m_deviceScaleFactor;
</span><span class="cx">
</span><span class="cx"> float m_topContentInset;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> virtual float deviceScaleFactor() const { return 1; }
</span><span class="cx"> // Page scale factor.
</span><span class="cx"> virtual float pageScaleFactor() const { return 1; }
</span><ins>+ virtual float zoomedOutPageScaleFactor() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> virtual float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const { return 1; }
</span><span class="cx"> virtual bool paintsOpaquelyAtNonIntegralScales(const GraphicsLayer*) const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBacking.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/TiledBacking.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -88,6 +88,9 @@
</span><span class="cx"> virtual int leftMarginWidth() const = 0;
</span><span class="cx"> virtual int rightMarginWidth() const = 0;
</span><span class="cx">
</span><ins>+ virtual void setZoomedOutContentsScale(float) = 0;
+ virtual float zoomedOutContentsScale() const = 0;
+
</ins><span class="cx"> // Includes margins.
</span><span class="cx"> virtual IntRect bounds() const = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -2982,6 +2982,12 @@
</span><span class="cx"> void GraphicsLayerCA::updateContentsScale(float pageScaleFactor)
</span><span class="cx"> {
</span><span class="cx"> float contentsScale = clampedContentsScaleForScale(m_rootRelativeScaleFactor * pageScaleFactor * deviceScaleFactor());
</span><ins>+
+ if (m_isPageTiledBackingLayer && tiledBacking()) {
+ float zoomedOutScale = m_client->zoomedOutPageScaleFactor() * deviceScaleFactor();
+ tiledBacking()->setZoomedOutContentsScale(zoomedOutScale);
+ }
+
</ins><span class="cx"> if (contentsScale == m_layer->contentsScale())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "PlatformCAAnimation.h"
</span><span class="cx"> #include "PlatformCALayer.h"
</span><span class="cx"> #include "PlatformCALayerClient.h"
</span><ins>+#include "TileController.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscamacTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -147,6 +147,8 @@
</span><span class="cx"> virtual PlatformCALayer* tiledScrollingIndicatorLayer() override;
</span><span class="cx"> virtual void setScrollingModeIndication(ScrollingModeIndication) override;
</span><span class="cx"> virtual void setTileMargins(int marginTop, int marginBottom, int marginLeft, int marginRight) override;
</span><ins>+ virtual void setZoomedOutContentsScale(float) override;
+ virtual float zoomedOutContentsScale() const override { return m_zoomedOutContentsScale; }
</ins><span class="cx">
</span><span class="cx"> void scheduleTileRevalidation(double interval);
</span><span class="cx"> void tileRevalidationTimerFired(Timer<TileController>*);
</span><span class="lines">@@ -169,6 +171,7 @@
</span><span class="cx"> Timer<TileController> m_tileRevalidationTimer;
</span><span class="cx">
</span><span class="cx"> float m_contentsScale;
</span><ins>+ float m_zoomedOutContentsScale;
</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 (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileController.mm 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> , m_tileSize(defaultTileWidth, defaultTileHeight)
</span><span class="cx"> , m_tileRevalidationTimer(this, &TileController::tileRevalidationTimerFired)
</span><span class="cx"> , m_contentsScale(1)
</span><ins>+ , m_zoomedOutContentsScale(0)
</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">@@ -104,10 +105,10 @@
</span><span class="cx">
</span><span class="cx"> void TileController::setContentsScale(float scale)
</span><span class="cx"> {
</span><del>- m_contentsScale = scale;
-
</del><span class="cx"> ASSERT(owningGraphicsLayer()->isCommittingChanges());
</span><span class="cx">
</span><ins>+ m_contentsScale = scale;
+
</ins><span class="cx"> float deviceScaleFactor = owningGraphicsLayer()->platformCALayerDeviceScaleFactor();
</span><span class="cx">
</span><span class="cx"> // The scale we get is the product of the page scale factor and device scale factor.
</span><span class="lines">@@ -123,6 +124,15 @@
</span><span class="cx"> tileGrid().setScale(scale);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TileController::setZoomedOutContentsScale(float scale)
+{
+ ASSERT(owningGraphicsLayer()->isCommittingChanges());
+
+ if (m_zoomedOutContentsScale == scale)
+ return;
+ m_zoomedOutContentsScale = scale;
+}
+
</ins><span class="cx"> void TileController::setAcceleratesDrawing(bool acceleratesDrawing)
</span><span class="cx"> {
</span><span class="cx"> if (m_acceleratesDrawing == acceleratesDrawing)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -2242,6 +2242,11 @@
</span><span class="cx"> return compositor().pageScaleFactor();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+float RenderLayerBacking::zoomedOutPageScaleFactor() const
+{
+ return compositor().zoomedOutPageScaleFactor();
+}
+
</ins><span class="cx"> float RenderLayerBacking::deviceScaleFactor() const
</span><span class="cx"> {
</span><span class="cx"> return compositor().deviceScaleFactor();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx"> virtual bool paintsOpaquelyAtNonIntegralScales(const GraphicsLayer*) const override;
</span><span class="cx">
</span><span class="cx"> virtual float pageScaleFactor() const override;
</span><ins>+ virtual float zoomedOutPageScaleFactor() const override;
</ins><span class="cx"> virtual void didCommitChangesForLayer(const GraphicsLayer*) const override;
</span><span class="cx"> virtual bool getCurrentTransform(const GraphicsLayer*, TransformationMatrix&) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -2702,6 +2702,12 @@
</span><span class="cx"> return page ? page->pageScaleFactor() : 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+float RenderLayerCompositor::zoomedOutPageScaleFactor() const
+{
+ Page* page = this->page();
+ return page ? page->zoomedOutPageScaleFactor() : 0;
+}
+
</ins><span class="cx"> float RenderLayerCompositor::contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -242,6 +242,8 @@
</span><span class="cx"> virtual float deviceScaleFactor() const override;
</span><span class="cx"> virtual float contentsScaleMultiplierForNewTiles(const GraphicsLayer*) const override;
</span><span class="cx"> virtual float pageScaleFactor() const override;
</span><ins>+ virtual float zoomedOutPageScaleFactor() const override;
+
</ins><span class="cx"> virtual void didCommitChangesForLayer(const GraphicsLayer*) const override;
</span><span class="cx"> virtual void notifyFlushBeforeDisplayRefresh(const GraphicsLayer*) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-11 Antti Koivisto <antti@apple.com>
+
+ Pipe initial scale factor to TileController
+ https://bugs.webkit.org/show_bug.cgi?id=131521
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportConfigurationChanged):
+
</ins><span class="cx"> 2014-04-10 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebProcess at com.apple.WebCore: WebCore::AXObjectCache::rootObject + 18
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (167137 => 167138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-11 18:39:22 UTC (rev 167137)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-04-11 18:58:07 UTC (rev 167138)
</span><span class="lines">@@ -1836,12 +1836,15 @@
</span><span class="cx"> {
</span><span class="cx"> setFixedLayoutSize(m_viewportConfiguration.layoutSize());
</span><span class="cx">
</span><ins>+ double initialScale = m_viewportConfiguration.initialScale();
</ins><span class="cx"> double scale;
</span><span class="cx"> if (m_userHasChangedPageScaleFactor)
</span><span class="cx"> scale = std::max(std::min(pageScaleFactor(), m_viewportConfiguration.maximumScale()), m_viewportConfiguration.minimumScale());
</span><span class="cx"> else
</span><del>- scale = m_viewportConfiguration.initialScale();
</del><ins>+ scale = initialScale;
</ins><span class="cx">
</span><ins>+ m_page->setZoomedOutPageScaleFactor(initialScale);
+
</ins><span class="cx"> FrameView& frameView = *m_page->mainFrame().view();
</span><span class="cx"> IntPoint scrollPosition = frameView.scrollPosition();
</span><span class="cx"> if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) {
</span></span></pre>
</div>
</div>
</body>
</html>