Changeset 187134 in webkit

Timestamp:

Jul 21, 2015 4:31:44 PM (9 years ago)

Author:

Simon Fraser

Message:

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.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (8 diffs)
• WebCore/platform/Logging.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Misc/WebKitLogging.h (modified) (1 diff)
• WebKit/mac/Plugins/WebNetscapePluginPackage.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2015-07-21  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -615 +615 @@
     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);
 }
@@ -1147 +1149 @@
         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
@@ -1161 +1165 @@
 void FrameView::layout(bool allowSubtree)
 {
-    if (isInLayout())
-        return;
-
-    if (layoutDisallowed())
-        return;
+    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()) {
+        LOG(Layout, "  layout is disallowed, bailing");
+        return;
+    }
 
     // Protect the view from being deleted during layout (in recalcStyle).
@@ -1181 +1190 @@
     if (inChildFrameLayoutWithFrameFlattening) {
         startLayoutAtMainFrameViewIfNeeded(allowSubtree);
+        LOG(Layout, "  frame flattening, starting from root");
         RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()->renderView();
         if (!root || !root->needsLayout())
@@ -1232 +1242 @@
         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.
@@ -1326 +1337 @@
 
             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) {
@@ -3015 +3027 @@
 void FrameView::performPostLayoutTasks()
 {
+    LOG(Layout, "FrameView %p performPostLayoutTasks", this);
+
     // FIXME: We should not run any JavaScript code in this function.
 
@@ -3163 +3177 @@
     if (m_inAutoSize)
         return;
+
+    LOG(Layout, "FrameView %p autoSizeIfEnabled", this);
 
     TemporaryChange<bool> changeInAutoSize(m_inAutoSize, true);

trunk/Source/WebCore/platform/Logging.h

@@ -54 +54 @@
     M(History) \
     M(IconDatabase) \
-    M(LiveConnect) \
+    M(Layout) \
     M(Loading) \
     M(Media) \

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+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.
+
 2015-07-21  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/mac/Misc/WebKitLogging.h

@@ -54 +54 @@
     M(History) \
     M(IconDatabase) \
-    M(LiveConnect) \
     M(Loading) \
     M(PageCache) \

trunk/Source/WebKit/mac/Plugins/WebNetscapePluginPackage.mm

@@ -260 +260 @@
     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();