Commit e74f918c authored by tzik's avatar tzik Committed by Commit Bot

Remove an unneeded WTF::Bind wrapper in V8ScriptRunner.cpp

The wrapper function is no longer useful as WTF::Bind no longer needs
explicit unbound parameter types.

Change-Id: I64e00f1065ce397b1491c71470a62801208f530c
Reviewed-on: https://chromium-review.googlesource.com/580452
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488640}
parent 78ff44b8
...@@ -319,17 +319,6 @@ typedef Function<v8::MaybeLocal<v8::Script>(v8::Isolate*, ...@@ -319,17 +319,6 @@ typedef Function<v8::MaybeLocal<v8::Script>(v8::Isolate*,
v8::ScriptOrigin)> v8::ScriptOrigin)>
CompileFn; CompileFn;
// A notation convenience: WTF::bind<...> needs to be given the right argument
// types. We have an awful lot of bind calls below, all with the same types, so
// this local bind lets WTF::bind to all the work, but 'knows' the right
// parameter types.
// This version isn't quite as smart as the real WTF::bind, though, so you
// sometimes may still have to call the original.
template <typename... A>
std::unique_ptr<CompileFn> Bind(const A&... args) {
return WTF::Bind(args...);
}
// Select a compile function from any of the above, mainly depending on // Select a compile function from any of the above, mainly depending on
// cacheOptions. // cacheOptions.
static std::unique_ptr<CompileFn> SelectCompileFunction( static std::unique_ptr<CompileFn> SelectCompileFunction(
...@@ -343,25 +332,26 @@ static std::unique_ptr<CompileFn> SelectCompileFunction( ...@@ -343,25 +332,26 @@ static std::unique_ptr<CompileFn> SelectCompileFunction(
// Caching is not available in this case. // Caching is not available in this case.
if (!cache_handler) if (!cache_handler)
return Bind(CompileWithoutOptions, cacheability_if_no_handler); return WTF::Bind(CompileWithoutOptions, cacheability_if_no_handler);
if (cache_options == kV8CacheOptionsNone) if (cache_options == kV8CacheOptionsNone)
return Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable); return WTF::Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable);
// Caching is not worthwhile for small scripts. Do not use caching // Caching is not worthwhile for small scripts. Do not use caching
// unless explicitly expected, indicated by the cache option. // unless explicitly expected, indicated by the cache option.
if (code->Length() < kMinimalCodeLength) if (code->Length() < kMinimalCodeLength)
return Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable); return WTF::Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable);
// The cacheOptions will guide our strategy: // The cacheOptions will guide our strategy:
switch (cache_options) { switch (cache_options) {
case kV8CacheOptionsParse: case kV8CacheOptionsParse:
// Use parser-cache; in-memory only. // Use parser-cache; in-memory only.
return Bind(CompileAndConsumeOrProduce, WrapPersistent(cache_handler), return WTF::Bind(CompileAndConsumeOrProduce,
CacheTag(kCacheTagParser, cache_handler), WrapPersistent(cache_handler),
v8::ScriptCompiler::kConsumeParserCache, CacheTag(kCacheTagParser, cache_handler),
v8::ScriptCompiler::kProduceParserCache, v8::ScriptCompiler::kConsumeParserCache,
CachedMetadataHandler::kCacheLocally); v8::ScriptCompiler::kProduceParserCache,
CachedMetadataHandler::kCacheLocally);
break; break;
case kV8CacheOptionsDefault: case kV8CacheOptionsDefault:
...@@ -370,19 +360,19 @@ static std::unique_ptr<CompileFn> SelectCompileFunction( ...@@ -370,19 +360,19 @@ static std::unique_ptr<CompileFn> SelectCompileFunction(
// Use code caching for recently seen resources. // Use code caching for recently seen resources.
// Use compression depending on the cache option. // Use compression depending on the cache option.
if (code_cache) { if (code_cache) {
return Bind(CompileAndConsumeCache, WrapPersistent(cache_handler), return WTF::Bind(CompileAndConsumeCache, WrapPersistent(cache_handler),
std::move(code_cache), std::move(code_cache),
v8::ScriptCompiler::kConsumeCodeCache); v8::ScriptCompiler::kConsumeCodeCache);
} }
if (cache_options != kV8CacheOptionsAlways && if (cache_options != kV8CacheOptionsAlways &&
!IsResourceHotForCaching(cache_handler, kHotHours)) { !IsResourceHotForCaching(cache_handler, kHotHours)) {
V8ScriptRunner::SetCacheTimeStamp(cache_handler); V8ScriptRunner::SetCacheTimeStamp(cache_handler);
return Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable); return WTF::Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable);
} }
uint32_t code_cache_tag = CacheTag(kCacheTagCode, cache_handler); uint32_t code_cache_tag = CacheTag(kCacheTagCode, cache_handler);
return Bind(CompileAndProduceCache, WrapPersistent(cache_handler), return WTF::Bind(CompileAndProduceCache, WrapPersistent(cache_handler),
code_cache_tag, v8::ScriptCompiler::kProduceCodeCache, code_cache_tag, v8::ScriptCompiler::kProduceCodeCache,
CachedMetadataHandler::kSendToPlatform); CachedMetadataHandler::kSendToPlatform);
break; break;
} }
...@@ -396,7 +386,7 @@ static std::unique_ptr<CompileFn> SelectCompileFunction( ...@@ -396,7 +386,7 @@ static std::unique_ptr<CompileFn> SelectCompileFunction(
// All switch branches should return and we should never get here. // All switch branches should return and we should never get here.
// But some compilers aren't sure, hence this default. // But some compilers aren't sure, hence this default.
NOTREACHED(); NOTREACHED();
return Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable); return WTF::Bind(CompileWithoutOptions, V8CompileHistogram::kCacheable);
} }
// Select a compile function for a streaming compile. // Select a compile function for a streaming compile.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment