Title: [143806] trunk/Source/WebCore
- Revision
- 143806
- Author
- hara...@chromium.org
- Date
- 2013-02-22 15:04:36 -0800 (Fri, 22 Feb 2013)
Log Message
Unreviewed build fix. Added missing #if PLATFORM(CHROMIUM).
* dom/Document.cpp:
(WebCore::Document::recalcStyle):
* page/FrameView.cpp:
(WebCore::FrameView::layout):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143805 => 143806)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 23:00:57 UTC (rev 143805)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 23:04:36 UTC (rev 143806)
@@ -1,5 +1,14 @@
2013-02-22 Kentaro Hara <hara...@chromium.org>
+ Unreviewed build fix. Added missing #if PLATFORM(CHROMIUM).
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::layout):
+
+2013-02-22 Kentaro Hara <hara...@chromium.org>
+
Document::styleRecalc() and FrameView::layout() should be traced
https://bugs.webkit.org/show_bug.cgi?id=110646
Modified: trunk/Source/WebCore/dom/Document.cpp (143805 => 143806)
--- trunk/Source/WebCore/dom/Document.cpp 2013-02-22 23:00:57 UTC (rev 143805)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-02-22 23:04:36 UTC (rev 143806)
@@ -1755,7 +1755,9 @@
if (m_inStyleRecalc)
return; // Guard against re-entrancy. -dwh
+#if PLATFORM(CHROMIUM)
TRACE_EVENT0("webkit", "Document::recalcStyle");
+#endif
// FIXME: We should update style on our ancestor chain before proceeding (especially for seamless),
// however doing so currently causes several tests to crash, as Frame::setDocument calls Document::attach
Modified: trunk/Source/WebCore/page/FrameView.cpp (143805 => 143806)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-02-22 23:00:57 UTC (rev 143805)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-02-22 23:04:36 UTC (rev 143806)
@@ -1044,7 +1044,9 @@
if (m_inLayout)
return;
+#if PLATFORM(CHROMIUM)
TRACE_EVENT0("webkit", "FrameView::layout");
+#endif
// Protect the view from being deleted during layout (in recalcStyle)
RefPtr<FrameView> protector(this);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
