diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
| commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
| tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h | |
| parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
| download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz | |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h b/chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h index b03b1aa6348..323bc8307c9 100644 --- a/chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h +++ b/chromium/third_party/blink/renderer/platform/scroll/scrollable_area.h @@ -26,6 +26,7 @@ #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCROLL_SCROLLABLE_AREA_H_ #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_SCROLL_SCROLLABLE_AREA_H_ +#include "base/single_thread_task_runner.h" #include "third_party/blink/renderer/platform/geometry/float_quad.h" #include "third_party/blink/renderer/platform/geometry/layout_rect.h" #include "third_party/blink/renderer/platform/graphics/color.h" @@ -156,7 +157,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { } // See Source/core/layout/README.md for an explanation of scroll origin. - const IntPoint& ScrollOrigin() const { return scroll_origin_; } + virtual IntPoint ScrollOrigin() const { return scroll_origin_; } bool ScrollOriginChanged() const { return scroll_origin_changed_; } // This is used to determine whether the incoming fractional scroll offset @@ -373,7 +374,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { // Need to promptly let go of owned animator objects. EAGERLY_FINALIZE(); - virtual void Trace(blink::Visitor*); + void Trace(blink::Visitor*) override; virtual void ClearScrollableArea(); @@ -492,7 +493,7 @@ class PLATFORM_EXPORT ScrollableArea : public GarbageCollectedMixin { unsigned mouse_over_scrollbar_ : 1; // Indicates that the next compositing update needs to call - // WebLayer::showScrollbars on our scroll layer. Ignored if not composited. + // cc::Layer::ShowScrollbars() on our scroll layer. Ignored if not composited. unsigned needs_show_scrollbar_layers_ : 1; unsigned uses_composited_scrolling_ : 1; |