| 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 {
|
|
|