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

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

Issue 2857523002: Revert of Remove FrameView::Root (Closed)
Patch Set: Created 3 years, 7 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 /* 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 3831 matching lines...) Expand 10 before | Expand all | Expand 10 after
3842 animating_scrollable_areas_ = new ScrollableAreaSet; 3842 animating_scrollable_areas_ = new ScrollableAreaSet;
3843 animating_scrollable_areas_->insert(scrollable_area); 3843 animating_scrollable_areas_->insert(scrollable_area);
3844 } 3844 }
3845 3845
3846 void FrameView::RemoveAnimatingScrollableArea(ScrollableArea* scrollable_area) { 3846 void FrameView::RemoveAnimatingScrollableArea(ScrollableArea* scrollable_area) {
3847 if (!animating_scrollable_areas_) 3847 if (!animating_scrollable_areas_)
3848 return; 3848 return;
3849 animating_scrollable_areas_->erase(scrollable_area); 3849 animating_scrollable_areas_->erase(scrollable_area);
3850 } 3850 }
3851 3851
3852 FrameView* FrameView::Root() const {
3853 const FrameView* top = this;
3854 while (top->Parent())
3855 top = ToFrameView(top->Parent());
3856 return const_cast<FrameView*>(top);
3857 }
3858
3852 void FrameView::SetParent(FrameViewBase* parent_frame_view_base) { 3859 void FrameView::SetParent(FrameViewBase* parent_frame_view_base) {
3853 FrameView* parent = ToFrameView(parent_frame_view_base); 3860 FrameView* parent = ToFrameView(parent_frame_view_base);
3854 if (parent == parent_) 3861 if (parent == parent_)
3855 return; 3862 return;
3856 3863
3857 DCHECK(!parent || !parent_); 3864 DCHECK(!parent || !parent_);
3858 if (!parent || !parent->IsVisible()) 3865 if (!parent || !parent->IsVisible())
3859 SetParentVisible(false); 3866 SetParentVisible(false);
3860 parent_ = parent; 3867 parent_ = parent;
3861 if (parent && parent->IsVisible()) 3868 if (parent && parent->IsVisible())
(...skipping 1525 matching lines...) Expand 10 before | Expand all | Expand 10 after
5387 void FrameView::SetAnimationHost( 5394 void FrameView::SetAnimationHost(
5388 std::unique_ptr<CompositorAnimationHost> host) { 5395 std::unique_ptr<CompositorAnimationHost> host) {
5389 animation_host_ = std::move(host); 5396 animation_host_ = std::move(host);
5390 } 5397 }
5391 5398
5392 LayoutUnit FrameView::CaretWidth() const { 5399 LayoutUnit FrameView::CaretWidth() const {
5393 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1)); 5400 return LayoutUnit(GetChromeClient()->WindowToViewportScalar(1));
5394 } 5401 }
5395 5402
5396 } // namespace blink 5403 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/web/WebInputEventConversion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698