<!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>[187419] branches/safari-601.1-branch/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/187419">187419</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-26 23:59:08 -0700 (Sun, 26 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187178">r187178</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebKit2ChangeLog">branches/safari-601.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2PlatformLoggingh">branches/safari-601.1-branch/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187418 => 187419)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-27 06:58:02 UTC (rev 187418)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-27 06:59:08 UTC (rev 187419)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-26 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r187178.
+
+ 2015-07-21 Simon Fraser <simon.fraser@apple.com>
+
+ Add logging for TiledCoreAnimationDrawingArea resizing
+ https://bugs.webkit.org/show_bug.cgi?id=147180
+
+ Reviewed by Tim Horton.
+
+ Add a "Resize" log channel for WebKit2, and use it to log data in scaleViewToFitDocumentIfNeeded().
+
+ * Platform/Logging.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+
</ins><span class="cx"> 2015-07-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187251, r187252, r187262, r187263, r187272, r187289. rdar://problem/20689512
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/Logging.h (187418 => 187419)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/Platform/Logging.h 2015-07-27 06:58:02 UTC (rev 187418)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/Logging.h 2015-07-27 06:59:08 UTC (rev 187419)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> M(NetworkScheduling) \
</span><span class="cx"> M(Plugins) \
</span><span class="cx"> M(RemoteLayerTree) \
</span><ins>+ M(Resize) \
</ins><span class="cx"> M(SessionState) \
</span><span class="cx"> M(StorageAPI) \
</span><span class="cx"> M(TextInput) \
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (187418 => 187419)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-07-27 06:58:02 UTC (rev 187418)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-07-27 06:59:08 UTC (rev 187419)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "DrawingAreaProxyMessages.h"
</span><span class="cx"> #import "LayerHostingContext.h"
</span><span class="cx"> #import "LayerTreeContext.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "ViewGestureControllerMessages.h"
</span><span class="cx"> #import "WebFrame.h"
</span><span class="cx"> #import "WebPage.h"
</span><span class="lines">@@ -280,6 +281,7 @@
</span><span class="cx"> if (!m_shouldScaleViewToFitDocument)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Resize, "TiledCoreAnimationDrawingArea %p scaleViewToFitDocumentIfNeeded", this);
</ins><span class="cx"> m_webPage.layoutIfNeeded();
</span><span class="cx">
</span><span class="cx"> int viewWidth = m_webPage.size().width();
</span><span class="lines">@@ -288,6 +290,8 @@
</span><span class="cx"> bool documentWidthChanged = m_lastDocumentSizeForScaleToFit.width() != documentWidth;
</span><span class="cx"> bool viewWidthChanged = m_lastViewSizeForScaleToFit.width() != viewWidth;
</span><span class="cx">
</span><ins>+ LOG(Resize, " documentWidthChanged=%d, viewWidthChanged=%d", documentWidthChanged, viewWidthChanged);
+
</ins><span class="cx"> if (!documentWidthChanged && !viewWidthChanged)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -307,9 +311,14 @@
</span><span class="cx"> IntSize fixedLayoutSize(documentWidth, std::ceil((m_webPage.size().height() - m_webPage.corePage()->topContentInset()) / viewScale));
</span><span class="cx"> m_webPage.setFixedLayoutSize(fixedLayoutSize);
</span><span class="cx"> m_webPage.scaleView(viewScale);
</span><ins>+
+ LOG(Resize, " using fixed layout at %dx%d. document width %d unchanged, scaled to %.4f to fit view width %d", fixedLayoutSize.width(), fixedLayoutSize.height(), documentWidth, viewScale, viewWidth);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+ LOG(Resize, " doing unconstrained layout");
+
</ins><span class="cx"> // Lay out at the view size.
</span><span class="cx"> m_webPage.setUseFixedLayout(false);
</span><span class="cx"> m_webPage.layoutIfNeeded();
</span><span class="lines">@@ -322,6 +331,8 @@
</span><span class="cx">
</span><span class="cx"> float viewScale = 1;
</span><span class="cx">
</span><ins>+ LOG(Resize, " unscaled document size %dx%d. need to scale down: %d", documentSize.width(), documentSize.height(), documentWidth && documentWidth < maximumDocumentWidthForScaling && viewWidth < documentWidth);
+
</ins><span class="cx"> // Avoid scaling down documents that don't fit in a certain width, to allow
</span><span class="cx"> // sites that want horizontal scrollbars to continue to have them.
</span><span class="cx"> if (documentWidth && documentWidth < maximumDocumentWidthForScaling && viewWidth < documentWidth) {
</span><span class="lines">@@ -335,6 +346,8 @@
</span><span class="cx"> }
</span><span class="cx"> IntSize fixedLayoutSize(documentWidth, std::ceil((m_webPage.size().height() - m_webPage.corePage()->topContentInset()) / viewScale));
</span><span class="cx"> m_webPage.setFixedLayoutSize(fixedLayoutSize);
</span><ins>+
+ LOG(Resize, " using fixed layout at %dx%d. document width %d, scaled to %.4f to fit view width %d", fixedLayoutSize.width(), fixedLayoutSize.height(), documentWidth, viewScale, viewWidth);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_webPage.scaleView(viewScale);
</span></span></pre>
</div>
</div>
</body>
</html>