Chromium Code Reviews| Index: Source/bindings/core/v8/V8ScriptRunnerTest.cpp |
| diff --git a/Source/bindings/core/v8/V8ScriptRunnerTest.cpp b/Source/bindings/core/v8/V8ScriptRunnerTest.cpp |
| index cce830cdf3e7e459fc0efa415e924fae546b36c3..30ddb7c26275408c79d06130763b290ffd9e53a9 100644 |
| --- a/Source/bindings/core/v8/V8ScriptRunnerTest.cpp |
| +++ b/Source/bindings/core/v8/V8ScriptRunnerTest.cpp |
| @@ -65,7 +65,7 @@ public: |
| { |
| 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(); |
| } |
| @@ -103,60 +103,60 @@ 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 |