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

Unified Diff: content/shell/tools/plugin/main.cpp

Issue 656223002: Use puts() instead of pluginLog() to avoid running JS during detach. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment Created 6 years, 2 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: content/shell/tools/plugin/main.cpp
diff --git a/content/shell/tools/plugin/main.cpp b/content/shell/tools/plugin/main.cpp
index 6cfab1c41011755ff5c7bb0076a93b1a30a19675..ed1fb3c18b6c8a80b51f4137cec85b9aced410ea 100644
--- a/content/shell/tools/plugin/main.cpp
+++ b/content/shell/tools/plugin/main.cpp
@@ -348,8 +348,11 @@ NPError NPP_Destroy(NPP instance, NPSavedData **save)
if (obj->evaluateScriptOnMouseDownOrKeyDown)
free(obj->evaluateScriptOnMouseDownOrKeyDown);
- if (obj->logDestroy)
- pluginLog(instance, "NPP_Destroy");
+ if (obj->logDestroy) {
+ // Note: this intentionally avoids using pluginLog(), because that
+ // requires running JS during document detach, which is forbidden.
+ puts("PLUGIN: NPP_Destroy");
+ }
#ifdef XP_MACOSX
if (obj->coreAnimationLayer)
« 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