third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp - Issue 1517993004: Oilpan: simplify plugin container finalization.

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/web/FrameLoaderClientImpl.cpp

Issue 1517993004: Oilpan: simplify plugin container finalization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify away disconnectContentFrame override Created 5 years 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/web/FrameLoaderClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

index 19de8ca09322a125c3c074063b2be30ce1ec4700..b0a439eb2e99b3e86cdec04eda188f3f1082522a 100644

--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

@@ -776,19 +776,11 @@ PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createPlugin(

RefPtrWillBeRawPtr<WebPluginContainerImpl> container =

WebPluginContainerImpl::create(element, webPlugin);

- if (!webPlugin->initialize(container.get())) {

-#if ENABLE(OILPAN)

- container->dispose();

-#endif

+ if (!webPlugin->initialize(container.get()))

return nullptr;

- }

- if (policy != AllowDetachedPlugin && !element->layoutObject()) {

-#if ENABLE(OILPAN)

- container->dispose();

-#endif

+ if (policy != AllowDetachedPlugin && !element->layoutObject())

return nullptr;

- }

return container;

}