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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2814643003: Remove FrameViewBase as base class of PluginView. (Closed)
Patch Set: Address final comments 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index b264822119ba8bac4c538b5c09d5e0abd6d23a6e..4e2a3cfd6e16f6f3f423c85a32a0d1328611293d 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1503,9 +1503,8 @@ void FrameView::UpdateGeometries() {
if (GetLayoutViewItem().IsNull())
break;
- if (FrameViewBase* frame_view_base = part->PluginOrFrame()) {
- if (frame_view_base->IsFrameView()) {
- FrameView* frame_view = ToFrameView(frame_view_base);
+ if (part->GetFrameOrPlugin()) {
+ if (FrameView* frame_view = part->ChildFrameView()) {
bool did_need_layout = frame_view->NeedsLayout();
part->UpdateGeometry();
if (!did_need_layout && !frame_view->ShouldThrottleRendering())
@@ -4765,8 +4764,6 @@ void FrameView::Show() {
plugin->SetParentVisible(true);
}
}
-
- FrameViewBase::Show();
}
void FrameView::Hide() {
@@ -4792,8 +4789,6 @@ void FrameView::Hide() {
SetNeedsPaintPropertyUpdate();
}
}
-
- FrameViewBase::Hide();
}
int FrameView::ViewportWidth() const {
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.h ('k') | third_party/WebKit/Source/core/frame/RemoteFrameView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698