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

Unified Diff: content/renderer/pepper/pepper_plugin_instance_impl.cc

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bad rebase. Created 4 years, 9 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
Index: content/renderer/pepper/pepper_plugin_instance_impl.cc
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
index 0ae6fc51b8ed96b8721c99eac720259ec56a104b..ec1ae2be5ce8c5cab281d5fdacd81db8d108e29e 100644
--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -103,7 +103,6 @@
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
-#include "third_party/WebKit/public/web/WebBindings.h"
#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
#include "third_party/WebKit/public/web/WebDocument.h"
@@ -157,7 +156,6 @@ using ppapi::thunk::PPB_ImageData_API;
using ppapi::Var;
using ppapi::ArrayBufferVar;
using ppapi::ViewData;
-using blink::WebBindings;
using blink::WebCanvas;
using blink::WebCursorInfo;
using blink::WebDocument;
@@ -2362,8 +2360,8 @@ PP_Var PepperPluginInstanceImpl::ExecuteScript(PP_Instance instance,
RecordFlashJavaScriptUse();
// Executing the script may remove the plugin from the DOM, so we need to keep
- // a reference to ourselves so that we can still process the result after the
- // WebBindings::evaluate() below.
+ // a reference to ourselves so that we can still process the result after
+ // running the script below.
scoped_refptr<PepperPluginInstanceImpl> ref(this);
V8VarConverter converter(pp_instance_, V8VarConverter::kAllowObjectVars);
PepperTryCatchVar try_catch(this, &converter, exception);

Powered by Google App Engine
This is Rietveld 408576698