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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/bindings/v8/NPV8Object.cpp

Issue 10388233: Merge 117012 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 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 | « LayoutTests/plugins/npruntime/delete-plugin-within-setProperty-expected.txt ('k') | Source/WebCore/bindings/v8/V8NPObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/bindings/v8/NPV8Object.cpp
===================================================================
--- Source/WebCore/bindings/v8/NPV8Object.cpp (revision 118022)
+++ Source/WebCore/bindings/v8/NPV8Object.cpp (working copy)
@@ -336,7 +336,8 @@
if (v8result.IsEmpty())
return false;
- convertV8ObjectToNPVariant(v8result, npObject, result);
+ if (_NPN_IsAlive(npObject))
+ convertV8ObjectToNPVariant(v8result, npObject, result);
return true;
}
« no previous file with comments | « LayoutTests/plugins/npruntime/delete-plugin-within-setProperty-expected.txt ('k') | Source/WebCore/bindings/v8/V8NPObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698