summaryrefslogtreecommitdiff
path: root/chromium/third_party/WebKit/Source/core/layout/LayoutView.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-07-14 17:41:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:37:36 +0000
commit399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch)
tree6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/third_party/WebKit/Source/core/layout/LayoutView.h
parent7366110654eec46f21b6824f302356426f48cd74 (diff)
downloadqtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/layout/LayoutView.h')
-rw-r--r--chromium/third_party/WebKit/Source/core/layout/LayoutView.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/core/layout/LayoutView.h b/chromium/third_party/WebKit/Source/core/layout/LayoutView.h
index 7d1fe25faf1..0441c819b88 100644
--- a/chromium/third_party/WebKit/Source/core/layout/LayoutView.h
+++ b/chromium/third_party/WebKit/Source/core/layout/LayoutView.h
@@ -128,7 +128,7 @@ public:
void absoluteQuads(Vector<FloatQuad>&) const override;
LayoutRect viewRect() const override;
- LayoutRect overflowClipRect(const LayoutPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const override;
+ LayoutRect overflowClipRect(const LayoutPoint& location, OverlayScrollbarClipBehavior = IgnoreOverlayScrollbarSize) const override;
bool shouldDoFullPaintInvalidationForNextLayout() const;
bool doingFullPaintInvalidation() const;
@@ -185,6 +185,7 @@ public:
void invalidateTreeIfNeeded(const PaintInvalidationState&) final;
LayoutRect visualOverflowRect() const override;
+ LayoutRect localOverflowRectForPaintInvalidation() const override;
// Invalidates paint for the entire view, including composited descendants, but not including child frames.
// It is very likely you do not want to call this method.