CachedMetadata support for ServiceWorker script.

Source/bindings/core/v8/V8ScriptRunnerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "core/fetch/ScriptResource.h"
 #include "platform/heap/Handle.h"
@@ skipping 47 matching lines @@
     }
     unsigned tagForCodeCache(Resource* resource) const
     {
         return V8ScriptRunner::tagForCodeCache(resource);
     }
 
     bool compileScript(V8CacheOptions cacheOptions)
     {
         return !V8ScriptRunner::compileScript(
             v8String(isolate(), code()), filename(), WTF::TextPosition(),
-            m_resource.get(), 0, isolate(), NotSharableCrossOrigin, cacheOptions)
+            isolate(), m_resource.get(), 0, 0, NotSharableCrossOrigin, cacheOptions)

[vivekg, 2015/02/16 09:02:52]

nit: 0 -> nullptr :)

[horo, 2015/02/16 10:23:26]

Done.

             .IsEmpty();
     }
 
     void setEmptyResource()
     {
         m_resourceRequest = WTF::adoptPtr(new ResourceRequest);
         m_resource = ScriptResource::create(*m_resourceRequest.get(), "UTF-8");
     }
 
     void setResource()
@@ skipping 17 matching lines @@
     EXPECT_TRUE(compileScript(V8CacheOptionsNone));
     EXPECT_TRUE(compileScript(V8CacheOptionsParseMemory));
     EXPECT_TRUE(compileScript(V8CacheOptionsParse));
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
 }
 
 TEST_F(V8ScriptRunnerTest, emptyResourceDoesNothing)
 {
     setEmptyResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsDefault));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
 
     EXPECT_TRUE(compileScript(V8CacheOptionsParse));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
 
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
 }
 
 TEST_F(V8ScriptRunnerTest, parseMemoryOption)
 {
     setResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsParseMemory));
-    EXPECT_TRUE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_TRUE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
     // The cached data is associated with the encoding.
     ResourceRequest request(url());
     OwnPtrWillBeRawPtr<ScriptResource> anotherResource = ScriptResource::create(request, "UTF-16");
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(anotherResource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(anotherResource.get())));
 }
 
 TEST_F(V8ScriptRunnerTest, parseOption)
 {
     setResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsParse));
-    EXPECT_TRUE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_TRUE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
     // The cached data is associated with the encoding.
     ResourceRequest request(url());
     OwnPtrWillBeRawPtr<ScriptResource> anotherResource = ScriptResource::create(request, "UTF-16");
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(anotherResource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(anotherResource.get())));
 }
 
 TEST_F(V8ScriptRunnerTest, codeOption)
 {
     setResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsCode));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_TRUE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_TRUE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
     // The cached data is associated with the encoding.
     ResourceRequest request(url());
     OwnPtrWillBeRawPtr<ScriptResource> anotherResource = ScriptResource::create(request, "UTF-16");
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(anotherResource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(anotherResource.get())));
 }
 
 TEST_F(V8ScriptRunnerTest, codeCompressedOptions)
 {
     setResource();
     EXPECT_TRUE(compileScript(V8CacheOptionsCodeCompressed));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForParserCache(m_resource.get())));
-    EXPECT_FALSE(m_resource->cachedMetadata(tagForCodeCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForParserCache(m_resource.get())));
+    EXPECT_FALSE(m_resource->cacheHandler()->cachedMetadata(tagForCodeCache(m_resource.get())));
 }
 
 } // namespace
 
 } // namespace blink