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

Unified Diff: content/renderer/gpu/gpu_benchmarking_extension.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 | « no previous file | content/renderer/pepper/ppb_var_deprecated_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/gpu_benchmarking_extension.cc
diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc
index 45a350a3466474bf75d400c5a6e16642e110ca9c..d4890b5af6147436d3fea6a3ccf81244b8a03f89 100644
--- a/content/renderer/gpu/gpu_benchmarking_extension.cc
+++ b/content/renderer/gpu/gpu_benchmarking_extension.cc
@@ -254,8 +254,11 @@ void OnMicroBenchmarkCompleted(
scoped_ptr<V8ValueConverter> converter =
make_scoped_ptr(V8ValueConverter::create());
v8::Handle<v8::Value> value = converter->ToV8Value(result.get(), context);
+#ifdef WEB_FRAME_USES_V8_LOCAL
+ v8::Local<v8::Value> argv[] = {value};
+#else
v8::Handle<v8::Value> argv[] = { value };
-
+#endif
frame->callFunctionEvenIfScriptDisabled(
callback_and_context->GetCallback(),
v8::Object::New(isolate),
« no previous file with comments | « no previous file | content/renderer/pepper/ppb_var_deprecated_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698