| Index: third_party/WebKit/Source/core/frame/FrameView.h
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
|
| index f2a4129d0bd3ac00f9d88dfd600842707126f8d1..3b763f88f7fd692a06be49c60e527c3773644ab4 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -36,6 +36,7 @@
|
| #include "platform/geometry/IntRect.h"
|
| #include "platform/geometry/LayoutRect.h"
|
| #include "platform/graphics/Color.h"
|
| +#include "platform/graphics/paint/TransformPaintPropertyNode.h"
|
| #include "platform/scroll/ScrollTypes.h"
|
| #include "platform/scroll/ScrollableArea.h"
|
| #include "platform/scroll/Scrollbar.h"
|
| @@ -556,6 +557,13 @@ public:
|
| void setFrameTimingRequestsDirty(bool isDirty) { m_frameTimingRequestsDirty = isDirty; }
|
| bool frameTimingRequestsDirty() { return m_frameTimingRequestsDirty; }
|
|
|
| + // Paint properties for SPv2 Only.
|
| + void setPreTranslation(PassRefPtr<TransformPaintPropertyNode> preTranslation) { m_preTranslation = preTranslation; }
|
| + const TransformPaintPropertyNode* preTranslation() const { return m_preTranslation.get(); }
|
| +
|
| + void setScrollTranslation(PassRefPtr<TransformPaintPropertyNode> scrollTranslation) { m_scrollTranslation = scrollTranslation; }
|
| + const TransformPaintPropertyNode* scrollTranslation() const { return m_scrollTranslation.get(); }
|
| +
|
| protected:
|
| // Scroll the content via the compositor.
|
| bool scrollContentsFastPath(const IntSize& scrollDelta);
|
| @@ -832,6 +840,13 @@ private:
|
| // TODO(bokan): crbug.com/484188. We should specialize FrameView for the
|
| // main frame.
|
| OwnPtrWillBeMember<ScrollableArea> m_viewportScrollableArea;
|
| +
|
| + // Paint properties for SPv2 Only.
|
| + // The hierarchy of transform subtree created by a FrameView.
|
| + // [ preTranslation ] The offset from Widget::frameRect. Establishes viewport.
|
| + // +---[ scrollTranslation ] Frame scrolling. This is going away in favor of Settings::rootLayerScrolls.
|
| + RefPtr<TransformPaintPropertyNode> m_preTranslation;
|
| + RefPtr<TransformPaintPropertyNode> m_scrollTranslation;
|
| };
|
|
|
| inline void FrameView::incrementVisuallyNonEmptyCharacterCount(unsigned count)
|
|
|