<!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>[160050] 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/160050">160050</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 15:25:19 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some iOS-related documentScale code
https://bugs.webkit.org/show_bug.cgi?id=125194
Source/WebCore:
Reviewed by Enrica Casucci.
Remove exports of nonexistent documentScale-related functions on Frame.
* WebCore.exp.in:
Source/WebKit2:
Reviewed by Enrica Casucci.
Upstream bits of removal of Frame::documentScale on iOS.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Whitespace.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::didFinishZooming): Don't call setDocumentScale().
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Remove minimumDocumentScale().
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: Ditto.
(WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea): We delegate page scaling on iOS.
(WebKit::RemoteLayerTreeDrawingArea::setDeviceScaleFactor):</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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-03 Simon Fraser <simon.fraser@apple.com>
+
+ Remove some iOS-related documentScale code
+ https://bugs.webkit.org/show_bug.cgi?id=125194
+
+ Reviewed by Enrica Casucci.
+
+ Remove exports of nonexistent documentScale-related functions on Frame.
+
+ * WebCore.exp.in:
+
</ins><span class="cx"> 2013-12-03 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix regression caused by r158599
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -2313,7 +2313,6 @@
</span><span class="cx"> __ZN7WebCore5ColorC1EP7CGColor
</span><span class="cx"> __ZN7WebCore5EventC1ERKN3WTF12AtomicStringEbb
</span><span class="cx"> __ZN7WebCore5Frame15setTimersPausedEb
</span><del>-__ZN7WebCore5Frame20documentScaleChangedEv
</del><span class="cx"> __ZN7WebCore5Frame20setViewportArgumentsERKNS_17ViewportArgumentsE
</span><span class="cx"> __ZN7WebCore5Frame21deepestNodeAtLocationEP7CGPoint
</span><span class="cx"> __ZN7WebCore5Frame21viewportOffsetChangedEv
</span><span class="lines">@@ -2373,7 +2372,6 @@
</span><span class="cx"> __ZNK7WebCore17RenderTextControl23visiblePositionForIndexEi
</span><span class="cx"> __ZNK7WebCore4Node18rendererIsEditableENS0_13EditableLevelE
</span><span class="cx"> __ZNK7WebCore5Frame12updateLayoutEv
</span><del>-__ZNK7WebCore5Frame13documentScaleEv
</del><span class="cx"> __ZNK7WebCore5Frame15innerLineHeightEP7DOMNode
</span><span class="cx"> __ZNK7WebCore5Frame15preferredHeightEv
</span><span class="cx"> __ZNK7WebCore5Frame16rectForSelectionERNS_16VisibleSelectionE
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-03 Simon Fraser <simon.fraser@apple.com>
+
+ Remove some iOS-related documentScale code
+ https://bugs.webkit.org/show_bug.cgi?id=125194
+
+ Reviewed by Enrica Casucci.
+
+ Upstream bits of removal of Frame::documentScale on iOS.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Whitespace.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::didFinishZooming): Don't call setDocumentScale().
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Remove minimumDocumentScale().
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: Ditto.
+ (WebKit::RemoteLayerTreeDrawingArea::RemoteLayerTreeDrawingArea): We delegate page scaling on iOS.
+ (WebKit::RemoteLayerTreeDrawingArea::setDeviceScaleFactor):
+
</ins><span class="cx"> 2013-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> PageBannerClientImpl should be an API::Client
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -2440,7 +2440,6 @@
</span><span class="cx"> settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
</span><span class="cx"> settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
</span><span class="cx">
</span><del>-
</del><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -749,7 +749,6 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::didFinishZooming(float newScale)
</span><span class="cx"> {
</span><del>- m_page->mainFrame().setDocumentScale(newScale);
</del><span class="cx"> m_page->setPageScaleFactor(newScale, m_page->mainFrame().view()->scrollPosition());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const OVERRIDE { }
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void setDeviceScaleFactor(float) OVERRIDE;
</span><del>- virtual float minimumDocumentScale() const OVERRIDE;
</del><span class="cx"> virtual bool allowCompositingLayerVisualDegradation() const OVERRIDE { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (160049 => 160050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2013-12-03 23:21:03 UTC (rev 160049)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2013-12-03 23:25:19 UTC (rev 160050)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx"> , m_remoteLayerTreeContext(std::make_unique<RemoteLayerTreeContext>(webPage))
</span><span class="cx"> {
</span><span class="cx"> webPage->corePage()->settings().setForceCompositingMode(true);
</span><ins>+#if PLATFORM(IOS)
+ webPage->corePage()->settings().setDelegatesPageScaling(true);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeDrawingArea::~RemoteLayerTreeDrawingArea()
</span><span class="lines">@@ -192,11 +195,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_webPage->setDeviceScaleFactor(deviceScaleFactor);
</span><span class="cx"> }
</span><del>-
-float RemoteLayerTreeDrawingArea::minimumDocumentScale() const
-{
- return m_webPage->corePage()->mainFrame().minimumDocumentScale();
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void RemoteLayerTreeDrawingArea::setLayerTreeStateIsFrozen(bool isFrozen)
</span></span></pre>
</div>
</div>
</body>
</html>