summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 11:40:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 12:42:11 +0000
commit5d87695f37678f96492b258bbab36486c59866b4 (patch)
treebe9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc
parent6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
downloadqtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc b/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc
index 204a7b15046..bfafb50b8a2 100644
--- a/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc
+++ b/chromium/third_party/blink/renderer/core/page/scrolling/root_scroller_controller.cc
@@ -96,11 +96,6 @@ PaintLayerScrollableArea* GetScrollableArea(const Element& element) {
} // namespace
-// static
-RootScrollerController* RootScrollerController::Create(Document& document) {
- return MakeGarbageCollected<RootScrollerController>(document);
-}
-
RootScrollerController::RootScrollerController(Document& document)
: document_(&document), effective_root_scroller_(&document) {}
@@ -303,13 +298,13 @@ bool RootScrollerController::IsValidImplicit(const Element& element) const {
// the URL bar movement). Test it for scrolling so that we only promote if
// we know we won't block scrolling the main document.
if (ancestor->IsLayoutView()) {
- const ComputedStyle* style = ancestor->Style();
- DCHECK(style);
+ const ComputedStyle* ancestor_style = ancestor->Style();
+ DCHECK(ancestor_style);
PaintLayerScrollableArea* area = ancestor->GetScrollableArea();
DCHECK(area);
- if (style->ScrollsOverflowY() && area->HasVerticalOverflow())
+ if (ancestor_style->ScrollsOverflowY() && area->HasVerticalOverflow())
return false;
} else {
if (ancestor->ShouldClipOverflow() || ancestor->HasMask() ||
@@ -343,7 +338,7 @@ void RootScrollerController::ApplyRootScrollerProperties(Node& node) {
if (IsA<LocalFrame>(frame_owner->ContentFrame())) {
LocalFrameView* frame_view =
- To<LocalFrameView>(frame_owner->OwnedEmbeddedContentView());
+ DynamicTo<LocalFrameView>(frame_owner->OwnedEmbeddedContentView());
bool is_root_scroller = &EffectiveRootScroller() == &node;