<!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>[174405] trunk/Source/WebCore</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/174405">174405</a></dd>
<dt>Author</dt> <dd>mhock@apple.com</dd>
<dt>Date</dt> <dd>2014-10-07 13:52:26 -0700 (Tue, 07 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Defer resolution of viewport size.
https://bugs.webkit.org/show_bug.cgi?id=137376
rdar://problem/18558094
Reviewed by Benjamin Poulain.
ViewportConfiguration should resolve the viewport size on configuration update.
* dom/Document.cpp:
(WebCore::Document::processViewport): Defer resolution of viewport size.
* dom/ViewportArguments.cpp:
(WebCore::finalizeViewportArguments): Deleted.
* dom/ViewportArguments.h:
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::updateConfiguration): Resolve viewport size.
(WebCore::ViewportConfiguration::viewportArgumentsLength): Resolves width or height based on viewport arguments.
* page/ViewportConfiguration.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/ChangeLog 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-10-07 Martin Hock <mhock@apple.com>
+
+ Defer resolution of viewport size.
+ https://bugs.webkit.org/show_bug.cgi?id=137376
+ rdar://problem/18558094
+
+ Reviewed by Benjamin Poulain.
+
+ ViewportConfiguration should resolve the viewport size on configuration update.
+
+ * dom/Document.cpp:
+ (WebCore::Document::processViewport): Defer resolution of viewport size.
+ * dom/ViewportArguments.cpp:
+ (WebCore::finalizeViewportArguments): Deleted.
+ * dom/ViewportArguments.h:
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::updateConfiguration): Resolve viewport size.
+ (WebCore::ViewportConfiguration::viewportArgumentsLength): Resolves width or height based on viewport arguments.
+ * page/ViewportConfiguration.h:
+
</ins><span class="cx"> 2014-10-07 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit1 clients crash in DiskCacheMonitor::tryGetFileBackedSharedBufferFromCFURLCachedResponse()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -3001,15 +3001,6 @@
</span><span class="cx"> m_viewportArguments = ViewportArguments(origin);
</span><span class="cx"> processArguments(features, (void*)&m_viewportArguments, &setViewportFeature);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- // FIXME: <rdar://problem/8955959> Investigate moving to ToT WebKit's extended Viewport Implementation
- // Moving to ToT's implementation would mean calling findConfigurationForViewportData, which does
- // bounds checking and determining concrete values for ValueAuto which we already do in UIKit.
- // To maintain old behavior, we just need to update a few values, leaving Auto's for UIKit.
- if (Page* page = this->page())
- finalizeViewportArguments(m_viewportArguments, page->chrome().screenSize());
-#endif
-
</del><span class="cx"> updateViewportArguments();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -401,21 +401,6 @@
</span><span class="cx"> reportViewportWarning(document, UnrecognizedViewportArgumentKeyError, keyString, String());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-void finalizeViewportArguments(ViewportArguments& arguments, const FloatSize& screenSize)
-{
- if (arguments.width == ViewportArguments::ValueDeviceWidth)
- arguments.width = screenSize.width();
- else if (arguments.width == ViewportArguments::ValueDeviceHeight)
- arguments.width = screenSize.height();
-
- if (arguments.height == ViewportArguments::ValueDeviceWidth)
- arguments.height = screenSize.width();
- else if (arguments.height == ViewportArguments::ValueDeviceHeight)
- arguments.height = screenSize.height();
-}
-#endif
-
</del><span class="cx"> static const char* viewportErrorMessageTemplate(ViewportErrorCode errorCode)
</span><span class="cx"> {
</span><span class="cx"> static const char* const errors[] = {
</span></span></pre></div>
<a id="trunkSourceWebCoredomViewportArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ViewportArguments.h (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ViewportArguments.h 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -152,10 +152,6 @@
</span><span class="cx"> void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);
</span><span class="cx"> void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-void finalizeViewportArguments(ViewportArguments&, const FloatSize& screenSize);
-#endif
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ViewportArguments_h
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -272,8 +272,8 @@
</span><span class="cx">
</span><span class="cx"> double minimumViewportArgumentsDimension = 10;
</span><span class="cx"> double maximumViewportArgumentsDimension = 10000;
</span><del>- applyViewportArgument(m_configuration.width, viewportArgumentsOverridesWidth, m_viewportArguments.width, minimumViewportArgumentsDimension, maximumViewportArgumentsDimension);
- applyViewportArgument(m_configuration.height, viewportArgumentsOverridesHeight, m_viewportArguments.height, minimumViewportArgumentsDimension, maximumViewportArgumentsDimension);
</del><ins>+ applyViewportArgument(m_configuration.width, viewportArgumentsOverridesWidth, viewportArgumentsLength(m_viewportArguments.width), minimumViewportArgumentsDimension, maximumViewportArgumentsDimension);
+ applyViewportArgument(m_configuration.height, viewportArgumentsOverridesHeight, viewportArgumentsLength(m_viewportArguments.height), minimumViewportArgumentsDimension, maximumViewportArgumentsDimension);
</ins><span class="cx">
</span><span class="cx"> if (viewportArgumentsOverridesInitialScale || viewportArgumentsOverridesWidth || viewportArgumentsOverridesHeight) {
</span><span class="cx"> m_configuration.initialScaleIsSet = viewportArgumentsOverridesInitialScale;
</span><span class="lines">@@ -290,6 +290,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+double ViewportConfiguration::viewportArgumentsLength(double length) const
+{
+ if (length == ViewportArguments::ValueDeviceWidth)
+ return activeMinimumLayoutSizeInScrollViewCoordinates().width();
+ if (length == ViewportArguments::ValueDeviceHeight)
+ return activeMinimumLayoutSizeInScrollViewCoordinates().height();
+ return length;
+}
+
</ins><span class="cx"> int ViewportConfiguration::layoutWidth() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!constraintsAreAllRelative(m_configuration));
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (174404 => 174405)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2014-10-07 20:37:48 UTC (rev 174404)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2014-10-07 20:52:26 UTC (rev 174405)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateConfiguration();
</span><ins>+ double viewportArgumentsLength(double length) const;
</ins><span class="cx"> int layoutWidth() const;
</span><span class="cx"> int layoutHeight() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>