summaryrefslogtreecommitdiffstats
path: root/net/proxy/init_proxy_resolver.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 22:20:50 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-01 22:20:50 +0000
commit9b9ae9556a0b51fc0201e925624ae6bd76686536 (patch)
treecc0643d59f985f5c28f73e4056dac5a20bfe0e0d /net/proxy/init_proxy_resolver.cc
parent947405b19c553f4cba8d0027f472ed932b2d84d5 (diff)
downloadchromium_src-9b9ae9556a0b51fc0201e925624ae6bd76686536.zip
chromium_src-9b9ae9556a0b51fc0201e925624ae6bd76686536.tar.gz
chromium_src-9b9ae9556a0b51fc0201e925624ae6bd76686536.tar.bz2
Optimization: reduce the copying of string data between C++ and javascript in proxy_resolver_v8.cc.
This is done by sharing the string storage using ExternalStringResource. An accompanying change was to pass around the PAC script data as a UTF16 string16 rather than a UTF8 std::string -- this required changing plumbing in the other files. This optimization will be important when creating multiple ProxyResolverV8's so they don't end up duplicating the script text. BUG=11079 Review URL: http://codereview.chromium.org/2817043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/init_proxy_resolver.cc')
-rw-r--r--net/proxy/init_proxy_resolver.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc
index ea1e475..3817468 100644
--- a/net/proxy/init_proxy_resolver.cc
+++ b/net/proxy/init_proxy_resolver.cc
@@ -134,7 +134,7 @@ int InitProxyResolver::DoFetchPacScript() {
return ERR_UNEXPECTED;
}
- return proxy_script_fetcher_->Fetch(pac_url, &pac_bytes_, &io_callback_);
+ return proxy_script_fetcher_->Fetch(pac_url, &pac_script_, &io_callback_);
}
int InitProxyResolver::DoFetchPacScriptComplete(int result) {
@@ -161,7 +161,7 @@ int InitProxyResolver::DoSetPacScript() {
next_state_ = STATE_SET_PAC_SCRIPT_COMPLETE;
return resolver_->expects_pac_bytes() ?
- resolver_->SetPacScriptByData(pac_bytes_, &io_callback_) :
+ resolver_->SetPacScriptByData(pac_script_, &io_callback_) :
resolver_->SetPacScriptByUrl(pac_url, &io_callback_);
}