From 4a74b0acc891ed67f722c4d82b94e4648e006d08 Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Fri, 2 Jul 2010 03:40:05 +0000 Subject: Re-enable use of external string resources in ProxyResolverV8. To avoid the sporadic leaks in unit tests, explicitly trigger a V8 garbage collection during teardown. BUG=48145 Review URL: http://codereview.chromium.org/2833051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51488 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_resolver_v8.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'net/proxy') diff --git a/net/proxy/proxy_resolver_v8.cc b/net/proxy/proxy_resolver_v8.cc index 25da573..5860872 100644 --- a/net/proxy/proxy_resolver_v8.cc +++ b/net/proxy/proxy_resolver_v8.cc @@ -141,8 +141,7 @@ class V8ExternalASCIIString : public v8::String::ExternalAsciiStringResource { // For small strings it is better to just make a copy, whereas for large // strings there are savings by sharing the storage. This number identifies // the cutoff length for when to start wrapping rather than creating copies. -// TODO(eroman): This is disabled because of crbug.com/48145. -const size_t kMaxStringBytesForCopy = static_cast(-1); +const size_t kMaxStringBytesForCopy = 256; // Converts a V8 String to a UTF16 string16. string16 V8StringToUTF16(v8::Handle s) { @@ -246,6 +245,12 @@ class ProxyResolverV8::Context { v8_this_.Dispose(); v8_context_.Dispose(); + + // Run the V8 garbage collector. We do this to be sure the + // ExternalStringResource objects we allocated get properly disposed. + // Otherwise when running the unit-tests they may get leaked. + // See crbug.com/48145. + PurgeMemory(); } int ResolveProxy(const GURL& query_url, ProxyInfo* results) { -- cgit v1.1