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

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

Issue 2814643003: Remove FrameViewBase as base class of PluginView. (Closed)
Patch Set: Merge after dependency CL 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 /* 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 1485 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 void FrameView::UpdateGeometries() { 1496 void FrameView::UpdateGeometries() {
1497 Vector<RefPtr<LayoutPart>> parts; 1497 Vector<RefPtr<LayoutPart>> parts;
1498 CopyToVector(parts_, parts); 1498 CopyToVector(parts_, parts);
1499 1499
1500 for (auto part : parts) { 1500 for (auto part : parts) {
1501 // Script or plugins could detach the frame so abort processing if that 1501 // Script or plugins could detach the frame so abort processing if that
1502 // happens. 1502 // happens.
1503 if (GetLayoutViewItem().IsNull()) 1503 if (GetLayoutViewItem().IsNull())
1504 break; 1504 break;
1505 1505
1506 if (FrameViewBase* frame_view_base = part->PluginOrFrame()) { 1506 if (part->GetFrameOrPlugin()) {
1507 if (frame_view_base->IsFrameView()) { 1507 if (FrameView* frame_view = part->ChildFrameView()) {
1508 FrameView* frame_view = ToFrameView(frame_view_base);
1509 bool did_need_layout = frame_view->NeedsLayout(); 1508 bool did_need_layout = frame_view->NeedsLayout();
1510 part->UpdateGeometry(); 1509 part->UpdateGeometry();
1511 if (!did_need_layout && !frame_view->ShouldThrottleRendering()) 1510 if (!did_need_layout && !frame_view->ShouldThrottleRendering())
1512 frame_view->CheckDoesNotNeedLayout(); 1511 frame_view->CheckDoesNotNeedLayout();
1513 } else { 1512 } else {
1514 part->UpdateGeometry(); 1513 part->UpdateGeometry();
1515 } 1514 }
1516 } 1515 }
1517 } 1516 }
1518 } 1517 }
(...skipping 3815 matching lines...) Expand 10 before | Expand all | Expand 10 after
5334 void FrameView::SetAnimationHost( 5333 void FrameView::SetAnimationHost(
5335 std::unique_ptr<CompositorAnimationHost> host) { 5334 std::unique_ptr<CompositorAnimationHost> host) {
5336 animation_host_ = std::move(host); 5335 animation_host_ = std::move(host);
5337 } 5336 }
5338 5337
5339 LayoutUnit FrameView::CaretWidth() const { 5338 LayoutUnit FrameView::CaretWidth() const {
5340 return LayoutUnit(GetHostWindow()->WindowToViewportScalar(1)); 5339 return LayoutUnit(GetHostWindow()->WindowToViewportScalar(1));
5341 } 5340 }
5342 5341
5343 } // namespace blink 5342 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698