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

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

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

Powered by Google App Engine
This is Rietveld 408576698