<!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>[169302] trunk/Source/WebKit2</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/169302">169302</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-23 21:25:09 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Avoid updating the view from the viewport configuration unnecessarily
https://bugs.webkit.org/show_bug.cgi?id=133255
<rdar://problem/16890926>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-23
Reviewed by Simon Fraser.
All the updates were mostly harmless since they are pretty cheap, but they can be
very annoying for debugging.
This patch skips viewportUpdates in the trivial cases.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setMinimumLayoutSizeOverride:]):
(-[WKWebView _setMinimumLayoutSizeOverrideForMinimalUI:]):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::mainFrameDidLayout):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::viewportPropertiesDidChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169301 => 169302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-24 04:07:46 UTC (rev 169301)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-24 04:25:09 UTC (rev 169302)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-05-23 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><ins>+ [iOS][WK2] Avoid updating the view from the viewport configuration unnecessarily
+ https://bugs.webkit.org/show_bug.cgi?id=133255
+ <rdar://problem/16890926>
+
+ Reviewed by Simon Fraser.
+
+ All the updates were mostly harmless since they are pretty cheap, but they can be
+ very annoying for debugging.
+
+ This patch skips viewportUpdates in the trivial cases.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setMinimumLayoutSizeOverride:]):
+ (-[WKWebView _setMinimumLayoutSizeOverrideForMinimalUI:]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::mainFrameDidLayout):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportPropertiesDidChange):
+
+2014-05-23 Benjamin Poulain <bpoulain@apple.com>
+
</ins><span class="cx"> [iOS][WK2] The page scale factor randomly resets to initial scale when editing
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133244
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169301 => 169302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-24 04:07:46 UTC (rev 169301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-24 04:25:09 UTC (rev 169302)
</span><span class="lines">@@ -1564,6 +1564,9 @@
</span><span class="cx"> - (void)_setMinimumLayoutSizeOverride:(CGSize)minimumLayoutSizeOverride
</span><span class="cx"> {
</span><span class="cx"> _overridesMinimumLayoutSize = YES;
</span><ins>+ if (CGSizeEqualToSize(_minimumLayoutSizeOverride, minimumLayoutSizeOverride))
+ return;
+
</ins><span class="cx"> _minimumLayoutSizeOverride = minimumLayoutSizeOverride;
</span><span class="cx"> if (!_isAnimatingResize)
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(minimumLayoutSizeOverride));
</span><span class="lines">@@ -1578,6 +1581,9 @@
</span><span class="cx"> - (void)_setMinimumLayoutSizeOverrideForMinimalUI:(CGSize)size
</span><span class="cx"> {
</span><span class="cx"> _overridesMinimumLayoutSizeForMinimalUI = YES;
</span><ins>+ if (CGSizeEqualToSize(_minimumLayoutSizeOverrideForMinimalUI, size))
+ return;
+
</ins><span class="cx"> _minimumLayoutSizeOverrideForMinimalUI = size;
</span><span class="cx"> if (!_isAnimatingResize)
</span><span class="cx"> _page->setViewportConfigurationMinimumLayoutSizeForMinimalUI(WebCore::FloatSize(size));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (169301 => 169302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-24 04:07:46 UTC (rev 169301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-05-24 04:25:09 UTC (rev 169302)
</span><span class="lines">@@ -3266,8 +3266,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (FrameView* frameView = mainFrameView()) {
</span><del>- m_viewportConfiguration.setContentsSize(frameView->contentsSize());
- viewportConfigurationChanged();
</del><ins>+ IntSize newContentSize = frameView->contentsSize();
+ if (m_viewportConfiguration.contentsSize() != newContentSize) {
+ m_viewportConfiguration.setContentsSize(newContentSize);
+ viewportConfigurationChanged();
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (169301 => 169302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-24 04:07:46 UTC (rev 169301)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-24 04:25:09 UTC (rev 169302)
</span><span class="lines">@@ -127,6 +127,9 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::viewportPropertiesDidChange(const ViewportArguments& viewportArguments)
</span><span class="cx"> {
</span><ins>+ if (m_viewportConfiguration.viewportArguments() == viewportArguments)
+ return;
+
</ins><span class="cx"> float oldWidth = m_viewportConfiguration.viewportArguments().width;
</span><span class="cx"> bool wasUsingMinimalUI = m_viewportConfiguration.usesMinimalUI();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>