Modified: trunk/Source/WebCore/ChangeLog (187133 => 187134)
--- 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)
@@ -1,3 +1,20 @@
+2015-07-21 Simon Fraser <simon.fra...@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:
+
2015-07-21 Benjamin Poulain <bpoul...@apple.com>
StyleSheetContents::wrapperInsertRule() can create rules that overflow RuleData's selector index
Modified: trunk/Source/WebCore/page/FrameView.cpp (187133 => 187134)
--- 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)
@@ -614,6 +614,8 @@
const IntSize& size = rect.size();
ScrollView::setScrollOrigin(IntPoint(-rect.x(), -rect.y()), !frame().document()->printing(), size == contentsSize());
+ 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());
+
setContentsSize(size);
}
@@ -1146,6 +1148,8 @@
if (svgRoot.everHadLayout() && !svgRoot.needsLayout())
return;
+ LOG(Layout, "FrameView %p forceLayoutParentViewIfNeeded scheduling layout on parent FrameView %p", this, &ownerRenderer->view().frameView());
+
// If the embedded SVG document appears the first time, the ownerRenderer has already finished
// layout without knowing about the existence of the embedded SVG document, because RenderReplaced
// embeddedContentBox() returns nullptr, as long as the embedded document isn't loaded yet. Before
@@ -1160,11 +1164,16 @@
void FrameView::layout(bool allowSubtree)
{
- if (isInLayout())
+ 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");
return;
+ }
- if (layoutDisallowed())
+ if (layoutDisallowed()) {
+ LOG(Layout, " layout is disallowed, bailing");
return;
+ }
// Protect the view from being deleted during layout (in recalcStyle).
Ref<FrameView> protect(*this);
@@ -1180,6 +1189,7 @@
if (inChildFrameLayoutWithFrameFlattening) {
startLayoutAtMainFrameViewIfNeeded(allowSubtree);
+ LOG(Layout, " frame flattening, starting from root");
RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
if (!root || !root->needsLayout())
return;
@@ -1231,6 +1241,7 @@
// Viewport-dependent media queries may cause us to need completely different style information.
StyleResolver* styleResolver = document.styleResolverIfExists();
if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
+ LOG(Layout, " hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
document.styleResolverChanged(DeferRecalcStyle);
// FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
InspectorInstrumentation::mediaQueryResultChanged(document);
@@ -1325,6 +1336,7 @@
m_size = layoutSize();
if (oldSize != m_size) {
+ 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());
m_needsFullRepaint = true;
if (!m_firstLayout) {
RenderBox* rootRenderer = document.documentElement() ? document.documentElement()->renderBox() : nullptr;
@@ -3014,6 +3026,8 @@
void FrameView::performPostLayoutTasks()
{
+ LOG(Layout, "FrameView %p performPostLayoutTasks", this);
+
// FIXME: We should not run any _javascript_ code in this function.
m_postLayoutTasksTimer.stop();
@@ -3163,6 +3177,8 @@
if (m_inAutoSize)
return;
+ LOG(Layout, "FrameView %p autoSizeIfEnabled", this);
+
TemporaryChange<bool> changeInAutoSize(m_inAutoSize, true);
Document* document = frame().document();
Modified: trunk/Source/WebKit/mac/ChangeLog (187133 => 187134)
--- 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)
@@ -1,3 +1,16 @@
+2015-07-21 Simon Fraser <simon.fra...@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.
+
2015-07-21 Brady Eidson <beid...@apple.com>
Fix WebPreferences infinite recursion introduced in r186232.
Modified: trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm (187133 => 187134)
--- 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)
@@ -259,11 +259,6 @@
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
- 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);
-
#if !LOG_DISABLED
currentTime = CFAbsoluteTimeGetCurrent();
duration = currentTime - start;
