Title: [129645] trunk/Source/WebCore
- Revision
- 129645
- Author
- [email protected]
- Date
- 2012-09-26 08:04:48 -0700 (Wed, 26 Sep 2012)
Log Message
Web Inspector: display stack of last layout invalidation instead of first one
https://bugs.webkit.org/show_bug.cgi?id=97677
Reviewed by Vsevolod Vlasov.
- add a call to InspectorInstrumentation::didInvalidateLayout() when upgrading relayout root;
- do not suppress timeline's Invalidate Layout records other than first.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didInvalidateLayout):
* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129644 => 129645)
--- trunk/Source/WebCore/ChangeLog 2012-09-26 14:52:19 UTC (rev 129644)
+++ trunk/Source/WebCore/ChangeLog 2012-09-26 15:04:48 UTC (rev 129645)
@@ -1,3 +1,18 @@
+2012-09-26 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: display stack of last layout invalidation instead of first one
+ https://bugs.webkit.org/show_bug.cgi?id=97677
+
+ Reviewed by Vsevolod Vlasov.
+
+ - add a call to InspectorInstrumentation::didInvalidateLayout() when upgrading relayout root;
+ - do not suppress timeline's Invalidate Layout records other than first.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didInvalidateLayout):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
2012-09-25 Antti Koivisto <[email protected]>
Optimize stylesheet insertions
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (129644 => 129645)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-09-26 14:52:19 UTC (rev 129644)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-09-26 15:04:48 UTC (rev 129645)
@@ -234,8 +234,6 @@
void InspectorTimelineAgent::didInvalidateLayout(Frame* frame)
{
- if (frame->view()->layoutPending())
- return;
appendRecord(InspectorObject::create(), TimelineRecordType::InvalidateLayout, true, frame);
}
Modified: trunk/Source/WebCore/page/FrameView.cpp (129644 => 129645)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-09-26 14:52:19 UTC (rev 129644)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-09-26 15:04:48 UTC (rev 129645)
@@ -2183,19 +2183,21 @@
m_layoutRoot->markContainingBlocksForLayout(false, relayoutRoot);
m_layoutRoot = relayoutRoot;
ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
+ InspectorInstrumentation::didInvalidateLayout(m_frame.get());
} else {
// Just do a full relayout
if (m_layoutRoot)
m_layoutRoot->markContainingBlocksForLayout(false);
m_layoutRoot = 0;
relayoutRoot->markContainingBlocksForLayout(false);
+ InspectorInstrumentation::didInvalidateLayout(m_frame.get());
}
}
} else if (m_layoutSchedulingEnabled) {
- InspectorInstrumentation::didInvalidateLayout(m_frame.get());
int delay = m_frame->document()->minimumLayoutDelay();
m_layoutRoot = relayoutRoot;
ASSERT(!m_layoutRoot->container() || !m_layoutRoot->container()->needsLayout());
+ InspectorInstrumentation::didInvalidateLayout(m_frame.get());
m_delayedLayout = delay != 0;
m_layoutTimer.startOneShot(delay * 0.001);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
