Replace 2 uses of updateLogicalHeight with computeLogicalHeight

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

Reviewed by Ojan Vafai.

More work for bug 96804.  This is just a refactoring.

No new tests, behavior should be the same as before.

* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::computeLogicalHeight):
* rendering/RenderFlowThread.h:
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):
(WebCore):
* rendering/RenderMultiColumnFlowThread.h:
(RenderMultiColumnFlowThread):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@129427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e0b80d40b02c61cdaea1ad3cb7b7bb78fa5f32d3..65c38e2394fbceb8a2aa600e2daf69525c66fd93 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2012-09-24  Tony Chang  <tony@chromium.org>
+
+        Replace 2 uses of updateLogicalHeight with computeLogicalHeight
+        https://bugs.webkit.org/show_bug.cgi?id=97486
+
+        Reviewed by Ojan Vafai.
+
+        More work for bug 96804.  This is just a refactoring.
+
+        No new tests, behavior should be the same as before.
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::computeLogicalHeight):
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderMultiColumnFlowThread.cpp:
+        (WebCore::RenderMultiColumnFlowThread::computeLogicalHeight):
+        (WebCore):
+        * rendering/RenderMultiColumnFlowThread.h:
+        (RenderMultiColumnFlowThread):
+
 2012-09-21  Kenneth Russell  <kbr@google.com>
 
         [V8] ArrayBuffer code should not pass a negative length to SetIndexedPropertiesToExternalArrayData()

diff --git a/Source/WebCore/rendering/RenderFlowThread.cpp b/Source/WebCore/rendering/RenderFlowThread.cpp
index 0741ea8c8af482e25a9c5cc42be4f89f3f453164..d5a99b7bb0a7a7dd39baebdc228bbfb23ac7f952 100644 (file)
--- a/Source/WebCore/rendering/RenderFlowThread.cpp
+++ b/Source/WebCore/rendering/RenderFlowThread.cpp
@@ -222,19 +222,18 @@ void RenderFlowThread::updateLogicalWidth()
     }
 }
 
-void RenderFlowThread::updateLogicalHeight()
+void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
 {
-    LayoutUnit logicalHeight = 0;
+    computedValues.m_position = logicalTop;
+    computedValues.m_extent = 0;
 
-    for (RenderRegionList::iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
+    for (RenderRegionList::const_iterator iter = m_regionList.begin(); iter != m_regionList.end(); ++iter) {
         RenderRegion* region = *iter;
         if (!region->isValid())
             continue;
         ASSERT(!region->needsLayout());
-        logicalHeight += region->logicalHeightOfAllFlowThreadContent();
+        computedValues.m_extent += region->logicalHeightOfAllFlowThreadContent();
     }
-
-    setLogicalHeight(logicalHeight);
 }
 
 void RenderFlowThread::paintFlowThreadPortionInRegion(PaintInfo& paintInfo, RenderRegion* region, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint& paintOffset) const

diff --git a/Source/WebCore/rendering/RenderFlowThread.h b/Source/WebCore/rendering/RenderFlowThread.h
index d09183d9566260dac30e4ef58956ddc1f69202c6..b942eee572e95adac3c089e1325376566dd16522 100644 (file)
--- a/Source/WebCore/rendering/RenderFlowThread.h
+++ b/Source/WebCore/rendering/RenderFlowThread.h
@@ -74,7 +74,7 @@ public:
     const RenderRegionList& renderRegionList() const { return m_regionList; }
 
     virtual void updateLogicalWidth() OVERRIDE;
-    virtual void updateLogicalHeight() OVERRIDE;
+    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
 
     void paintFlowThreadPortionInRegion(PaintInfo&, RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const LayoutPoint&) const;
     bool hitTestFlowThreadPortionInRegion(RenderRegion*, LayoutRect flowThreadPortionRect, LayoutRect flowThreadPortionOverflowRect, const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset) const;

diff --git a/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp b/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
index e553c5401c0e10b3951ec3eab0a0ae47a1e10310..562506842c1887e9a9f457cd9b45b7cb8eb0ee28 100644 (file)
--- a/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
+++ b/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp
@@ -42,4 +42,11 @@ const char* RenderMultiColumnFlowThread::renderName() const
     return "RenderMultiColumnFlowThread";
 }
 
+void RenderMultiColumnFlowThread::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
+{
+    // We simply remain at our intrinsic height.
+    computedValues.m_extent = logicalHeight;
+    computedValues.m_position = logicalTop;
+}
+
 }

diff --git a/Source/WebCore/rendering/RenderMultiColumnFlowThread.h b/Source/WebCore/rendering/RenderMultiColumnFlowThread.h
index 363cd077128cbf5c968974e7f2922e7c77a47548..59522278461bab7e765dcc2b73612e412a2bc502 100644 (file)
--- a/Source/WebCore/rendering/RenderMultiColumnFlowThread.h
+++ b/Source/WebCore/rendering/RenderMultiColumnFlowThread.h
@@ -39,7 +39,7 @@ public:
 private:
     virtual const char* renderName() const OVERRIDE;
     
-    virtual void updateLogicalHeight() OVERRIDE { } // We simply remain at our intrinsic height.
+    virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
 };
 
 } // namespace WebCore