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

Unified Diff: content/renderer/v8_value_converter_impl.cc

Issue 259033002: [Android] Implement renderer side of Gin Java Bridge (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased, conflicts resolved Created 6 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 | « content/renderer/v8_value_converter_impl.h ('k') | content/renderer/v8_value_converter_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/v8_value_converter_impl.cc
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc
index b321f55cf6acc1e636febd90a55fceacd26d05c2..d12b26bdf07eb2383b0f5d92bcc0217d713f7f1b 100644
--- a/content/renderer/v8_value_converter_impl.cc
+++ b/content/renderer/v8_value_converter_impl.cc
@@ -38,7 +38,8 @@ bool V8ValueConverter::Strategy::FromV8Array(
}
bool V8ValueConverter::Strategy::FromV8ArrayBuffer(v8::Handle<v8::Object> value,
- base::Value** out) const {
+ base::Value** out,
+ v8::Isolate* isolate) const {
return false;
}
@@ -342,7 +343,7 @@ base::Value* V8ValueConverterImpl::FromV8ValueImpl(
}
if (val->IsArrayBuffer() || val->IsArrayBufferView())
- return FromV8ArrayBuffer(val->ToObject());
+ return FromV8ArrayBuffer(val->ToObject(), isolate);
if (val->IsObject())
return FromV8Object(val->ToObject(), state, isolate);
@@ -405,10 +406,11 @@ base::Value* V8ValueConverterImpl::FromV8Array(
}
base::Value* V8ValueConverterImpl::FromV8ArrayBuffer(
- v8::Handle<v8::Object> val) const {
+ v8::Handle<v8::Object> val,
+ v8::Isolate* isolate) const {
if (strategy_) {
base::Value* out = NULL;
- if (strategy_->FromV8ArrayBuffer(val, &out))
+ if (strategy_->FromV8ArrayBuffer(val, &out, isolate))
return out;
}
« no previous file with comments | « content/renderer/v8_value_converter_impl.h ('k') | content/renderer/v8_value_converter_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698