Changeset 128184 in webkit

Timestamp:

Sep 11, 2012 7:34:35 AM (12 years ago)

Author:

caseq@chromium.org

Message:

Web Inspector: visualize layout root in Timeline
​https://bugs.webkit.org/show_bug.cgi?id=96279

Reviewed by Pavel Feldman.

• pass layout root to InspectorTimelineAgent::didLayout
• show rectangles of the layout root upon hover over the Layout record;

• inspector/InspectorInstrumentation.cpp:

(WebCore):
(WebCore::InspectorInstrumentation::didLayoutImpl):

• inspector/InspectorInstrumentation.h:

(WebCore):
(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::didLayout):

• inspector/InspectorTimelineAgent.cpp:

(WebCore::InspectorTimelineAgent::didLayout):

• inspector/InspectorTimelineAgent.h:

(WebCore):
(InspectorTimelineAgent):

• inspector/TimelineRecordFactory.cpp:

(WebCore::TimelineRecordFactory::createPaintData):
(WebCore::TimelineRecordFactory::addRectData):
(WebCore):

• inspector/TimelineRecordFactory.h:

(TimelineRecordFactory):

• inspector/front-end/TimelinePanel.js:

(WebInspector.TimelinePanel.prototype._mouseMove):

• page/FrameView.cpp:

(WebCore::FrameView::layout):

Location:

trunk

Files:

• LayoutTests/inspector/timeline/timeline-layout-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/localizedStrings.js (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (4 diffs)
• Source/WebCore/inspector/InspectorTimelineAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorTimelineAgent.h (modified) (2 diffs)
• Source/WebCore/inspector/TimelineRecordFactory.cpp (modified) (1 diff)
• Source/WebCore/inspector/TimelineRecordFactory.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/TimelinePanel.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/TimelinePresentationModel.js (modified) (3 diffs)
• Source/WebCore/page/FrameView.cpp (modified) (1 diff)

trunk/LayoutTests/inspector/timeline/timeline-layout-expected.txt

@@ -7 +7 @@
     counters : <object>
     data : {
+        height : <number>
+        width : <number>
+        x : 0
+        y : 0
     }
     endTime : <number>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: visualize layout root in Timeline
+        https://bugs.webkit.org/show_bug.cgi?id=96279
+
+        Reviewed by Pavel Feldman.
+
+        - pass layout root to InspectorTimelineAgent::didLayout
+        - show rectangles of the layout root upon hover over the Layout record;
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        (WebCore::InspectorInstrumentation::didLayoutImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore):
+        (InspectorInstrumentation):
+        (WebCore::InspectorInstrumentation::didLayout):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::didLayout):
+        * inspector/InspectorTimelineAgent.h:
+        (WebCore):
+        (InspectorTimelineAgent):
+        * inspector/TimelineRecordFactory.cpp:
+        (WebCore::TimelineRecordFactory::createPaintData):
+        (WebCore::TimelineRecordFactory::addRectData):
+        (WebCore):
+        * inspector/TimelineRecordFactory.h:
+        (TimelineRecordFactory):
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel.prototype._mouseMove):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
+2012-09-10  Andrey Kosyakov  <caseq@chromium.org>
+
+        Web Inspector: highlight of paint rectangles is broken
+        https://bugs.webkit.org/show_bug.cgi?id=96276
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::drawRectHighlight): Fix JS method name to match the one in InspectorOverlayPage.html
+
 2012-09-11  Chris Guan  <chris.guan@torchmobile.com.cn>
 

trunk/Source/WebCore/English.lproj/localizedStrings.js

@@ -732 +732 @@
 localizedStrings["Override Device Orientation"] = "Override Device Orientation";
 localizedStrings["Note"] = "Note";
-localizedStrings["Forced synchronous layout is a possible performance bottlenck."] = "Forced synchronous layout is a possible performance bottlenck.";
+localizedStrings["Forced synchronous layout is a possible performance bottleneck."] = "Forced synchronous layout is a possible performance bottleneck.";
 localizedStrings["Styles invalidated"] = "Styles invalidated";
 localizedStrings["Styles recalculation forced"] = "Styles recalculation forced";

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -452 +452 @@
 }
 
-void InspectorInstrumentation::didLayoutImpl(const InspectorInstrumentationCookie& cookie)
+void InspectorInstrumentation::didLayoutImpl(const InspectorInstrumentationCookie& cookie, RenderObject* root)
 {
     if (!cookie.first)
@@ -458 +458 @@
 
     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
-        timelineAgent->didLayout();
+        timelineAgent->didLayout(root);
 
     if (InspectorPageAgent* pageAgent = cookie.first->inspectorPageAgent())

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -66 +66 @@
 class KURL;
 class Node;
+class RenderObject;
 class ResourceRequest;
 class ResourceResponse;
@@ -145 +146 @@
     static void didInvalidateLayout(Frame*);
     static InspectorInstrumentationCookie willLayout(Frame*);
-    static void didLayout(const InspectorInstrumentationCookie&);
+    static void didLayout(const InspectorInstrumentationCookie&, RenderObject*);
     static void didScroll(Page*);
     static InspectorInstrumentationCookie willLoadXHR(ScriptExecutionContext*, XMLHttpRequest*);
@@ -322 +323 @@
     static void didInvalidateLayoutImpl(InstrumentingAgents*, Frame*);
     static InspectorInstrumentationCookie willLayoutImpl(InstrumentingAgents*, Frame*);
-    static void didLayoutImpl(const InspectorInstrumentationCookie&);
+    static void didLayoutImpl(const InspectorInstrumentationCookie&, RenderObject*);
     static void didScrollImpl(InstrumentingAgents*);
     static InspectorInstrumentationCookie willLoadXHRImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
@@ -834 +835 @@
 }
 
-inline void InspectorInstrumentation::didLayout(const InspectorInstrumentationCookie& cookie)
-{
-#if ENABLE(INSPECTOR)
-    FAST_RETURN_IF_NO_FRONTENDS(void());
-    if (cookie.first)
-        didLayoutImpl(cookie);
+inline void InspectorInstrumentation::didLayout(const InspectorInstrumentationCookie& cookie, RenderObject* root)
+{
+#if ENABLE(INSPECTOR)
+    FAST_RETURN_IF_NO_FRONTENDS(void());
+    if (cookie.first)
+        didLayoutImpl(cookie, root);
 #endif
 }

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -47 +47 @@
 #include "InstrumentingAgents.h"
 #include "IntRect.h"
+#include "RenderObject.h"
+#include "RenderView.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -243 +245 @@
 }
 
-void InspectorTimelineAgent::didLayout()
-{
+void InspectorTimelineAgent::didLayout(RenderObject* root)
+{
+    if (m_recordStack.isEmpty())
+        return;
+    LayoutRect rect = root->frame()->view()->contentsToRootView(root->absoluteBoundingBoxRect());
+    TimelineRecordEntry entry = m_recordStack.last();
+    ASSERT(entry.type == TimelineRecordType::Layout);
+    TimelineRecordFactory::addRectData(entry.data.get(), rect);
     didCompleteCurrentRecord(TimelineRecordType::Layout);
 }

trunk/Source/WebCore/inspector/InspectorTimelineAgent.h

@@ -53 +53 @@
 class InstrumentingAgents;
 class IntRect;
+class RenderObject;
 class ResourceRequest;
 class ResourceResponse;
@@ -99 +100 @@
     void didInvalidateLayout(Frame*);
     void willLayout(Frame*);
-    void didLayout();
+    void didLayout(RenderObject*);
 
     void didScheduleStyleRecalculation(Frame*);

trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp

@@ -174 +174 @@
 {
     RefPtr<InspectorObject> data = InspectorObject::create();
+    addRectData(data.get(), rect);
+    return data.release();
+}
+
+PassRefPtr<InspectorObject> TimelineRecordFactory::createDecodeImageData(const String& imageType)
+{
+    RefPtr<InspectorObject> data = InspectorObject::create();
+    data->setString("imageType", imageType);
+    return data.release();
+}
+
+PassRefPtr<InspectorObject> TimelineRecordFactory::createResizeImageData(bool shouldCache)
+{
+    RefPtr<InspectorObject> data = InspectorObject::create();
+    data->setBoolean("cached", shouldCache);
+    return data.release();
+}
+
+PassRefPtr<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned int length, unsigned int startLine)
+{
+    RefPtr<InspectorObject> data = InspectorObject::create();
+    data->setNumber("length", length);
+    data->setNumber("startLine", startLine);
+    return data.release();
+}
+
+PassRefPtr<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
+{
+    RefPtr<InspectorObject> data = InspectorObject::create();
+    data->setNumber("id", callbackId);
+    return data.release();
+}
+
+void TimelineRecordFactory::addRectData(InspectorObject* data, const LayoutRect& rect)
+{
     data->setNumber("x", rect.x());
     data->setNumber("y", rect.y());
     data->setNumber("width", rect.width());
     data->setNumber("height", rect.height());
-    return data.release();
-}
-
-PassRefPtr<InspectorObject> TimelineRecordFactory::createDecodeImageData(const String& imageType)
-{
-    RefPtr<InspectorObject> data = InspectorObject::create();
-    data->setString("imageType", imageType);
-    return data.release();
-}
-
-PassRefPtr<InspectorObject> TimelineRecordFactory::createResizeImageData(bool shouldCache)
-{
-    RefPtr<InspectorObject> data = InspectorObject::create();
-    data->setBoolean("cached", shouldCache);
-    return data.release();
-}
-
-PassRefPtr<InspectorObject> TimelineRecordFactory::createParseHTMLData(unsigned int length, unsigned int startLine)
-{
-    RefPtr<InspectorObject> data = InspectorObject::create();
-    data->setNumber("length", length);
-    data->setNumber("startLine", startLine);
-    return data.release();
-}
-
-PassRefPtr<InspectorObject> TimelineRecordFactory::createAnimationFrameData(int callbackId)
-{
-    RefPtr<InspectorObject> data = InspectorObject::create();
-    data->setNumber("id", callbackId);
-    return data.release();
 }
 

trunk/Source/WebCore/inspector/TimelineRecordFactory.h

@@ -78 +78 @@
         static PassRefPtr<InspectorObject> createPaintData(const LayoutRect&);
 
+        static void addRectData(InspectorObject*, const LayoutRect&);
+
         static PassRefPtr<InspectorObject> createDecodeImageData(const String& imageType);
 

trunk/Source/WebCore/inspector/front-end/TimelinePanel.js

@@ -948 +948 @@
         var anchor = this._getPopoverAnchor(e.target);
 
-        if (anchor && anchor.row && anchor.row._record.type === "Paint")
+        const recordType = WebInspector.TimelineModel.RecordType;
+        if (anchor && anchor.row && (anchor.row._record.type === recordType.Paint || anchor.row._record.type === recordType.Layout))
             this._highlightRect(anchor.row._record);
         else

trunk/Source/WebCore/inspector/front-end/TimelinePresentationModel.js

@@ -219 +219 @@
 }
 
+WebInspector.TimelinePresentationModel._hiddenRecords = { }
+WebInspector.TimelinePresentationModel._hiddenRecords[WebInspector.TimelineModel.RecordType.MarkDOMContent] = 1;
+WebInspector.TimelinePresentationModel._hiddenRecords[WebInspector.TimelineModel.RecordType.MarkLoad] = 1;
+WebInspector.TimelinePresentationModel._hiddenRecords[WebInspector.TimelineModel.RecordType.ScheduleStyleRecalculation] = 1;
+WebInspector.TimelinePresentationModel._hiddenRecords[WebInspector.TimelineModel.RecordType.InvalidateLayout] = 1;
+
 WebInspector.TimelinePresentationModel.prototype = {
     /**
@@ -279 +285 @@
     {
         const recordTypes = WebInspector.TimelineModel.RecordType;
-        const hiddenRecords = [
-            recordTypes.MarkDOMContent,
-            recordTypes.MarkLoad,
-            recordTypes.ScheduleStyleRecalculation,
-            recordTypes.InvalidateLayout
-        ];
-        var isHiddenRecord = hiddenRecords.indexOf(record.type) >= 0;
+        var isHiddenRecord = record.type in WebInspector.TimelinePresentationModel._hiddenRecords;
         var connectedToOldRecord = false;
         if (record.type === recordTypes.Time)
@@ -789 +789 @@
                 if (this.stackTrace) {
                     callStackLabel = WebInspector.UIString("Layout forced");
-                    contentHelper._appendTextRow(WebInspector.UIString("Note"), WebInspector.UIString("Forced synchronous layout is a possible performance bottlenck."));
+                    contentHelper._appendTextRow(WebInspector.UIString("Note"), WebInspector.UIString("Forced synchronous layout is a possible performance bottleneck."));
                 }
                 break;

trunk/Source/WebCore/page/FrameView.cpp

@@ -1253 +1253 @@
     }
 
-    InspectorInstrumentation::didLayout(cookie);
+    InspectorInstrumentation::didLayout(cookie, root);
 
     m_nestedLayoutCount--;