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

Unified Diff: net/proxy/proxy_resolver_v8.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « net/proxy/proxy_config_service_android.cc ('k') | net/proxy/proxy_script_fetcher_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_v8.cc
diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc
index 24fbe9e200c0d2ac1be6f6289b3f144244a3cf9c..963153d2576cbd9f1d14806d3bcdcb9c24ca53b0 100644
--- a/net/proxy/proxy_resolver_v8.cc
+++ b/net/proxy/proxy_resolver_v8.cc
@@ -196,7 +196,7 @@ bool V8ObjectToUTF16String(v8::Local<v8::Value> object,
return false;
v8::HandleScope scope(isolate);
- v8::Local<v8::String> str_object = object->ToString();
+ v8::Local<v8::String> str_object = object->ToString(isolate);
if (str_object.IsEmpty())
return false;
*utf16_result = V8StringToUTF16(str_object);
@@ -211,7 +211,8 @@ bool GetHostnameArgument(const v8::FunctionCallbackInfo<v8::Value>& args,
if (args.Length() == 0 || args[0].IsEmpty() || !args[0]->IsString())
return false;
- const base::string16 hostname_utf16 = V8StringToUTF16(args[0]->ToString());
+ const base::string16 hostname_utf16 =
+ V8StringToUTF16(v8::Local<v8::String>::Cast(args[0]));
// If the hostname is already in ASCII, simply return it as is.
if (base::IsStringASCII(hostname_utf16)) {
@@ -393,7 +394,7 @@ class ProxyResolverV8::Context {
return ERR_PAC_SCRIPT_FAILED;
}
- base::string16 ret_str = V8StringToUTF16(ret->ToString());
+ base::string16 ret_str = V8StringToUTF16(v8::Local<v8::String>::Cast(ret));
if (!base::IsStringASCII(ret_str)) {
// TODO(eroman): Rather than failing when a wide string is returned, we
@@ -656,7 +657,8 @@ class ProxyResolverV8::Context {
return;
}
- std::string ip_address_list = V8StringToUTF8(args[0]->ToString());
+ std::string ip_address_list =
+ V8StringToUTF8(v8::Local<v8::String>::Cast(args[0]));
if (!base::IsStringASCII(ip_address_list)) {
args.GetReturnValue().SetNull();
return;
@@ -681,12 +683,14 @@ class ProxyResolverV8::Context {
return;
}
- std::string ip_address = V8StringToUTF8(args[0]->ToString());
+ std::string ip_address =
+ V8StringToUTF8(v8::Local<v8::String>::Cast(args[0]));
if (!base::IsStringASCII(ip_address)) {
args.GetReturnValue().Set(false);
return;
}
- std::string ip_prefix = V8StringToUTF8(args[1]->ToString());
+ std::string ip_prefix =
+ V8StringToUTF8(v8::Local<v8::String>::Cast(args[1]));
if (!base::IsStringASCII(ip_prefix)) {
args.GetReturnValue().Set(false);
return;
« no previous file with comments | « net/proxy/proxy_config_service_android.cc ('k') | net/proxy/proxy_script_fetcher_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698