Title: [129427] trunk/Source/WebCore
- Revision
- 129427
- Author
- [email protected]
- Date
- 2012-09-24 16:43:28 -0700 (Mon, 24 Sep 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (129426 => 129427)
--- trunk/Source/WebCore/ChangeLog 2012-09-24 23:12:00 UTC (rev 129426)
+++ trunk/Source/WebCore/ChangeLog 2012-09-24 23:43:28 UTC (rev 129427)
@@ -1,3 +1,23 @@
+2012-09-24 Tony Chang <[email protected]>
+
+ 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 <[email protected]>
[V8] ArrayBuffer code should not pass a negative length to SetIndexedPropertiesToExternalArrayData()
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (129426 => 129427)
--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-24 23:12:00 UTC (rev 129426)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2012-09-24 23:43:28 UTC (rev 129427)
@@ -222,19 +222,18 @@
}
}
-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
Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (129426 => 129427)
--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-24 23:12:00 UTC (rev 129426)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2012-09-24 23:43:28 UTC (rev 129427)
@@ -74,7 +74,7 @@
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;
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (129426 => 129427)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2012-09-24 23:12:00 UTC (rev 129426)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2012-09-24 23:43:28 UTC (rev 129427)
@@ -42,4 +42,11 @@
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;
}
+
+}
Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h (129426 => 129427)
--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2012-09-24 23:12:00 UTC (rev 129426)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.h 2012-09-24 23:43:28 UTC (rev 129427)
@@ -39,7 +39,7 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
