Chromium Code Reviews| Index: Source/core/rendering/RenderBox.h |
| diff --git a/Source/core/rendering/RenderBox.h b/Source/core/rendering/RenderBox.h |
| index 7462d2b12a1f507ea630c47ee30da50ded1d2e09..f299c3daa5ddebe71e49bd38d8b7d17b01b8f2ee 100644 |
| --- a/Source/core/rendering/RenderBox.h |
| +++ b/Source/core/rendering/RenderBox.h |
| @@ -97,11 +97,6 @@ public: |
| int pixelSnappedWidth() const { return m_frameRect.pixelSnappedWidth(); } |
| int pixelSnappedHeight() const { return m_frameRect.pixelSnappedHeight(); } |
| - // These represent your location relative to your container as a physical offset. |
| - // In layout related methods you almost always want the logical location (e.g. x() and y()). |
| - LayoutUnit top() const { return topLeftLocation().y(); } |
| - LayoutUnit left() const { return topLeftLocation().x(); } |
| - |
| void setX(LayoutUnit x) { m_frameRect.setX(x); } |
| void setY(LayoutUnit y) { m_frameRect.setY(y); } |
| void setWidth(LayoutUnit width) { m_frameRect.setWidth(width); } |
| @@ -119,7 +114,6 @@ public: |
| LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const; |
| int pixelSnappedLogicalHeight() const { return style()->isHorizontalWritingMode() ? pixelSnappedHeight() : pixelSnappedWidth(); } |
| - int pixelSnappedLogicalWidth() const { return style()->isHorizontalWritingMode() ? pixelSnappedWidth() : pixelSnappedHeight(); } |
|
Julien - ping for review
2014/10/03 01:26:42
Let's keep this one for consistency.
|
| void setLogicalLeft(LayoutUnit left) |
| { |
| @@ -156,13 +150,6 @@ public: |
| else |
| setWidth(size); |
| } |
| - void setLogicalSize(const LayoutSize& size) |
| - { |
| - if (style()->isHorizontalWritingMode()) |
| - setSize(size); |
| - else |
| - setSize(size.transposedSize()); |
| - } |
| LayoutPoint location() const { return m_frameRect.location(); } |
| LayoutSize locationOffset() const { return LayoutSize(x(), y()); } |
| @@ -175,7 +162,6 @@ public: |
| void move(LayoutUnit dx, LayoutUnit dy) { m_frameRect.move(dx, dy); } |
| LayoutRect frameRect() const { return m_frameRect; } |
| - IntRect pixelSnappedFrameRect() const { return pixelSnappedIntRect(m_frameRect); } |
| void setFrameRect(const LayoutRect& rect) { m_frameRect = rect; } |
| LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); } |
| @@ -290,7 +276,6 @@ public: |
| void setMarginRight(LayoutUnit margin) { m_marginBox.setRight(margin); } |
| LayoutUnit marginLogicalLeft() const { return m_marginBox.logicalLeft(style()->writingMode()); } |
| - LayoutUnit marginLogicalRight() const { return m_marginBox.logicalRight(style()->writingMode()); } |
|
Julien - ping for review
2014/10/03 01:26:42
Ditto.
|
| virtual LayoutUnit marginBefore(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.before((overrideStyle ? overrideStyle : style())->writingMode()); } |
| virtual LayoutUnit marginAfter(const RenderStyle* overrideStyle = 0) const OVERRIDE FINAL { return m_marginBox.after((overrideStyle ? overrideStyle : style())->writingMode()); } |
| @@ -473,7 +458,6 @@ public: |
| bool canBeScrolledAndHasScrollableArea() const; |
| virtual bool canBeProgramaticallyScrolled() const; |
| virtual void autoscroll(const IntPoint&); |
| - bool autoscrollInProgress() const; |
| bool canAutoscroll() const; |
| IntSize calculateAutoscrollDirection(const IntPoint& windowPoint) const; |
| static RenderBox* findAutoscrollable(RenderObject*); |