Move logic for IsServedFromCacheStorage() to V8CodeCache

Bug: 841466
Change-Id: I4b08f6b67049ca22ac083c3b6cbb7954a5f1400f
Reviewed-on: https://chromium-review.googlesource.com/1058709
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Kouhei Ueno <kouhei@chromium.org>
Reviewed-by: Mythri Alle <mythria@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566037}

third_party/blink/renderer/bindings/core/v8/script_controller.cc

@@ -83,25 +83,6 @@ void ScriptController::UpdateSecurityOrigin(
   window_proxy_manager_->UpdateSecurityOrigin(security_origin);
 }
 
-namespace {
-
-V8CacheOptions CacheOptions(const CachedMetadataHandler* cache_handler,
-                            const Settings* settings) {
-  V8CacheOptions v8_cache_options(kV8CacheOptionsDefault);
-  if (settings) {
-    v8_cache_options = settings->GetV8CacheOptions();
-    if (v8_cache_options == kV8CacheOptionsNone)
-      return kV8CacheOptionsNone;
-  }
-  // If the resource is served from CacheStorage, generate the V8 code cache in
-  // the first load.
-  if (cache_handler && cache_handler->IsServedFromCacheStorage())
-    return kV8CacheOptionsCodeWithoutHeatCheck;
-  return v8_cache_options;
-}
-
-}  // namespace
-
 v8::Local<v8::Value> ScriptController::ExecuteScriptAndReturnValue(
     v8::Local<v8::Context> context,
     const ScriptSourceCode& source,
@@ -114,10 +95,9 @@ v8::Local<v8::Value> ScriptController::ExecuteScriptAndReturnValue(
                                          source.StartPosition()));
   v8::Local<v8::Value> result;
   {
-    CachedMetadataHandler* cache_handler = source.CacheHandler();
-
-    V8CacheOptions v8_cache_options =
-        CacheOptions(cache_handler, GetFrame()->GetSettings());
+    V8CacheOptions v8_cache_options = kV8CacheOptionsDefault;
+    if (const Settings* settings = GetFrame()->GetSettings())
+      v8_cache_options = settings->GetV8CacheOptions();
 
     // Isolate exceptions that occur when compiling and executing
     // the code. These exceptions should not interfere with

third_party/blink/renderer/bindings/core/v8/v8_code_cache.cc

@@ -133,6 +133,11 @@ V8CodeCache::GetCompileOptions(V8CacheOptions cache_options,
                            no_cache_reason);
   }
 
+  // If the resource is served from CacheStorage, generate the V8 code cache in
+  // the first load.
+  if (cache_handler->IsServedFromCacheStorage())
+    cache_options = kV8CacheOptionsCodeWithoutHeatCheck;
+
   switch (cache_options) {
     case kV8CacheOptionsDefault:
     case kV8CacheOptionsCode: