<!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>[225441] 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/225441">225441</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-12-01 19:19:16 -0800 (Fri, 01 Dec 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reduce the number of calls to ViewportConfiguration::updateConfiguration()
https://bugs.webkit.org/show_bug.cgi?id=180299

Reviewed by Zalan Bujtas.

There are several calls to ViewportConfiguration::setDefaultConfiguration() during loading
with the same arguments. We can avoid unnecessary calls to updateConfiguration() by returning
early if the configuration hasn't changed.

Source/WebCore:

* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::setDefaultConfiguration):
* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::Parameters::operator== const):

Source/WebKit:

Also move the fetching of ViewportConfiguration::xhtmlMobileParameters() from didReceiveMobileDocType()
into resetViewportDefaultConfiguration() where we grab all the other default configs.

* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::didReceiveMobileDocType):
(WebKit::WebPage::resetViewportDefaultConfiguration):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/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 (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebCore/ChangeLog      2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-12-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Reduce the number of calls to ViewportConfiguration::updateConfiguration()
+        https://bugs.webkit.org/show_bug.cgi?id=180299
+
+        Reviewed by Zalan Bujtas.
+
+        There are several calls to ViewportConfiguration::setDefaultConfiguration() during loading
+        with the same arguments. We can avoid unnecessary calls to updateConfiguration() by returning
+        early if the configuration hasn't changed.
+
+        * page/ViewportConfiguration.cpp:
+        (WebCore::ViewportConfiguration::setDefaultConfiguration):
+        * page/ViewportConfiguration.h:
+        (WebCore::ViewportConfiguration::Parameters::operator== const):
+
</ins><span class="cx"> 2017-12-01  Aishwarya Nirmal  <anirmal@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Touch Bar Web API] Object representing Touch Bar Menu to send between Web and UI Processes
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp      2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx">     ASSERT(defaultConfiguration.minimumScale > 0);
</span><span class="cx">     ASSERT(defaultConfiguration.maximumScale >= defaultConfiguration.minimumScale);
</span><span class="cx"> 
</span><ins>+    if (m_defaultConfiguration == defaultConfiguration)
+        return;
+
</ins><span class="cx">     m_defaultConfiguration = defaultConfiguration;
</span><span class="cx">     updateConfiguration();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h        2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h   2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -56,6 +56,14 @@
</span><span class="cx">         bool widthIsSet { false };
</span><span class="cx">         bool heightIsSet { false };
</span><span class="cx">         bool initialScaleIsSet { false };
</span><ins>+
+        bool operator==(const Parameters& other) const
+        {
+            return width == other.width && height == other.height
+                && initialScale == other.initialScale && minimumScale == other.minimumScale && maximumScale == other.maximumScale
+                && allowsUserScaling == other.allowsUserScaling && allowsShrinkToFit == other.allowsShrinkToFit && avoidsUnsafeArea == other.avoidsUnsafeArea
+                && widthIsSet == other.widthIsSet && heightIsSet == other.heightIsSet && initialScaleIsSet == other.initialScaleIsSet;
+        }
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT ViewportConfiguration();
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebKit/ChangeLog       2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-12-01  Simon Fraser  <simon.fraser@apple.com>
+
+        Reduce the number of calls to ViewportConfiguration::updateConfiguration()
+        https://bugs.webkit.org/show_bug.cgi?id=180299
+
+        Reviewed by Zalan Bujtas.
+
+        There are several calls to ViewportConfiguration::setDefaultConfiguration() during loading
+        with the same arguments. We can avoid unnecessary calls to updateConfiguration() by returning
+        early if the configuration hasn't changed.
+
+        Also move the fetching of ViewportConfiguration::xhtmlMobileParameters() from didReceiveMobileDocType()
+        into resetViewportDefaultConfiguration() where we grab all the other default configs.
+
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::didReceiveMobileDocType):
+        (WebKit::WebPage::resetViewportDefaultConfiguration):
+
</ins><span class="cx"> 2017-12-01  Aishwarya Nirmal  <anirmal@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Touch Bar Web API] Object representing Touch Bar Menu to send between Web and UI Processes
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -1056,7 +1056,7 @@
</span><span class="cx">     void didReceiveSyncWebPageMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&);
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-    void resetViewportDefaultConfiguration(WebFrame* mainFrame);
</del><ins>+    void resetViewportDefaultConfiguration(WebFrame* mainFrame, bool hasMobileDocType = false);
</ins><span class="cx">     void viewportConfigurationChanged();
</span><span class="cx">     void updateViewportSizeForCSSViewportUnits();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (225440 => 225441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2017-12-02 01:56:40 UTC (rev 225440)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2017-12-02 03:19:16 UTC (rev 225441)
</span><span class="lines">@@ -252,10 +252,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebPage::didReceiveMobileDocType(bool isMobileDoctype)
</span><span class="cx"> {
</span><del>-    if (isMobileDoctype)
-        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::xhtmlMobileParameters());
-    else
-        resetViewportDefaultConfiguration(m_mainFrame.get());
</del><ins>+    resetViewportDefaultConfiguration(m_mainFrame.get(), isMobileDoctype);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::savePageState(HistoryItem& historyItem)
</span><span class="lines">@@ -2595,7 +2592,7 @@
</span><span class="cx">     nextValidLayerTreeTransactionID = downcast<RemoteLayerTreeDrawingArea>(*m_drawingArea).nextTransactionID();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPage::resetViewportDefaultConfiguration(WebFrame* frame)
</del><ins>+void WebPage::resetViewportDefaultConfiguration(WebFrame* frame, bool hasMobileDocType)
</ins><span class="cx"> {
</span><span class="cx">     if (m_useTestingViewportConfiguration) {
</span><span class="cx">         m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::testingParameters());
</span><span class="lines">@@ -2607,6 +2604,11 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (hasMobileDocType) {
+        m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::xhtmlMobileParameters());
+        return;
+    }
+
</ins><span class="cx">     Document* document = frame->coreFrame()->document();
</span><span class="cx">     if (document->isImageDocument())
</span><span class="cx">         m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::imageDocumentParameters());
</span></span></pre>
</div>
</div>

</body>
</html>