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

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

Issue 2829613002: Remove ScheduleAnimation proxy methods, call HostWindow directly (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 2730 matching lines...) Expand 10 before | Expand all | Expand 10 after
2741 // FIXME: Why does this only apply to the main frame? 2741 // FIXME: Why does this only apply to the main frame?
2742 if (!frame_->IsMainFrame()) 2742 if (!frame_->IsMainFrame())
2743 return; 2743 return;
2744 AdjustScrollbarOpacity(); 2744 AdjustScrollbarOpacity();
2745 ContentsResized(); 2745 ContentsResized();
2746 UpdateScrollbars(); 2746 UpdateScrollbars();
2747 PositionScrollbarLayers(); 2747 PositionScrollbarLayers();
2748 } 2748 }
2749 2749
2750 bool FrameView::ScheduleAnimation() { 2750 bool FrameView::ScheduleAnimation() {
2751 return frame_->ScheduleAnimation(GetHostWindow()); 2751 if (HostWindow* window = GetHostWindow()) {
2752 window->ScheduleAnimation(frame_);
2753 return true;
2754 }
2755 return false;
2752 } 2756 }
2753 2757
2754 void FrameView::NotifyPageThatContentAreaWillPaint() const { 2758 void FrameView::NotifyPageThatContentAreaWillPaint() const {
2755 Page* page = frame_->GetPage(); 2759 Page* page = frame_->GetPage();
2756 if (!page) 2760 if (!page)
2757 return; 2761 return;
2758 2762
2759 ContentAreaWillPaint(); 2763 ContentAreaWillPaint();
2760 2764
2761 if (!scrollable_areas_) 2765 if (!scrollable_areas_)
(...skipping 2584 matching lines...) Expand 10 before | Expand all | Expand 10 after
5346 void FrameView::SetAnimationHost( 5350 void FrameView::SetAnimationHost(
5347 std::unique_ptr<CompositorAnimationHost> host) { 5351 std::unique_ptr<CompositorAnimationHost> host) {
5348 animation_host_ = std::move(host); 5352 animation_host_ = std::move(host);
5349 } 5353 }
5350 5354
5351 LayoutUnit FrameView::CaretWidth() const { 5355 LayoutUnit FrameView::CaretWidth() const {
5352 return LayoutUnit(GetHostWindow()->WindowToViewportScalar(1)); 5356 return LayoutUnit(GetHostWindow()->WindowToViewportScalar(1));
5353 } 5357 }
5354 5358
5355 } // namespace blink 5359 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698