FirstMeaningfulPaint UMA

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 1b09755291e499ef50f498b6aef95f6a619154db..ccfb615bc50a08c5385730fb2b109c33aef68417 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -229,6 +229,7 @@ void FrameView::reset()
     m_visuallyNonEmptyCharacterCount = 0;
     m_visuallyNonEmptyPixelCount = 0;
     m_isVisuallyNonEmpty = false;
+    m_layoutObjectCounter.reset();
     clearFragmentAnchor();
     m_viewportConstrainedObjects.reset();
     m_layoutSubtreeRootList.clear();
@@ -863,8 +864,9 @@ void FrameView::performLayout(bool inSubtreeLayout)
 {
     ASSERT(inSubtreeLayout || m_layoutSubtreeRootList.isEmpty());
 
+    int contentsHeightBeforeLayout = layoutViewItem().documentRect().height();
     TRACE_EVENT_BEGIN1(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayout",
-        "contentsHeightBeforeLayout", layoutViewItem().documentRect().height());
+        "contentsHeightBeforeLayout", contentsHeightBeforeLayout);
     prepareLayoutAnalyzer();
 
     ScriptForbiddenScope forbidScript;
@@ -906,6 +908,7 @@ void FrameView::performLayout(bool inSubtreeLayout)
 
     TRACE_EVENT_END1(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayout",
         "counters", analyzerCounters());
+    FirstMeaningfulPaintDetector::from(*m_frame->document()).markNextPaintAsMeaningfulIfNeeded(m_layoutObjectCounter, contentsHeightBeforeLayout, layoutViewItem().documentRect().height(), visibleHeight());
 }
 
 void FrameView::scheduleOrPerformPostLayoutTasks()