third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp - Issue 2814643003: Remove FrameViewBase as base class of PluginView.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.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:

Index: third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp b/third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

index a60df869c8d06488197bb815a35fb020ded16b91..1bd98107c1fb05fa6932ff584045ac8eae7731d8 100644

--- a/third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

@@ -138,8 +138,8 @@ void LayoutEmbeddedObject::GetLayout() {

UpdateLayerTransformAfterLayout();

- FrameViewBase* frame_view_base = this->PluginOrFrame();

- if (!frame_view_base && GetFrameView())

+ FrameOrPlugin* frame_or_plugin = GetFrameOrPlugin();

+ if (!frame_or_plugin && GetFrameView())

GetFrameView()->AddPartToUpdate(*this);

ClearNeedsLayout();