- Revision
- 90288
- Author
- [email protected]
- Date
- 2011-07-01 15:31:23 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Levi Weintraub <[email protected]>
Switch overflow and collapsedMargins to new layout types
https://bugs.webkit.org/show_bug.cgi?id=63840
Reviewed by Eric Seidel.
Switching overflow and collapsedMargins over to the new layout unit abstraction.
Also removing an unused function: blockDirectionOverflow
No new tests, no functionality changes.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::collapsedMarginBeforeForChild):
(WebCore::RenderBlock::collapsedMarginAfterForChild):
* rendering/RenderBlock.h:
(WebCore::RenderBlock::collapsedMarginBefore):
(WebCore::RenderBlock::collapsedMarginAfter):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::addOverflowFromChild):
(WebCore::RenderBox::addLayoutOverflow):
(WebCore::RenderBox::addVisualOverflow):
* rendering/RenderBox.h:
(WebCore::RenderBox::layoutOverflowRect):
(WebCore::RenderBox::minYLayoutOverflow):
(WebCore::RenderBox::maxYLayoutOverflow):
(WebCore::RenderBox::minXLayoutOverflow):
(WebCore::RenderBox::maxXLayoutOverflow):
(WebCore::RenderBox::maxLayoutOverflow):
(WebCore::RenderBox::logicalLeftLayoutOverflow):
(WebCore::RenderBox::logicalRightLayoutOverflow):
(WebCore::RenderBox::visualOverflowRect):
(WebCore::RenderBox::minYVisualOverflow):
(WebCore::RenderBox::maxYVisualOverflow):
(WebCore::RenderBox::minXVisualOverflow):
(WebCore::RenderBox::maxXVisualOverflow):
(WebCore::RenderBox::logicalLeftVisualOverflow):
(WebCore::RenderBox::logicalRightVisualOverflow):
(WebCore::RenderBox::addOverflowFromChild):
(WebCore::RenderBox::collapsedMarginBefore):
(WebCore::RenderBox::collapsedMarginAfter):
* rendering/RenderOverflow.h:
(WebCore::RenderOverflow::RenderOverflow):
(WebCore::RenderOverflow::minYLayoutOverflow):
(WebCore::RenderOverflow::maxYLayoutOverflow):
(WebCore::RenderOverflow::minXLayoutOverflow):
(WebCore::RenderOverflow::maxXLayoutOverflow):
(WebCore::RenderOverflow::minYVisualOverflow):
(WebCore::RenderOverflow::maxYVisualOverflow):
(WebCore::RenderOverflow::minXVisualOverflow):
(WebCore::RenderOverflow::maxXVisualOverflow):
(WebCore::RenderOverflow::setMinYLayoutOverflow):
(WebCore::RenderOverflow::setMaxYLayoutOverflow):
(WebCore::RenderOverflow::setMinXLayoutOverflow):
(WebCore::RenderOverflow::setMaxXLayoutOverflow):
(WebCore::RenderOverflow::setMinYVisualOverflow):
(WebCore::RenderOverflow::setMaxYVisualOverflow):
(WebCore::RenderOverflow::setMinXVisualOverflow):
(WebCore::RenderOverflow::setMaxXVisualOverflow):
(WebCore::RenderOverflow::layoutOverflowRect):
(WebCore::RenderOverflow::visualOverflowRect):
(WebCore::RenderOverflow::move):
(WebCore::RenderOverflow::addLayoutOverflow):
(WebCore::RenderOverflow::addVisualOverflow):
(WebCore::RenderOverflow::setLayoutOverflow):
(WebCore::RenderOverflow::setVisualOverflow):
(WebCore::RenderOverflow::resetLayoutOverflow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90287 => 90288)
--- trunk/Source/WebCore/ChangeLog 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/ChangeLog 2011-07-01 22:31:23 UTC (rev 90288)
@@ -1,3 +1,72 @@
+2011-07-01 Levi Weintraub <[email protected]>
+
+ Switch overflow and collapsedMargins to new layout types
+ https://bugs.webkit.org/show_bug.cgi?id=63840
+
+ Reviewed by Eric Seidel.
+
+ Switching overflow and collapsedMargins over to the new layout unit abstraction.
+
+ Also removing an unused function: blockDirectionOverflow
+
+ No new tests, no functionality changes.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::collapsedMarginBeforeForChild):
+ (WebCore::RenderBlock::collapsedMarginAfterForChild):
+ * rendering/RenderBlock.h:
+ (WebCore::RenderBlock::collapsedMarginBefore):
+ (WebCore::RenderBlock::collapsedMarginAfter):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::addOverflowFromChild):
+ (WebCore::RenderBox::addLayoutOverflow):
+ (WebCore::RenderBox::addVisualOverflow):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::layoutOverflowRect):
+ (WebCore::RenderBox::minYLayoutOverflow):
+ (WebCore::RenderBox::maxYLayoutOverflow):
+ (WebCore::RenderBox::minXLayoutOverflow):
+ (WebCore::RenderBox::maxXLayoutOverflow):
+ (WebCore::RenderBox::maxLayoutOverflow):
+ (WebCore::RenderBox::logicalLeftLayoutOverflow):
+ (WebCore::RenderBox::logicalRightLayoutOverflow):
+ (WebCore::RenderBox::visualOverflowRect):
+ (WebCore::RenderBox::minYVisualOverflow):
+ (WebCore::RenderBox::maxYVisualOverflow):
+ (WebCore::RenderBox::minXVisualOverflow):
+ (WebCore::RenderBox::maxXVisualOverflow):
+ (WebCore::RenderBox::logicalLeftVisualOverflow):
+ (WebCore::RenderBox::logicalRightVisualOverflow):
+ (WebCore::RenderBox::addOverflowFromChild):
+ (WebCore::RenderBox::collapsedMarginBefore):
+ (WebCore::RenderBox::collapsedMarginAfter):
+ * rendering/RenderOverflow.h:
+ (WebCore::RenderOverflow::RenderOverflow):
+ (WebCore::RenderOverflow::minYLayoutOverflow):
+ (WebCore::RenderOverflow::maxYLayoutOverflow):
+ (WebCore::RenderOverflow::minXLayoutOverflow):
+ (WebCore::RenderOverflow::maxXLayoutOverflow):
+ (WebCore::RenderOverflow::minYVisualOverflow):
+ (WebCore::RenderOverflow::maxYVisualOverflow):
+ (WebCore::RenderOverflow::minXVisualOverflow):
+ (WebCore::RenderOverflow::maxXVisualOverflow):
+ (WebCore::RenderOverflow::setMinYLayoutOverflow):
+ (WebCore::RenderOverflow::setMaxYLayoutOverflow):
+ (WebCore::RenderOverflow::setMinXLayoutOverflow):
+ (WebCore::RenderOverflow::setMaxXLayoutOverflow):
+ (WebCore::RenderOverflow::setMinYVisualOverflow):
+ (WebCore::RenderOverflow::setMaxYVisualOverflow):
+ (WebCore::RenderOverflow::setMinXVisualOverflow):
+ (WebCore::RenderOverflow::setMaxXVisualOverflow):
+ (WebCore::RenderOverflow::layoutOverflowRect):
+ (WebCore::RenderOverflow::visualOverflowRect):
+ (WebCore::RenderOverflow::move):
+ (WebCore::RenderOverflow::addLayoutOverflow):
+ (WebCore::RenderOverflow::addVisualOverflow):
+ (WebCore::RenderOverflow::setLayoutOverflow):
+ (WebCore::RenderOverflow::setVisualOverflow):
+ (WebCore::RenderOverflow::resetLayoutOverflow):
+
2011-07-01 Nate Chapin <[email protected]>
Ensure WorkerScriptLoader::notifyFinished() doesn't re-enter.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (90287 => 90288)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2011-07-01 22:31:23 UTC (rev 90288)
@@ -6088,7 +6088,7 @@
}
}
-int RenderBlock::collapsedMarginBeforeForChild(RenderBox* child) const
+LayoutUnit RenderBlock::collapsedMarginBeforeForChild(RenderBox* child) const
{
// If the child has the same directionality as we do, then we can just return its
// collapsed margin.
@@ -6105,7 +6105,7 @@
return marginBeforeForChild(child);
}
-int RenderBlock::collapsedMarginAfterForChild(RenderBox* child) const
+LayoutUnit RenderBlock::collapsedMarginAfterForChild(RenderBox* child) const
{
// If the child has the same directionality as we do, then we can just return its
// collapsed margin.
Modified: trunk/Source/WebCore/rendering/RenderBlock.h (90287 => 90288)
--- trunk/Source/WebCore/rendering/RenderBlock.h 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2011-07-01 22:31:23 UTC (rev 90288)
@@ -367,8 +367,8 @@
virtual bool isSelfCollapsingBlock() const;
- virtual int collapsedMarginBefore() const { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
- virtual int collapsedMarginAfter() const { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
+ virtual LayoutUnit collapsedMarginBefore() const { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }
+ virtual LayoutUnit collapsedMarginAfter() const { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }
virtual void repaintOverhangingFloats(bool paintAllDescendants);
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (90287 => 90288)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-01 22:31:23 UTC (rev 90288)
@@ -3209,12 +3209,12 @@
addVisualOverflow(IntRect(overflowLeft, overflowTop, overflowRight - overflowLeft, overflowBottom - overflowTop));
}
-void RenderBox::addOverflowFromChild(RenderBox* child, const IntSize& delta)
+void RenderBox::addOverflowFromChild(RenderBox* child, const LayoutSize& delta)
{
// Only propagate layout overflow from the child if the child isn't clipping its overflow. If it is, then
// its overflow is internal to it, and we don't care about it. layoutOverflowRectForPropagation takes care of this
// and just propagates the border box rect instead.
- IntRect childLayoutOverflowRect = child->layoutOverflowRectForPropagation(style());
+ LayoutRect childLayoutOverflowRect = child->layoutOverflowRectForPropagation(style());
childLayoutOverflowRect.move(delta);
addLayoutOverflow(childLayoutOverflowRect);
@@ -3223,19 +3223,19 @@
// overflow if we are clipping our own overflow.
if (child->hasSelfPaintingLayer() || hasOverflowClip())
return;
- IntRect childVisualOverflowRect = child->visualOverflowRectForPropagation(style());
+ LayoutRect childVisualOverflowRect = child->visualOverflowRectForPropagation(style());
childVisualOverflowRect.move(delta);
addVisualOverflow(childVisualOverflowRect);
}
-void RenderBox::addLayoutOverflow(const IntRect& rect)
+void RenderBox::addLayoutOverflow(const LayoutRect& rect)
{
- IntRect clientBox = clientBoxRect();
+ LayoutRect clientBox = clientBoxRect();
if (clientBox.contains(rect) || rect.isEmpty())
return;
// For overflow clip objects, we don't want to propagate overflow into unreachable areas.
- IntRect overflowRect(rect);
+ LayoutRect overflowRect(rect);
if (hasOverflowClip() || isRenderView()) {
// Overflow is in the block's coordinate space and thus is flipped for horizontal-bt and vertical-rl
// writing modes. At this stage that is actually a simplification, since we can treat horizontal-tb/bt as the same
@@ -3264,9 +3264,9 @@
m_overflow->addLayoutOverflow(overflowRect);
}
-void RenderBox::addVisualOverflow(const IntRect& rect)
+void RenderBox::addVisualOverflow(const LayoutRect& rect)
{
- IntRect borderBox = borderBoxRect();
+ LayoutRect borderBox = borderBoxRect();
if (borderBox.contains(rect) || rect.isEmpty())
return;
Modified: trunk/Source/WebCore/rendering/RenderBox.h (90287 => 90288)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-07-01 22:31:23 UTC (rev 90288)
@@ -139,36 +139,33 @@
// For horizontal-tb and vertical-lr they will match physical directions, but for horizontal-bt and vertical-rl, the top/bottom and left/right
// respectively are flipped when compared to their physical counterparts. For example minX is on the left in vertical-lr,
// but it is on the right in vertical-rl.
- IntRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : clientBoxRect(); }
- int minYLayoutOverflow() const { return m_overflow? m_overflow->minYLayoutOverflow() : borderTop(); }
- int maxYLayoutOverflow() const { return m_overflow ? m_overflow->maxYLayoutOverflow() : borderTop() + clientHeight(); }
- int minXLayoutOverflow() const { return m_overflow ? m_overflow->minXLayoutOverflow() : borderLeft(); }
- int maxXLayoutOverflow() const { return m_overflow ? m_overflow->maxXLayoutOverflow() : borderLeft() + clientWidth(); }
- IntSize maxLayoutOverflow() const { return IntSize(maxXLayoutOverflow(), maxYLayoutOverflow()); }
- int logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? minXLayoutOverflow() : minYLayoutOverflow(); }
- int logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? maxXLayoutOverflow() : maxYLayoutOverflow(); }
+ LayoutRect layoutOverflowRect() const { return m_overflow ? m_overflow->layoutOverflowRect() : clientBoxRect(); }
+ LayoutUnit minYLayoutOverflow() const { return m_overflow? m_overflow->minYLayoutOverflow() : borderTop(); }
+ LayoutUnit maxYLayoutOverflow() const { return m_overflow ? m_overflow->maxYLayoutOverflow() : borderTop() + clientHeight(); }
+ LayoutUnit minXLayoutOverflow() const { return m_overflow ? m_overflow->minXLayoutOverflow() : borderLeft(); }
+ LayoutUnit maxXLayoutOverflow() const { return m_overflow ? m_overflow->maxXLayoutOverflow() : borderLeft() + clientWidth(); }
+ LayoutSize maxLayoutOverflow() const { return LayoutSize(maxXLayoutOverflow(), maxYLayoutOverflow()); }
+ LayoutUnit logicalLeftLayoutOverflow() const { return style()->isHorizontalWritingMode() ? minXLayoutOverflow() : minYLayoutOverflow(); }
+ LayoutUnit logicalRightLayoutOverflow() const { return style()->isHorizontalWritingMode() ? maxXLayoutOverflow() : maxYLayoutOverflow(); }
- IntRect visualOverflowRect() const { return m_overflow ? m_overflow->visualOverflowRect() : borderBoxRect(); }
- int minYVisualOverflow() const { return m_overflow? m_overflow->minYVisualOverflow() : 0; }
- int maxYVisualOverflow() const { return m_overflow ? m_overflow->maxYVisualOverflow() : height(); }
- int minXVisualOverflow() const { return m_overflow ? m_overflow->minXVisualOverflow() : 0; }
- int maxXVisualOverflow() const { return m_overflow ? m_overflow->maxXVisualOverflow() : width(); }
- int logicalLeftVisualOverflow() const { return style()->isHorizontalWritingMode() ? minXVisualOverflow() : minYVisualOverflow(); }
- int logicalRightVisualOverflow() const { return style()->isHorizontalWritingMode() ? maxXVisualOverflow() : maxYVisualOverflow(); }
+ LayoutRect visualOverflowRect() const { return m_overflow ? m_overflow->visualOverflowRect() : borderBoxRect(); }
+ LayoutUnit minYVisualOverflow() const { return m_overflow? m_overflow->minYVisualOverflow() : 0; }
+ LayoutUnit maxYVisualOverflow() const { return m_overflow ? m_overflow->maxYVisualOverflow() : height(); }
+ LayoutUnit minXVisualOverflow() const { return m_overflow ? m_overflow->minXVisualOverflow() : 0; }
+ LayoutUnit maxXVisualOverflow() const { return m_overflow ? m_overflow->maxXVisualOverflow() : width(); }
+ LayoutUnit logicalLeftVisualOverflow() const { return style()->isHorizontalWritingMode() ? minXVisualOverflow() : minYVisualOverflow(); }
+ LayoutUnit logicalRightVisualOverflow() const { return style()->isHorizontalWritingMode() ? maxXVisualOverflow() : maxYVisualOverflow(); }
- void addLayoutOverflow(const IntRect&);
- void addVisualOverflow(const IntRect&);
+ void addLayoutOverflow(const LayoutRect&);
+ void addVisualOverflow(const LayoutRect&);
void addShadowOverflow();
- void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, IntSize(child->x(), child->y())); }
- void addOverflowFromChild(RenderBox* child, const IntSize& delta);
+ void addOverflowFromChild(RenderBox* child) { addOverflowFromChild(child, child->locationOffset()); }
+ void addOverflowFromChild(RenderBox* child, const LayoutSize& delta);
void clearLayoutOverflow();
void updateLayerTransform();
- void blockDirectionOverflow(bool isLineHorizontal, int& logicalTopLayoutOverflow, int& logicalBottomLayoutOverflow,
- int& logicalTopVisualOverflow, int& logicalBottomVisualOverflow);
-
LayoutUnit contentWidth() const { return clientWidth() - paddingLeft() - paddingRight(); }
LayoutUnit contentHeight() const { return clientHeight() - paddingTop() - paddingBottom(); }
LayoutUnit contentLogicalWidth() const { return style()->isHorizontalWritingMode() ? contentWidth() : contentHeight(); }
@@ -227,8 +224,8 @@
// methods.
enum MarginSign { PositiveMargin, NegativeMargin };
virtual bool isSelfCollapsingBlock() const { return false; }
- virtual int collapsedMarginBefore() const { return marginBefore(); }
- virtual int collapsedMarginAfter() const { return marginAfter(); }
+ virtual LayoutUnit collapsedMarginBefore() const { return marginBefore(); }
+ virtual LayoutUnit collapsedMarginAfter() const { return marginAfter(); }
virtual void absoluteRects(Vector<IntRect>&, const IntPoint& accumulatedOffset);
virtual void absoluteQuads(Vector<FloatQuad>&);
Modified: trunk/Source/WebCore/rendering/RenderOverflow.h (90287 => 90288)
--- trunk/Source/WebCore/rendering/RenderOverflow.h 2011-07-01 22:30:00 UTC (rev 90287)
+++ trunk/Source/WebCore/rendering/RenderOverflow.h 2011-07-01 22:31:23 UTC (rev 90288)
@@ -21,7 +21,7 @@
#ifndef RenderOverflow_h
#define RenderOverflow_h
-#include "IntRect.h"
+#include "LayoutTypes.h"
namespace WebCore
{
@@ -40,7 +40,7 @@
class RenderOverflow {
WTF_MAKE_NONCOPYABLE(RenderOverflow); WTF_MAKE_FAST_ALLOCATED;
public:
- RenderOverflow(const IntRect& layoutRect, const IntRect& visualRect)
+ RenderOverflow(const LayoutRect& layoutRect, const LayoutRect& visualRect)
: m_minYLayoutOverflow(layoutRect.y())
, m_maxYLayoutOverflow(layoutRect.maxY())
, m_minXLayoutOverflow(layoutRect.x())
@@ -52,61 +52,61 @@
{
}
- int minYLayoutOverflow() const { return m_minYLayoutOverflow; }
- int maxYLayoutOverflow() const { return m_maxYLayoutOverflow; }
- int minXLayoutOverflow() const { return m_minXLayoutOverflow; }
- int maxXLayoutOverflow() const { return m_maxXLayoutOverflow; }
- IntRect layoutOverflowRect() const;
+ LayoutUnit minYLayoutOverflow() const { return m_minYLayoutOverflow; }
+ LayoutUnit maxYLayoutOverflow() const { return m_maxYLayoutOverflow; }
+ LayoutUnit minXLayoutOverflow() const { return m_minXLayoutOverflow; }
+ LayoutUnit maxXLayoutOverflow() const { return m_maxXLayoutOverflow; }
+ LayoutRect layoutOverflowRect() const;
- int minYVisualOverflow() const { return m_minYVisualOverflow; }
- int maxYVisualOverflow() const { return m_maxYVisualOverflow; }
- int minXVisualOverflow() const { return m_minXVisualOverflow; }
- int maxXVisualOverflow() const { return m_maxXVisualOverflow; }
- IntRect visualOverflowRect() const;
+ LayoutUnit minYVisualOverflow() const { return m_minYVisualOverflow; }
+ LayoutUnit maxYVisualOverflow() const { return m_maxYVisualOverflow; }
+ LayoutUnit minXVisualOverflow() const { return m_minXVisualOverflow; }
+ LayoutUnit maxXVisualOverflow() const { return m_maxXVisualOverflow; }
+ LayoutRect visualOverflowRect() const;
- void setMinYLayoutOverflow(int overflow) { m_minYLayoutOverflow = overflow; }
- void setMaxYLayoutOverflow(int overflow) { m_maxYLayoutOverflow = overflow; }
- void setMinXLayoutOverflow(int overflow) { m_minXLayoutOverflow = overflow; }
- void setMaxXLayoutOverflow(int overflow) { m_maxXLayoutOverflow = overflow; }
+ void setMinYLayoutOverflow(LayoutUnit overflow) { m_minYLayoutOverflow = overflow; }
+ void setMaxYLayoutOverflow(LayoutUnit overflow) { m_maxYLayoutOverflow = overflow; }
+ void setMinXLayoutOverflow(LayoutUnit overflow) { m_minXLayoutOverflow = overflow; }
+ void setMaxXLayoutOverflow(LayoutUnit overflow) { m_maxXLayoutOverflow = overflow; }
- void setMinYVisualOverflow(int overflow) { m_minYVisualOverflow = overflow; }
- void setMaxYVisualOverflow(int overflow) { m_maxYVisualOverflow = overflow; }
- void setMinXVisualOverflow(int overflow) { m_minXVisualOverflow = overflow; }
- void setMaxXVisualOverflow(int overflow) { m_maxXVisualOverflow = overflow; }
+ void setMinYVisualOverflow(LayoutUnit overflow) { m_minYVisualOverflow = overflow; }
+ void setMaxYVisualOverflow(LayoutUnit overflow) { m_maxYVisualOverflow = overflow; }
+ void setMinXVisualOverflow(LayoutUnit overflow) { m_minXVisualOverflow = overflow; }
+ void setMaxXVisualOverflow(LayoutUnit overflow) { m_maxXVisualOverflow = overflow; }
- void move(int dx, int dy);
+ void move(LayoutUnit dx, LayoutUnit dy);
- void addLayoutOverflow(const IntRect&);
- void addVisualOverflow(const IntRect&);
+ void addLayoutOverflow(const LayoutRect&);
+ void addVisualOverflow(const LayoutRect&);
- void setLayoutOverflow(const IntRect&);
- void setVisualOverflow(const IntRect&);
+ void setLayoutOverflow(const LayoutRect&);
+ void setVisualOverflow(const LayoutRect&);
- void resetLayoutOverflow(const IntRect& defaultRect);
+ void resetLayoutOverflow(const LayoutRect& defaultRect);
private:
- int m_minYLayoutOverflow;
- int m_maxYLayoutOverflow;
- int m_minXLayoutOverflow;
- int m_maxXLayoutOverflow;
+ LayoutUnit m_minYLayoutOverflow;
+ LayoutUnit m_maxYLayoutOverflow;
+ LayoutUnit m_minXLayoutOverflow;
+ LayoutUnit m_maxXLayoutOverflow;
- int m_minYVisualOverflow;
- int m_maxYVisualOverflow;
- int m_minXVisualOverflow;
- int m_maxXVisualOverflow;
+ LayoutUnit m_minYVisualOverflow;
+ LayoutUnit m_maxYVisualOverflow;
+ LayoutUnit m_minXVisualOverflow;
+ LayoutUnit m_maxXVisualOverflow;
};
-inline IntRect RenderOverflow::layoutOverflowRect() const
+inline LayoutRect RenderOverflow::layoutOverflowRect() const
{
- return IntRect(m_minXLayoutOverflow, m_minYLayoutOverflow, m_maxXLayoutOverflow - m_minXLayoutOverflow, m_maxYLayoutOverflow - m_minYLayoutOverflow);
+ return LayoutRect(m_minXLayoutOverflow, m_minYLayoutOverflow, m_maxXLayoutOverflow - m_minXLayoutOverflow, m_maxYLayoutOverflow - m_minYLayoutOverflow);
}
-inline IntRect RenderOverflow::visualOverflowRect() const
+inline LayoutRect RenderOverflow::visualOverflowRect() const
{
- return IntRect(m_minXVisualOverflow, m_minYVisualOverflow, m_maxXVisualOverflow - m_minXVisualOverflow, m_maxYVisualOverflow - m_minYVisualOverflow);
+ return LayoutRect(m_minXVisualOverflow, m_minYVisualOverflow, m_maxXVisualOverflow - m_minXVisualOverflow, m_maxYVisualOverflow - m_minYVisualOverflow);
}
-inline void RenderOverflow::move(int dx, int dy)
+inline void RenderOverflow::move(LayoutUnit dx, LayoutUnit dy)
{
m_minYLayoutOverflow += dy;
m_maxYLayoutOverflow += dy;
@@ -119,7 +119,7 @@
m_maxXVisualOverflow += dx;
}
-inline void RenderOverflow::addLayoutOverflow(const IntRect& rect)
+inline void RenderOverflow::addLayoutOverflow(const LayoutRect& rect)
{
m_minYLayoutOverflow = std::min(rect.y(), m_minYLayoutOverflow);
m_maxYLayoutOverflow = std::max(rect.maxY(), m_maxYLayoutOverflow);
@@ -127,7 +127,7 @@
m_maxXLayoutOverflow = std::max(rect.maxX(), m_maxXLayoutOverflow);
}
-inline void RenderOverflow::addVisualOverflow(const IntRect& rect)
+inline void RenderOverflow::addVisualOverflow(const LayoutRect& rect)
{
m_minYVisualOverflow = std::min(rect.y(), m_minYVisualOverflow);
m_maxYVisualOverflow = std::max(rect.maxY(), m_maxYVisualOverflow);
@@ -135,7 +135,7 @@
m_maxXVisualOverflow = std::max(rect.maxX(), m_maxXVisualOverflow);
}
-inline void RenderOverflow::setLayoutOverflow(const IntRect& rect)
+inline void RenderOverflow::setLayoutOverflow(const LayoutRect& rect)
{
m_minYLayoutOverflow = rect.y();
m_maxYLayoutOverflow = rect.maxY();
@@ -143,7 +143,7 @@
m_maxXLayoutOverflow = rect.maxX();
}
-inline void RenderOverflow::setVisualOverflow(const IntRect& rect)
+inline void RenderOverflow::setVisualOverflow(const LayoutRect& rect)
{
m_minYVisualOverflow = rect.y();
m_maxYVisualOverflow = rect.maxY();
@@ -151,7 +151,7 @@
m_maxXVisualOverflow = rect.maxX();
}
-inline void RenderOverflow::resetLayoutOverflow(const IntRect& rect)
+inline void RenderOverflow::resetLayoutOverflow(const LayoutRect& rect)
{
m_minYLayoutOverflow = rect.y();
m_maxYLayoutOverflow = rect.maxY();
