Changeset 95740 in webkit

Timestamp:

Sep 22, 2011 11:12:20 AM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=68638

Make RenderFlowThread cache whether or not it has regions of varying widths. This will
be relevant for performance as we begin adding code to do custom block painting and
layout based off regions not having the same width.

Reviewed by Dan Bernstein and Adam Roben.

• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::RenderFlowThread):
(WebCore::RenderFlowThread::layout):

• rendering/RenderFlowThread.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlowThread.cpp (modified) (4 diffs)
• rendering/RenderFlowThread.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-22  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=68638
+        
+        Make RenderFlowThread cache whether or not it has regions of varying widths. This will
+        be relevant for performance as we begin adding code to do custom block painting and
+        layout based off regions not having the same width.
+
+        Reviewed by Dan Bernstein and Adam Roben.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::RenderFlowThread):
+        (WebCore::RenderFlowThread::layout):
+        * rendering/RenderFlowThread.h:
+
 2011-09-22  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -48 +48 @@
     , m_hasValidRegions(false)
     , m_regionsInvalidated(false)
+    , m_regionsHaveUniformLogicalWidth(true)
     , m_regionFittingDisableCount(0)
 {
@@ -304 +305 @@
     if (m_regionsInvalidated) {
         m_regionsInvalidated = false;
+        m_hasValidRegions = false;
+        m_regionsHaveUniformLogicalWidth = true;
+        LayoutUnit previousRegionLogicalWidth = 0;
         if (hasRegions()) {
             int logicalHeight = 0;
@@ -314 +318 @@
                 ASSERT(!region->needsLayout());
                 
-                m_hasValidRegions = true;
+                LayoutUnit regionLogicalWidth;
 
                 IntRect regionRect;
@@ -320 +324 @@
                     regionRect = IntRect(0, logicalHeight, region->contentWidth(), region->contentHeight());
                     logicalHeight += regionRect.height();
+                    regionLogicalWidth = region->contentWidth();
                 } else {
                     regionRect = IntRect(logicalHeight, 0, region->contentWidth(), region->contentHeight());
                     logicalHeight += regionRect.width();
+                    regionLogicalWidth = region->contentHeight();
                 }
+
+                if (!m_hasValidRegions)
+                    m_hasValidRegions = true;
+                else if (m_regionsHaveUniformLogicalWidth && previousRegionLogicalWidth != regionLogicalWidth)
+                    m_regionsHaveUniformLogicalWidth = false;
+
+                previousRegionLogicalWidth = regionLogicalWidth;
 
                 region->setRegionRect(regionRect);

trunk/Source/WebCore/rendering/RenderFlowThread.h

@@ -106 +106 @@
     void enableRegionFitting() { ASSERT(m_regionFittingDisableCount > 0); m_regionFittingDisableCount--; }
 
+    bool regionsHaveUniformLogicalWidth() const { return m_regionsHaveUniformLogicalWidth; }
+    
     RenderRegion* mapFromFlowToRegion(TransformState&) const;
 
@@ -138 +140 @@
     bool m_hasValidRegions;
     bool m_regionsInvalidated;
+    bool m_regionsHaveUniformLogicalWidth;
     unsigned m_regionFittingDisableCount;
 };