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

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

Issue 1095463003: update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | content/renderer/web_ui_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/ppb_var_deprecated_impl.cc
diff --git a/content/renderer/pepper/ppb_var_deprecated_impl.cc b/content/renderer/pepper/ppb_var_deprecated_impl.cc
index 589981cfb9c4ca82d7b31a32e0d9c4a03407730f..064aeb1cc2e876d835ffdaf40f366f7c30a5bd1f 100644
--- a/content/renderer/pepper/ppb_var_deprecated_impl.cc
+++ b/content/renderer/pepper/ppb_var_deprecated_impl.cc
@@ -248,8 +248,14 @@ PP_Var CallDeprecatedInternal(PP_Var var,
return PP_MakeUndefined();
}
+#ifdef WEB_FRAME_USES_V8_LOCAL
+ scoped_ptr<v8::Local<v8::Value>[]> converted_args(
+ new v8::Local<v8::Value>[argc]);
+#else
scoped_ptr<v8::Handle<v8::Value>[] > converted_args(
new v8::Handle<v8::Value>[argc]);
+#endif
+
for (uint32_t i = 0; i < argc; ++i) {
converted_args[i] = try_catch.ToV8(argv[i]);
if (try_catch.HasException())
« no previous file with comments | « content/renderer/gpu/gpu_benchmarking_extension.cc ('k') | content/renderer/web_ui_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698