Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Side by Side Diff: third_party/WebKit/Source/core/frame/RootFrameViewport.cpp

Issue 2826893003: Remove ScrollableArea::GetFrameViewBase and move ScheduleAnimation into subclasses. (Closed)
Patch Set: Remove UNREACHED Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/frame/RootFrameViewport.h" 5 #include "core/frame/RootFrameViewport.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/layout/ScrollAlignment.h" 8 #include "core/layout/ScrollAlignment.h"
9 #include "core/layout/ScrollAnchor.h" 9 #include "core/layout/ScrollAnchor.h"
10 #include "platform/geometry/DoubleRect.h" 10 #include "platform/geometry/DoubleRect.h"
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 LayoutViewport().UpdateCompositorScrollAnimations(); 442 LayoutViewport().UpdateCompositorScrollAnimations();
443 VisualViewport().UpdateCompositorScrollAnimations(); 443 VisualViewport().UpdateCompositorScrollAnimations();
444 } 444 }
445 445
446 void RootFrameViewport::CancelProgrammaticScrollAnimation() { 446 void RootFrameViewport::CancelProgrammaticScrollAnimation() {
447 ScrollableArea::CancelProgrammaticScrollAnimation(); 447 ScrollableArea::CancelProgrammaticScrollAnimation();
448 LayoutViewport().CancelProgrammaticScrollAnimation(); 448 LayoutViewport().CancelProgrammaticScrollAnimation();
449 VisualViewport().CancelProgrammaticScrollAnimation(); 449 VisualViewport().CancelProgrammaticScrollAnimation();
450 } 450 }
451 451
452 FrameViewBase* RootFrameViewport::GetFrameViewBase() {
453 return VisualViewport().GetFrameViewBase();
454 }
455
456 void RootFrameViewport::ClearScrollableArea() { 452 void RootFrameViewport::ClearScrollableArea() {
457 ScrollableArea::ClearScrollableArea(); 453 ScrollableArea::ClearScrollableArea();
458 LayoutViewport().ClearScrollableArea(); 454 LayoutViewport().ClearScrollableArea();
459 VisualViewport().ClearScrollableArea(); 455 VisualViewport().ClearScrollableArea();
460 } 456 }
461 457
462 DEFINE_TRACE(RootFrameViewport) { 458 DEFINE_TRACE(RootFrameViewport) {
463 visitor->Trace(visual_viewport_); 459 visitor->Trace(visual_viewport_);
464 visitor->Trace(layout_viewport_); 460 visitor->Trace(layout_viewport_);
465 ScrollableArea::Trace(visitor); 461 ScrollableArea::Trace(visitor);
466 } 462 }
467 463
468 } // namespace blink 464 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698