<!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>[176437] 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/176437">176437</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-20 20:49:13 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the remaining vestiges of minimal-ui
https://bugs.webkit.org/show_bug.cgi?id=138890
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-11-20
Reviewed by Sam Weinig.
Source/WebCore:
In ViewportArguments' setViewportFeature(), I skip the warning for now.
* WebCore.exp.in:
* dom/ViewportArguments.cpp:
(WebCore::setViewportFeature):
* dom/ViewportArguments.h:
(WebCore::ViewportArguments::ViewportArguments):
(WebCore::ViewportArguments::operator==):
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::ViewportConfiguration):
(WebCore::ViewportConfiguration::initialScale):
(WebCore::ViewportConfiguration::minimumScale):
(WebCore::ViewportConfiguration::updateConfiguration):
(WebCore::ViewportConfiguration::viewportArgumentsLength):
(WebCore::ViewportConfiguration::layoutWidth):
(WebCore::ViewportConfiguration::layoutHeight):
(WebCore::ViewportConfigurationTextStream::operator<<):
(WebCore::ViewportConfiguration::description):
(WebCore::ViewportConfiguration::setMinimumLayoutSizeForMinimalUI): Deleted.
(WebCore::ViewportConfiguration::activeMinimumLayoutSizeInScrollViewCoordinates): Deleted.
(WebCore::ViewportConfiguration::resetMinimalUI): Deleted.
(WebCore::ViewportConfiguration::didFinishDocumentLoad): Deleted.
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::minimumLayoutSizeForMinimalUI): Deleted.
(WebCore::ViewportConfiguration::usesMinimalUI): Deleted.
Source/WebKit/ios:
* WebCoreSupport/WebChromeClientIOS.mm:
(dictionaryForViewportArguments):
* WebKit.iOS.exp:
Source/WebKit/mac:
* History/WebHistoryItem.mm:
* History/WebHistoryItemPrivate.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
(WebKit::WebPage::didFinishDocumentLoad): Deleted.
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::savePageState):
(WebKit::WebPage::restorePageState):
(WebKit::WebPage::viewportConfigurationChanged):
(WebKit::WebPage::updateViewportSizeForCSSViewportUnits):</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="#trunkSourceWebCoredomViewportArgumentscpp">trunk/Source/WebCore/dom/ViewportArguments.cpp</a></li>
<li><a href="#trunkSourceWebCoredomViewportArgumentsh">trunk/Source/WebCore/dom/ViewportArguments.h</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationh">trunk/Source/WebCore/page/ViewportConfiguration.h</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm">trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosWebKitiOSexp">trunk/Source/WebKit/ios/WebKit.iOS.exp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemPrivateh">trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</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 (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/ChangeLog 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-11-20 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the remaining vestiges of minimal-ui
+ https://bugs.webkit.org/show_bug.cgi?id=138890
+
+ Reviewed by Sam Weinig.
+
+ In ViewportArguments' setViewportFeature(), I skip the warning for now.
+
+ * WebCore.exp.in:
+ * dom/ViewportArguments.cpp:
+ (WebCore::setViewportFeature):
+ * dom/ViewportArguments.h:
+ (WebCore::ViewportArguments::ViewportArguments):
+ (WebCore::ViewportArguments::operator==):
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::ViewportConfiguration):
+ (WebCore::ViewportConfiguration::initialScale):
+ (WebCore::ViewportConfiguration::minimumScale):
+ (WebCore::ViewportConfiguration::updateConfiguration):
+ (WebCore::ViewportConfiguration::viewportArgumentsLength):
+ (WebCore::ViewportConfiguration::layoutWidth):
+ (WebCore::ViewportConfiguration::layoutHeight):
+ (WebCore::ViewportConfigurationTextStream::operator<<):
+ (WebCore::ViewportConfiguration::description):
+ (WebCore::ViewportConfiguration::setMinimumLayoutSizeForMinimalUI): Deleted.
+ (WebCore::ViewportConfiguration::activeMinimumLayoutSizeInScrollViewCoordinates): Deleted.
+ (WebCore::ViewportConfiguration::resetMinimalUI): Deleted.
+ (WebCore::ViewportConfiguration::didFinishDocumentLoad): Deleted.
+ * page/ViewportConfiguration.h:
+ (WebCore::ViewportConfiguration::minimumLayoutSizeForMinimalUI): Deleted.
+ (WebCore::ViewportConfiguration::usesMinimalUI): Deleted.
+
</ins><span class="cx"> 2014-11-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: do not show invalid specificity for dynamic cases of :matches()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -961,18 +961,15 @@
</span><span class="cx"> __ZN7WebCore21UserContentController6createEv
</span><span class="cx"> __ZN7WebCore21UserContentControllerD1Ev
</span><span class="cx"> __ZN7WebCore21UserContentURLPattern5parseERKN3WTF6StringE
</span><del>-__ZN7WebCore21ViewportConfiguration14resetMinimalUIEv
</del><span class="cx"> __ZN7WebCore21ViewportConfiguration15setContentsSizeERKNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration17testingParametersEv
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration17webpageParametersEv
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration20setMinimumLayoutSizeERKNS_9FloatSizeE
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration20setViewportArgumentsERKNS_17ViewportArgumentsE
</span><del>-__ZN7WebCore21ViewportConfiguration21didFinishDocumentLoadEv
</del><span class="cx"> __ZN7WebCore21ViewportConfiguration21xhtmlMobileParametersEv
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration22textDocumentParametersEv
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration23imageDocumentParametersEv
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration23setDefaultConfigurationERKNS0_10ParametersE
</span><del>-__ZN7WebCore21ViewportConfiguration32setMinimumLayoutSizeForMinimalUIERKNS_9FloatSizeE
</del><span class="cx"> __ZN7WebCore21ViewportConfigurationC1Ev
</span><span class="cx"> __ZN7WebCore21WindowsLatin1EncodingEv
</span><span class="cx"> __ZN7WebCore21createCFURLFromBufferEPKcmPK7__CFURL
</span><span class="lines">@@ -1907,7 +1904,6 @@
</span><span class="cx"> __ZNK7WebCore21ViewportConfiguration10layoutSizeEv
</span><span class="cx"> __ZNK7WebCore21ViewportConfiguration12initialScaleEv
</span><span class="cx"> __ZNK7WebCore21ViewportConfiguration12minimumScaleEv
</span><del>-__ZNK7WebCore21ViewportConfiguration46activeMinimumLayoutSizeInScrollViewCoordinatesEv
</del><span class="cx"> __ZNK7WebCore22WheelEventDeltaTracker30dominantScrollGestureDirectionEv
</span><span class="cx"> __ZNK7WebCore23ApplicationCacheStorage11maximumSizeEv
</span><span class="cx"> __ZNK7WebCore23AuthenticationChallenge20authenticationClientEv
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -395,7 +395,8 @@
</span><span class="cx"> arguments->userZoom = findUserScalableValue(keyString, valueString, document);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> else if (keyString == "minimal-ui")
</span><del>- arguments->minimalUI = true;
</del><ins>+ // FIXME: Ignore silently for now. This should eventually fallback to the warning.
+ { }
</ins><span class="cx"> #endif
</span><span class="cx"> else
</span><span class="cx"> reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.h (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.h 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -87,9 +87,6 @@
</span><span class="cx"> , maxZoom(ValueAuto)
</span><span class="cx"> , userZoom(ValueAuto)
</span><span class="cx"> , orientation(ValueAuto)
</span><del>-#if PLATFORM(IOS)
- , minimalUI(false)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -107,9 +104,6 @@
</span><span class="cx"> float maxZoom;
</span><span class="cx"> float userZoom;
</span><span class="cx"> float orientation;
</span><del>-#if PLATFORM(IOS)
- bool minimalUI;
-#endif
</del><span class="cx">
</span><span class="cx"> bool operator==(const ViewportArguments& other) const
</span><span class="cx"> {
</span><span class="lines">@@ -125,9 +119,6 @@
</span><span class="cx"> && minZoom == other.minZoom
</span><span class="cx"> && maxZoom == other.maxZoom
</span><span class="cx"> && userZoom == other.userZoom
</span><del>-#if PLATFORM(IOS)
- && minimalUI == other.minimalUI
-#endif
</del><span class="cx"> && orientation == other.orientation;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -46,9 +46,6 @@
</span><span class="cx">
</span><span class="cx"> ViewportConfiguration::ViewportConfiguration()
</span><span class="cx"> : m_minimumLayoutSize(1024, 768)
</span><del>- , m_minimumLayoutSizeForMinimalUI(m_minimumLayoutSize)
- , m_usesMinimalUI(false)
- , m_pageDidFinishDocumentLoad(false)
</del><span class="cx"> {
</span><span class="cx"> // Setup a reasonable default configuration to avoid computing infinite scale/sizes.
</span><span class="cx"> // Those are the original iPhone configuration.
</span><span class="lines">@@ -85,22 +82,6 @@
</span><span class="cx"> updateConfiguration();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewportConfiguration::setMinimumLayoutSizeForMinimalUI(const FloatSize& minimumLayoutSizeForMinimalUI)
-{
- if (m_minimumLayoutSizeForMinimalUI == minimumLayoutSizeForMinimalUI)
- return;
-
- m_minimumLayoutSizeForMinimalUI = minimumLayoutSizeForMinimalUI;
- updateConfiguration();
-}
-
-const FloatSize& ViewportConfiguration::activeMinimumLayoutSizeInScrollViewCoordinates() const
-{
- if (m_usesMinimalUI)
- return m_minimumLayoutSizeForMinimalUI;
- return m_minimumLayoutSize;
-}
-
</del><span class="cx"> void ViewportConfiguration::setViewportArguments(const ViewportArguments& viewportArguments)
</span><span class="cx"> {
</span><span class="cx"> if (m_viewportArguments == viewportArguments)
</span><span class="lines">@@ -110,17 +91,6 @@
</span><span class="cx"> updateConfiguration();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ViewportConfiguration::resetMinimalUI()
-{
- m_usesMinimalUI = false;
- m_pageDidFinishDocumentLoad = false;
-}
-
-void ViewportConfiguration::didFinishDocumentLoad()
-{
- m_pageDidFinishDocumentLoad = true;
-}
-
</del><span class="cx"> IntSize ViewportConfiguration::layoutSize() const
</span><span class="cx"> {
</span><span class="cx"> return IntSize(layoutWidth(), layoutHeight());
</span><span class="lines">@@ -137,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> // If not, it is up to us to determine the initial scale.
</span><span class="cx"> // We want a scale small enough to fit the document width-wise.
</span><del>- const FloatSize& minimumLayoutSize = activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ const FloatSize& minimumLayoutSize = m_minimumLayoutSize;
</ins><span class="cx"> double width = m_contentSize.width() > 0 ? m_contentSize.width() : layoutWidth();
</span><span class="cx"> double initialScale = 0;
</span><span class="cx"> if (width > 0)
</span><span class="lines">@@ -159,7 +129,7 @@
</span><span class="cx"> // If not, we still need to sanity check our value.
</span><span class="cx"> double minimumScale = m_configuration.minimumScale;
</span><span class="cx">
</span><del>- const FloatSize& minimumLayoutSize = activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ const FloatSize& minimumLayoutSize = m_minimumLayoutSize;
</ins><span class="cx"> double contentWidth = m_contentSize.width();
</span><span class="cx"> if (contentWidth > 0 && contentWidth * minimumScale < minimumLayoutSize.width())
</span><span class="cx"> minimumScale = minimumLayoutSize.width() / contentWidth;
</span><span class="lines">@@ -285,19 +255,14 @@
</span><span class="cx">
</span><span class="cx"> if (viewportArgumentUserZoomIsSet(m_viewportArguments.userZoom))
</span><span class="cx"> m_configuration.allowsUserScaling = m_viewportArguments.userZoom != 0.;
</span><del>-
-#if PLATFORM(IOS)
- if (!m_pageDidFinishDocumentLoad)
- m_usesMinimalUI = m_usesMinimalUI || m_viewportArguments.minimalUI;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double ViewportConfiguration::viewportArgumentsLength(double length) const
</span><span class="cx"> {
</span><span class="cx"> if (length == ViewportArguments::ValueDeviceWidth)
</span><del>- return activeMinimumLayoutSizeInScrollViewCoordinates().width();
</del><ins>+ return m_minimumLayoutSize.width();
</ins><span class="cx"> if (length == ViewportArguments::ValueDeviceHeight)
</span><del>- return activeMinimumLayoutSizeInScrollViewCoordinates().height();
</del><ins>+ return m_minimumLayoutSize.height();
</ins><span class="cx"> return length;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -305,7 +270,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!constraintsAreAllRelative(m_configuration));
</span><span class="cx">
</span><del>- const FloatSize& minimumLayoutSize = activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ const FloatSize& minimumLayoutSize = m_minimumLayoutSize;
</ins><span class="cx"> if (m_configuration.widthIsSet) {
</span><span class="cx"> // If we scale to fit, then accept the viewport width with sanity checking.
</span><span class="cx"> if (!m_configuration.initialScaleIsSet) {
</span><span class="lines">@@ -341,7 +306,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!constraintsAreAllRelative(m_configuration));
</span><span class="cx">
</span><del>- const FloatSize& minimumLayoutSize = activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ const FloatSize& minimumLayoutSize = m_minimumLayoutSize;
</ins><span class="cx"> if (m_configuration.heightIsSet) {
</span><span class="cx"> // If we scale to fit, then accept the viewport height with sanity checking.
</span><span class="cx"> if (!m_configuration.initialScaleIsSet) {
</span><span class="lines">@@ -456,9 +421,6 @@
</span><span class="cx"> ts << "(zoom " << viewportArguments.zoom << ", minZoom " << viewportArguments.minZoom << ", maxZoom " << viewportArguments.maxZoom << ")";
</span><span class="cx"> ts.decreaseIndent();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- dumpProperty(ts, "minimalUI", viewportArguments.minimalUI);
-#endif
</del><span class="cx"> return ts;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -493,8 +455,6 @@
</span><span class="cx">
</span><span class="cx"> dumpProperty(ts, "contentSize", m_contentSize);
</span><span class="cx"> dumpProperty(ts, "minimumLayoutSize", m_minimumLayoutSize);
</span><del>- dumpProperty(ts, "minimumLayoutSizeForMinimalUI", m_minimumLayoutSizeForMinimalUI);
- ts << "(uses minimal UI " << m_usesMinimalUI << ")";
</del><span class="cx">
</span><span class="cx"> ts << "\n";
</span><span class="cx"> ts.increaseIndent();
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -74,23 +74,14 @@
</span><span class="cx"> const FloatSize& minimumLayoutSize() const { return m_minimumLayoutSize; }
</span><span class="cx"> WEBCORE_EXPORT void setMinimumLayoutSize(const FloatSize&);
</span><span class="cx">
</span><del>- const FloatSize& minimumLayoutSizeForMinimalUI() const { return m_minimumLayoutSizeForMinimalUI.isEmpty() ? m_minimumLayoutSize : m_minimumLayoutSizeForMinimalUI; }
- WEBCORE_EXPORT void setMinimumLayoutSizeForMinimalUI(const FloatSize&);
-
- WEBCORE_EXPORT const FloatSize& activeMinimumLayoutSizeInScrollViewCoordinates() const;
-
</del><span class="cx"> const ViewportArguments& viewportArguments() const { return m_viewportArguments; }
</span><span class="cx"> WEBCORE_EXPORT void setViewportArguments(const ViewportArguments&);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void resetMinimalUI();
- WEBCORE_EXPORT void didFinishDocumentLoad();
-
</del><span class="cx"> WEBCORE_EXPORT IntSize layoutSize() const;
</span><span class="cx"> WEBCORE_EXPORT double initialScale() const;
</span><span class="cx"> WEBCORE_EXPORT double minimumScale() const;
</span><span class="cx"> double maximumScale() const { return m_configuration.maximumScale; }
</span><span class="cx"> bool allowsUserScaling() const { return m_configuration.allowsUserScaling; }
</span><del>- bool usesMinimalUI() const { return m_usesMinimalUI; }
</del><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static Parameters webpageParameters();
</span><span class="cx"> WEBCORE_EXPORT static Parameters textDocumentParameters();
</span><span class="lines">@@ -113,11 +104,7 @@
</span><span class="cx"> Parameters m_defaultConfiguration;
</span><span class="cx"> IntSize m_contentSize;
</span><span class="cx"> FloatSize m_minimumLayoutSize;
</span><del>- FloatSize m_minimumLayoutSizeForMinimalUI;
</del><span class="cx"> ViewportArguments m_viewportArguments;
</span><del>-
- bool m_usesMinimalUI;
- bool m_pageDidFinishDocumentLoad;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-20 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the remaining vestiges of minimal-ui
+ https://bugs.webkit.org/show_bug.cgi?id=138890
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebChromeClientIOS.mm:
+ (dictionaryForViewportArguments):
+ * WebKit.iOS.exp:
+
</ins><span class="cx"> 2014-11-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Make WebKit build with public iOS SDK
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebCoreSupportWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/ios/WebCoreSupport/WebChromeClientIOS.mm 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -168,8 +168,7 @@
</span><span class="cx"> @"maximum-scale":@(arguments.maxZoom),
</span><span class="cx"> @"user-scalable":@(arguments.userZoom),
</span><span class="cx"> @"width":@(arguments.width),
</span><del>- @"height":@(arguments.height),
- @"minimal-ui":@(arguments.minimalUI) };
</del><ins>+ @"height":@(arguments.height) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatSize WebChromeClientIOS::screenSize() const
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebKitiOSexp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebKit.iOS.exp (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebKit.iOS.exp 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/ios/WebKit.iOS.exp 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> _WebViewportHeightKey
</span><span class="cx"> _WebViewportInitialScaleKey
</span><span class="cx"> _WebViewportMaximumScaleKey
</span><del>-_WebViewportMinimalUIKey
</del><span class="cx"> _WebViewportMinimumScaleKey
</span><span class="cx"> _WebViewportUserScalableKey
</span><span class="cx"> _WebViewportWidthKey
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-11-20 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the remaining vestiges of minimal-ui
+ https://bugs.webkit.org/show_bug.cgi?id=138890
+
+ Reviewed by Sam Weinig.
+
+ * History/WebHistoryItem.mm:
+ * History/WebHistoryItemPrivate.h:
+
</ins><span class="cx"> 2014-11-20 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Cancel DataDetectors menu earlier if we know it can't be presented
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> NSString *WebViewportUserScalableKey = @"user-scalable";
</span><span class="cx"> NSString *WebViewportWidthKey = @"width";
</span><span class="cx"> NSString *WebViewportHeightKey = @"height";
</span><del>-NSString *WebViewportMinimalUIKey = @"minimal-ui";
</del><span class="cx">
</span><span class="cx"> static NSString *scaleKey = @"scale";
</span><span class="cx"> static NSString *scaleIsInitialKey = @"scaleIsInitial";
</span><span class="lines">@@ -623,7 +622,6 @@
</span><span class="cx"> [argumentsDictionary setObject:[NSNumber numberWithFloat:viewportArguments.width] forKey:WebViewportWidthKey];
</span><span class="cx"> [argumentsDictionary setObject:[NSNumber numberWithFloat:viewportArguments.height] forKey:WebViewportHeightKey];
</span><span class="cx"> [argumentsDictionary setObject:[NSNumber numberWithFloat:viewportArguments.userZoom] forKey:WebViewportUserScalableKey];
</span><del>- [argumentsDictionary setObject:[NSNumber numberWithBool:viewportArguments.minimalUI] forKey:WebViewportMinimalUIKey];
</del><span class="cx"> return argumentsDictionary;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -636,7 +634,6 @@
</span><span class="cx"> viewportArguments.width = [[arguments objectForKey:WebViewportWidthKey] floatValue];
</span><span class="cx"> viewportArguments.height = [[arguments objectForKey:WebViewportHeightKey] floatValue];
</span><span class="cx"> viewportArguments.userZoom = [[arguments objectForKey:WebViewportUserScalableKey] floatValue];
</span><del>- viewportArguments.minimalUI = [[arguments objectForKey:WebViewportMinimalUIKey] boolValue];
</del><span class="cx"> core(_private)->setViewportArguments(viewportArguments);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> extern NSString *WebViewportUserScalableKey;
</span><span class="cx"> extern NSString *WebViewportWidthKey;
</span><span class="cx"> extern NSString *WebViewportHeightKey;
</span><del>-extern NSString *WebViewportMinimalUIKey;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @interface WebHistoryItem (WebPrivate)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-20 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the remaining vestiges of minimal-ui
+ https://bugs.webkit.org/show_bug.cgi?id=138890
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidFinishDocumentLoad):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad):
+ (WebKit::WebPage::didFinishDocumentLoad): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::savePageState):
+ (WebKit::WebPage::restorePageState):
+ (WebKit::WebPage::viewportConfigurationChanged):
+ (WebKit::WebPage::updateViewportSizeForCSSViewportUnits):
+
</ins><span class="cx"> 2014-11-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Preview popover needs minimum and maximum sizes
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -507,8 +507,6 @@
</span><span class="cx"> if (!webPage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- webPage->didFinishDocumentLoad(m_frame);
-
</del><span class="cx"> RefPtr<API::Object> userData;
</span><span class="cx">
</span><span class="cx"> // Notify the bundle client.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -4492,7 +4492,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> resetViewportDefaultConfiguration(frame);
</span><del>- m_viewportConfiguration.resetMinimalUI();
</del><span class="cx"> const Frame* coreFrame = frame->coreFrame();
</span><span class="cx"> m_viewportConfiguration.setContentsSize(coreFrame->view()->contentsSize());
</span><span class="cx"> m_viewportConfiguration.setViewportArguments(coreFrame->document()->viewportArguments());
</span><span class="lines">@@ -4508,18 +4507,6 @@
</span><span class="cx"> updateMainFrameScrollOffsetPinning();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::didFinishDocumentLoad(WebFrame* frame)
-{
-#if PLATFORM(IOS)
- if (!frame->isMainFrame())
- return;
-
- m_viewportConfiguration.didFinishDocumentLoad();
-#else
- UNUSED_PARAM(frame);
-#endif // PLATFORM(IOS)
-}
-
</del><span class="cx"> void WebPage::didFinishLoad(WebFrame* frame)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -251,7 +251,6 @@
</span><span class="cx"> void didStartPageTransition();
</span><span class="cx"> void didCompletePageTransition();
</span><span class="cx"> void didCommitLoad(WebFrame*);
</span><del>- void didFinishDocumentLoad(WebFrame*);
</del><span class="cx"> void didFinishLoad(WebFrame*);
</span><span class="cx"> void show();
</span><span class="cx"> String userAgent(const WebCore::URL&) const;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (176436 => 176437)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-21 04:31:06 UTC (rev 176436)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-11-21 04:49:13 UTC (rev 176437)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> void WebPage::savePageState(HistoryItem& historyItem)
</span><span class="cx"> {
</span><span class="cx"> historyItem.setScaleIsInitial(!m_userHasChangedPageScaleFactor);
</span><del>- historyItem.setMinimumLayoutSizeInScrollViewCoordinates(m_viewportConfiguration.activeMinimumLayoutSizeInScrollViewCoordinates());
</del><ins>+ historyItem.setMinimumLayoutSizeInScrollViewCoordinates(m_viewportConfiguration.minimumLayoutSize());
</ins><span class="cx"> historyItem.setContentSize(m_viewportConfiguration.contentsSize());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> m_userHasChangedPageScaleFactor = !historyItem.scaleIsInitial();
</span><span class="cx">
</span><del>- FloatSize currentMinimumLayoutSizeInScrollViewCoordinates = m_viewportConfiguration.activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ FloatSize currentMinimumLayoutSizeInScrollViewCoordinates = m_viewportConfiguration.minimumLayoutSize();
</ins><span class="cx"> if (historyItem.minimumLayoutSizeInScrollViewCoordinates() == currentMinimumLayoutSizeInScrollViewCoordinates) {
</span><span class="cx"> float boundedScale = std::min<float>(m_viewportConfiguration.maximumScale(), std::max<float>(m_viewportConfiguration.minimumScale(), historyItem.pageScaleFactor()));
</span><span class="cx"> scalePage(boundedScale, IntPoint());
</span><span class="lines">@@ -2542,7 +2542,7 @@
</span><span class="cx"> FrameView& frameView = *mainFrameView();
</span><span class="cx"> IntPoint scrollPosition = frameView.scrollPosition();
</span><span class="cx"> if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) {
</span><del>- FloatSize minimumLayoutSizeInScrollViewCoordinates = m_viewportConfiguration.activeMinimumLayoutSizeInScrollViewCoordinates();
</del><ins>+ FloatSize minimumLayoutSizeInScrollViewCoordinates = m_viewportConfiguration.minimumLayoutSize();
</ins><span class="cx"> minimumLayoutSizeInScrollViewCoordinates.scale(1 / scale);
</span><span class="cx"> IntSize minimumLayoutSizeInDocumentCoordinates = roundedIntSize(minimumLayoutSizeInScrollViewCoordinates);
</span><span class="cx"> frameView.setUnobscuredContentSize(minimumLayoutSizeInDocumentCoordinates);
</span><span class="lines">@@ -2558,7 +2558,7 @@
</span><span class="cx"> // This takes scale into account, so do after the scale change.
</span><span class="cx"> frameView.setCustomFixedPositionLayoutRect(enclosingIntRect(frameView.viewportConstrainedObjectsRect()));
</span><span class="cx">
</span><del>- frameView.setCustomSizeForResizeEvent(expandedIntSize(m_viewportConfiguration.activeMinimumLayoutSizeInScrollViewCoordinates()));
</del><ins>+ frameView.setCustomSizeForResizeEvent(expandedIntSize(m_viewportConfiguration.minimumLayoutSize()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2566,7 +2566,7 @@
</span><span class="cx"> {
</span><span class="cx"> FloatSize largestUnobscuredRect = m_maximumUnobscuredSize;
</span><span class="cx"> if (largestUnobscuredRect.isEmpty())
</span><del>- largestUnobscuredRect = m_viewportConfiguration.minimumLayoutSizeForMinimalUI();
</del><ins>+ largestUnobscuredRect = m_viewportConfiguration.minimumLayoutSize();
</ins><span class="cx">
</span><span class="cx"> FrameView& frameView = *mainFrameView();
</span><span class="cx"> largestUnobscuredRect.scale(1 / m_viewportConfiguration.initialScale());
</span></span></pre>
</div>
</div>
</body>
</html>