Revert of Put LayoutAnalyzer back behind disabled-by-default-blink.debug.layout.

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 74e23dc96c9f96b191802d21986146f5ae768365..957f41cbf5f5c4b1a7da913de325bd673447235d 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -812,24 +812,9 @@
     root.layout();
 }
 
-void FrameView::prepareLayoutAnalyzer()
-{
-    bool isTracing = false;
-    TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("blink.debug.layout"), &isTracing);
-    if (!isTracing) {
-        m_analyzer.clear();
-        return;
-    }
-    if (!m_analyzer)
-        m_analyzer = adoptPtr(new LayoutAnalyzer());
-    m_analyzer->reset();
-}
-
 PassRefPtr<TracedValue> FrameView::analyzerCounters()
 {
-    if (!m_analyzer)
-        return TracedValue::create();
-    RefPtr<TracedValue> value = m_analyzer->toTracedValue();
+    RefPtr<TracedValue> value = layoutAnalyzer().toTracedValue();
     value->setString("host", layoutView()->document().location()->host());
     return value;
 }
@@ -841,7 +826,7 @@
     ASSERT(inSubtreeLayout || m_layoutSubtreeRoots.isEmpty());
 
     TRACE_EVENT_BEGIN0(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayout");
-    prepareLayoutAnalyzer();
+    layoutAnalyzer().reset();
 
     ScriptForbiddenScope forbidScript;
 
@@ -857,8 +842,7 @@
     forceLayoutParentViewIfNeeded();
 
     if (inSubtreeLayout) {
-        if (m_analyzer)
-            m_analyzer->increment(LayoutAnalyzer::PerformLayoutRootLayoutObjects, m_layoutSubtreeRoots.size());
+        layoutAnalyzer().increment(LayoutAnalyzer::PerformLayoutRootLayoutObjects, m_layoutSubtreeRoots.size());
         while (m_layoutSubtreeRoots.size()) {
             LayoutObject& root = *m_layoutSubtreeRoots.takeAny();
             if (!root.needsLayout())
@@ -879,8 +863,7 @@
 
     lifecycle().advanceTo(DocumentLifecycle::AfterPerformLayout);
 
-    if (m_analyzer)
-        m_analyzer->recordCounters();
+    layoutAnalyzer().recordCounters();
     TRACE_EVENT_END1(PERFORM_LAYOUT_TRACE_CATEGORIES, "FrameView::performLayout",
         "counters", analyzerCounters());
 }