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

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

Issue 2814643003: Remove FrameViewBase as base class of PluginView. (Closed)
Patch Set: Changed upstream to origin/master. 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 f38a80e5fa6048784cd43d080aa45094efbfdb5a..44f8c504d9c342534b45e7b1849249706ecbb9f8 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1506,8 +1506,9 @@ void FrameView::UpdateGeometries() {
if (GetLayoutViewItem().IsNull())
break;
- if (FrameViewBase* frame_view_base = part->PluginOrFrame()) {
- if (frame_view_base->IsFrameView()) {
+ if (FrameOrPlugin* frame_or_plugin = part->GetFrameOrPlugin()) {
+ FrameViewBase* frame_view_base = part->GetFrameViewBase();
+ if (frame_view_base && frame_view_base->IsFrameView()) {
FrameView* frame_view = ToFrameView(frame_view_base);
bool did_need_layout = frame_view->NeedsLayout();
part->UpdateGeometry();

Powered by Google App Engine
This is Rietveld 408576698