<!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>[187134] 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/187134">187134</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-07-21 16:31:44 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a logging channel for Layout, remove the LiveConnect channel
https://bugs.webkit.org/show_bug.cgi?id=147170
Reviewed by Zalan Bujtas.
Add a layout logging channel to WebCore, and remove the LiveConnect channel.
Source/WebCore:
* page/FrameView.cpp:
(WebCore::FrameView::adjustViewSize):
(WebCore::FrameView::forceLayoutParentViewIfNeeded):
(WebCore::FrameView::layout):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::autoSizeIfEnabled):
* platform/Logging.h:
Source/WebKit/mac:
* Misc/WebKitLogging.h:
* Plugins/WebNetscapePluginPackage.mm:
(-[WebNetscapePluginPackage _tryLoad]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingh">trunk/Source/WebKit/mac/Misc/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebNetscapePluginPackagemm">trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebCore/ChangeLog 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-21 Simon Fraser <simon.fraser@apple.com>
+
+ Add a logging channel for Layout, remove the LiveConnect channel
+ https://bugs.webkit.org/show_bug.cgi?id=147170
+
+ Reviewed by Zalan Bujtas.
+
+ Add a layout logging channel to WebCore, and remove the LiveConnect channel.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::adjustViewSize):
+ (WebCore::FrameView::forceLayoutParentViewIfNeeded):
+ (WebCore::FrameView::layout):
+ (WebCore::FrameView::performPostLayoutTasks):
+ (WebCore::FrameView::autoSizeIfEnabled):
+ * platform/Logging.h:
+
</ins><span class="cx"> 2015-07-21 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> StyleSheetContents::wrapperInsertRule() can create rules that overflow RuleData's selector index
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -614,6 +614,8 @@
</span><span class="cx"> const IntSize& size = rect.size();
</span><span class="cx"> ScrollView::setScrollOrigin(IntPoint(-rect.x(), -rect.y()), !frame().document()->printing(), size == contentsSize());
</span><span class="cx">
</span><ins>+ LOG(Layout, "FrameView %p adjustViewSize: unscaled document size changed to %dx%d (scaled to %dx%d)", this, renderView->unscaledDocumentRect().width(), renderView->unscaledDocumentRect().height(), size.width(), size.height());
+
</ins><span class="cx"> setContentsSize(size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1146,6 +1148,8 @@
</span><span class="cx"> if (svgRoot.everHadLayout() && !svgRoot.needsLayout())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Layout, "FrameView %p forceLayoutParentViewIfNeeded scheduling layout on parent FrameView %p", this, &ownerRenderer->view().frameView());
+
</ins><span class="cx"> // If the embedded SVG document appears the first time, the ownerRenderer has already finished
</span><span class="cx"> // layout without knowing about the existence of the embedded SVG document, because RenderReplaced
</span><span class="cx"> // embeddedContentBox() returns nullptr, as long as the embedded document isn't loaded yet. Before
</span><span class="lines">@@ -1160,11 +1164,16 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::layout(bool allowSubtree)
</span><span class="cx"> {
</span><del>- if (isInLayout())
</del><ins>+ LOG(Layout, "FrameView %p (%dx%d) layout, main frameview %d, allowSubtree=%d", this, size().width(), size().height(), frame().isMainFrame(), allowSubtree);
+ if (isInLayout()) {
+ LOG(Layout, " in layout, bailing");
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if (layoutDisallowed())
</del><ins>+ if (layoutDisallowed()) {
+ LOG(Layout, " layout is disallowed, bailing");
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Protect the view from being deleted during layout (in recalcStyle).
</span><span class="cx"> Ref<FrameView> protect(*this);
</span><span class="lines">@@ -1180,6 +1189,7 @@
</span><span class="cx">
</span><span class="cx"> if (inChildFrameLayoutWithFrameFlattening) {
</span><span class="cx"> startLayoutAtMainFrameViewIfNeeded(allowSubtree);
</span><ins>+ LOG(Layout, " frame flattening, starting from root");
</ins><span class="cx"> RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
</span><span class="cx"> if (!root || !root->needsLayout())
</span><span class="cx"> return;
</span><span class="lines">@@ -1231,6 +1241,7 @@
</span><span class="cx"> // Viewport-dependent media queries may cause us to need completely different style information.
</span><span class="cx"> StyleResolver* styleResolver = document.styleResolverIfExists();
</span><span class="cx"> if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
</span><ins>+ LOG(Layout, " hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
</ins><span class="cx"> document.styleResolverChanged(DeferRecalcStyle);
</span><span class="cx"> // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
</span><span class="cx"> InspectorInstrumentation::mediaQueryResultChanged(document);
</span><span class="lines">@@ -1325,6 +1336,7 @@
</span><span class="cx"> m_size = layoutSize();
</span><span class="cx">
</span><span class="cx"> if (oldSize != m_size) {
</span><ins>+ LOG(Layout, " layout size changed from %.3fx%.3f to %.3fx%.3f", oldSize.width().toFloat(), oldSize.height().toFloat(), m_size.width().toFloat(), m_size.height().toFloat());
</ins><span class="cx"> m_needsFullRepaint = true;
</span><span class="cx"> if (!m_firstLayout) {
</span><span class="cx"> RenderBox* rootRenderer = document.documentElement() ? document.documentElement()->renderBox() : nullptr;
</span><span class="lines">@@ -3014,6 +3026,8 @@
</span><span class="cx">
</span><span class="cx"> void FrameView::performPostLayoutTasks()
</span><span class="cx"> {
</span><ins>+ LOG(Layout, "FrameView %p performPostLayoutTasks", this);
+
</ins><span class="cx"> // FIXME: We should not run any JavaScript code in this function.
</span><span class="cx">
</span><span class="cx"> m_postLayoutTasksTimer.stop();
</span><span class="lines">@@ -3163,6 +3177,8 @@
</span><span class="cx"> if (m_inAutoSize)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ LOG(Layout, "FrameView %p autoSizeIfEnabled", this);
+
</ins><span class="cx"> TemporaryChange<bool> changeInAutoSize(m_inAutoSize, true);
</span><span class="cx">
</span><span class="cx"> Document* document = frame().document();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Logging.h 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebCore/platform/Logging.h 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> M(Gamepad) \
</span><span class="cx"> M(History) \
</span><span class="cx"> M(IconDatabase) \
</span><del>- M(LiveConnect) \
</del><ins>+ M(Layout) \
</ins><span class="cx"> M(Loading) \
</span><span class="cx"> M(Media) \
</span><span class="cx"> M(MediaSource) \
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-21 Simon Fraser <simon.fraser@apple.com>
+
+ Add a logging channel for Layout, remove the LiveConnect channel
+ https://bugs.webkit.org/show_bug.cgi?id=147170
+
+ Reviewed by Zalan Bujtas.
+
+ Add a layout logging channel to WebCore, and remove the LiveConnect channel.
+
+ * Misc/WebKitLogging.h:
+ * Plugins/WebNetscapePluginPackage.mm:
+ (-[WebNetscapePluginPackage _tryLoad]): Deleted.
+
</ins><span class="cx"> 2015-07-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix WebPreferences infinite recursion introduced in r186232.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> M(FormDelegate) \
</span><span class="cx"> M(History) \
</span><span class="cx"> M(IconDatabase) \
</span><del>- M(LiveConnect) \
</del><span class="cx"> M(Loading) \
</span><span class="cx"> M(PageCache) \
</span><span class="cx"> M(PluginEvents) \
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebNetscapePluginPackagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (187133 => 187134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-07-21 23:17:02 UTC (rev 187133)
+++ trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm 2015-07-21 23:31:44 UTC (rev 187134)
</span><span class="lines">@@ -259,11 +259,6 @@
</span><span class="cx"> pluginSize = pluginFuncs.size;
</span><span class="cx"> pluginVersion = pluginFuncs.version;
</span><span class="cx">
</span><del>- if (pluginFuncs.javaClass)
- LOG(LiveConnect, "%@: mach-o entry point for NPP_GetJavaClass = %p", (NSString *)[self pluginInfo].name, pluginFuncs.javaClass);
- else
- LOG(LiveConnect, "%@: no entry point for NPP_GetJavaClass", (NSString *)[self pluginInfo].name);
-
</del><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> currentTime = CFAbsoluteTimeGetCurrent();
</span><span class="cx"> duration = currentTime - start;
</span></span></pre>
</div>
</div>
</body>
</html>