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

Unified Diff: Source/web/WebPluginContainerImpl.cpp

Issue 955573002: Oilpan: fix build after r190700 (99fb464b7). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebPluginContainerImpl.cpp
diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
index 9c4b46251b5752f8d3c15b0d8179526976f0f12f..ab3a47e8f97dd029fd461b7cd06905dc06dd83b7 100644
--- a/Source/web/WebPluginContainerImpl.cpp
+++ b/Source/web/WebPluginContainerImpl.cpp
@@ -597,14 +597,19 @@ v8::Local<v8::Object> WebPluginContainerImpl::scriptableObject(v8::Isolate* isol
{
// The plugin may be destroyed due to re-entrancy when calling
// v8ScriptableObject below. crbug.com/458776. Hold a reference to the
- // plugin container to prevent this from happening.
+ // plugin container to prevent this from happening. For Oilpan, 'this'
+ // is already stack reachable, so redundant.
RefPtrWillBeRawPtr<WebPluginContainerImpl> protector(this);
v8::Local<v8::Object> object = m_webPlugin->v8ScriptableObject(isolate);
// If the plugin has been destroyed and the reference on the stack is the
// only one left, then don't return the scriptable object.
+#if ENABLE(OILPAN)
+ if (!m_webPlugin)
raymes 2015/02/24 23:55:26 Hmm I don't really understand what the problem was
raymes 2015/02/24 23:59:29 Actually I think this seems reasonable as it looks
sof 2015/02/25 07:04:49 If it ends up being disposed of, m_webPlugin will
+#else
if (hasOneRef())
+#endif
return v8::Local<v8::Object>();
if (!object.IsEmpty()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698