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

Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 558 matching lines @@
 
     DECLARE_VIRTUAL_TRACE();
     void notifyPageThatContentAreaWillPaint() const;
     FrameView* parentFrameView() const;
 
     // Returns the scrollable area for the frame.
     ScrollableArea* scrollableArea();
 
     int viewportWidth() const;
 
-    LayoutAnalyzer* layoutAnalyzer() { return m_analyzer.get(); }
+    LayoutAnalyzer& layoutAnalyzer() { return m_analyzer; }
 
 protected:
     // Scroll the content via the compositor.
     bool scrollContentsFastPath(const IntSize& scrollDelta);
 
     // Scroll the content by invalidating everything.
     void scrollContentsSlowPath(const IntRect& updateRect);
 
     bool isVerticalDocument() const;
     bool isFlippedDocument() const;
@@ skipping 120 matching lines @@
     // notifyScrollPositionChanged...there's too many ways to scroll this class. This needs
     // some cleanup.
     void setScrollOffsetFromUpdateScrollbars(const DoubleSize&);
 
     IntRect rectToCopyOnScroll() const;
 
     bool isFrameViewScrollbar(const Widget* child) const { return horizontalScrollbar() == child || verticalScrollbar() == child; }
 
     ScrollingCoordinator* scrollingCoordinator();
 
-    void prepareLayoutAnalyzer();
     PassRefPtr<TracedValue> analyzerCounters();
 
     // LayoutObject for the viewport-defining element (see Document::viewportDefiningElement).
     LayoutObject* viewportLayoutObject();
 
     LayoutSize m_size;
 
     typedef HashSet<RefPtr<LayoutEmbeddedObject>> EmbeddedObjectSet;
     EmbeddedObjectSet m_partUpdateSet;
 
@@ skipping 113 matching lines @@
 
     FloatSize m_elasticOverscroll;
 
     bool m_inUpdateScrollbars;
 
     IntPoint m_panScrollIconPoint;
     bool m_shouldDrawPanScrollIcon;
 
     bool m_clipsRepaints;
 
-    OwnPtr<LayoutAnalyzer> m_analyzer;
+    LayoutAnalyzer m_analyzer;
 };
 
 inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
 {
     if (m_isVisuallyNonEmpty)
         return;
     m_visuallyNonEmptyCharacterCount += count;
     // Use a threshold value to prevent very small amounts of visible content from triggering didFirstVisuallyNonEmptyLayout.
     // The first few hundred characters rarely contain the interesting content of the page.
     static const unsigned visualCharacterThreshold = 200;
@@ skipping 10 matching lines @@
     static const unsigned visualPixelThreshold = 32 * 32;
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h