diff options
Diffstat (limited to 'WebCore/rendering/RenderLayer.h')
| -rw-r--r-- | WebCore/rendering/RenderLayer.h | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/WebCore/rendering/RenderLayer.h b/WebCore/rendering/RenderLayer.h index db4da64..be3ddc6 100644 --- a/WebCore/rendering/RenderLayer.h +++ b/WebCore/rendering/RenderLayer.h @@ -249,14 +249,14 @@ public: // Scrolling methods for layers that can scroll their overflow. void scrollByRecursively(int xDelta, int yDelta); - IntSize scrolledContentOffset() const { return IntSize(scrollXOffset() + m_scrollLeftOverflow, scrollYOffset() + m_scrollTopOverflow); } + IntSize scrolledContentOffset() const { return IntSize(scrollXOffset() + m_scrollLeftOverflow, scrollYOffset()); } - int scrollXOffset() const { return m_scrollX + m_scrollOrigin.x(); } - int scrollYOffset() const { return m_scrollY + m_scrollOrigin.y(); } + int scrollXOffset() const { return m_scrollX + m_scrollOriginX; } + int scrollYOffset() const { return m_scrollY; } void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); - void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY + m_scrollOrigin.y()); } - void scrollToYOffset(int y) { scrollToOffset(m_scrollX + m_scrollOrigin.x(), y); } + void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } + void scrollToYOffset(int y) { scrollToOffset(m_scrollX + m_scrollOriginX, y); } void scrollRectToVisible(const IntRect&, bool scrollToAnchor = false, const ScrollAlignment& alignX = ScrollAlignment::alignCenterIfNeeded, const ScrollAlignment& alignY = ScrollAlignment::alignCenterIfNeeded); IntRect getRectToExpose(const IntRect& visibleRect, const IntRect& exposeRect, const ScrollAlignment& alignX, const ScrollAlignment& alignY); @@ -308,9 +308,7 @@ public: // Returns true if the accelerated compositing is enabled bool hasAcceleratedCompositing() const; - - bool canRender3DTransforms() const; - + void updateLayerPosition(); enum UpdateLayerPositionsFlag { @@ -644,22 +642,9 @@ protected: // Our scroll offsets if the view is scrolled. int m_scrollX; int m_scrollY; - - // There are 8 possible combinations of writing mode and direction. Scroll origin (and its corresponding left/top overflow) - // will be non-zero in the x or y axis if there is any reversed direction or writing-mode. The combinations are: - // writing-mode / direction scrollOrigin.x() set scrollOrigin.y() set - // horizontal-tb / ltr NO NO - // horizontal-tb / rtl YES NO - // horizontal-bt / ltr NO YES - // horizontal-bt / rtl YES YES - // vertical-lr / ltr NO NO - // vertical-lr / rtl NO YES - // vertical-rl / ltr YES NO - // vertical-rl / rtl YES YES - IntPoint m_scrollOrigin; - int m_scrollLeftOverflow; - int m_scrollTopOverflow; - + int m_scrollOriginX; // only non-zero for rtl content + int m_scrollLeftOverflow; // only non-zero for rtl content + // The width/height of our scrolled area. int m_scrollWidth; int m_scrollHeight; |