ResourceFetcher: fix an assertion failure on defered resource revalidation

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 59 matching lines @@
 
     virtual ~ResourceFetcherTestMockFetchContext() { }
 
     bool allowImage(bool imagesEnabled, const KURL&) const override { return true; }
     bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const override { return true; }
     bool shouldLoadNewResource(Resource::Type) const override { return true; }
     WebTaskRunner* loadingTaskRunner() const override { return m_runner.get(); }
 
     void setCachePolicy(CachePolicy policy) { m_policy = policy; }
     CachePolicy getCachePolicy() const override { return m_policy; }
+    void setLoadComplete(bool complete) { m_complete = complete; }
+    bool isLoadComplete() const override { return m_complete; }
 
 private:
     ResourceFetcherTestMockFetchContext()
         : m_policy(CachePolicyVerify)
         , m_runner(adoptPtr(new MockTaskRunner))
+        , m_complete(false)
     { }
 
     CachePolicy m_policy;
     OwnPtr<MockTaskRunner> m_runner;
+    bool m_complete;
 };
 
 class ResourceFetcherTest : public ::testing::Test {
 };
 
 class TestResourceFactory : public ResourceFactory {
 public:
     TestResourceFactory(Resource::Type type = Resource::Raw)
         : ResourceFactory(type) { }
 
@@ skipping 166 matching lines @@
     Resource* resource1 = fetcher1->requestResource(fetchRequest1, TestResourceFactory(Resource::Image));
     Persistent<RequestSameResourceOnComplete> client = new RequestSameResourceOnComplete(resource1);
     resource1->addClient(client);
     Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
     EXPECT_TRUE(client->notifyFinishedCalled());
     resource1->removeClient(client);
     memoryCache()->remove(resource1);
 }
 
+TEST_F(ResourceFetcherTest, RevalidateDeferedResourceFromTwoInitiators)
+{
+    KURL url(ParsedURLString, "http://127.0.0.1:8000/font.woff");
+    ResourceResponse response;
+    response.setURL(url);
+    response.setHTTPStatusCode(200);
+    response.setHTTPHeaderField(HTTPNames::ETag, "1234567890");
+    Platform::current()->getURLLoaderMockFactory()->registerURL(url, WrappedResourceResponse(response), "");
+
+    ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
+    ResourceFetcher* fetcher = ResourceFetcher::create(context);
+
+    // Fetch to cache a resource.
+    ResourceRequest request1(url);
+    FetchRequest fetchRequest1 = FetchRequest(request1, FetchInitiatorInfo());
+    Resource* resource1 = fetcher->requestResource(fetchRequest1, TestResourceFactory(Resource::Font));
+    ASSERT_TRUE(resource1);
+    resource1->load(fetcher);
+    Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
+    EXPECT_TRUE(resource1->isLoaded());
+    EXPECT_FALSE(resource1->errorOccurred());
+
+    // Set the context as it is on reloads.
+    context->setLoadComplete(true);
+    context->setCachePolicy(CachePolicyRevalidate);
+
+    // Revalidate the resource.
+    ResourceRequest request2(url);
+    FetchRequest fetchRequest2 = FetchRequest(request2, FetchInitiatorInfo());
+    Resource* resource2 = fetcher->requestResource(fetchRequest2, TestResourceFactory(Resource::Font));
+    ASSERT_TRUE(resource2);
+    EXPECT_EQ(resource1, resource2);
+    EXPECT_TRUE(resource2->isCacheValidator());
+    EXPECT_TRUE(resource2->stillNeedsLoad());
+
+    // Fetch the same resource again before actual load operation starts.
+    ResourceRequest request3(url);
+    FetchRequest fetchRequest3 = FetchRequest(request3, FetchInitiatorInfo());
+    Resource* resource3 = fetcher->requestResource(fetchRequest3, TestResourceFactory(Resource::Font));
+    ASSERT_TRUE(resource3);
+    EXPECT_EQ(resource2, resource3);
+    EXPECT_TRUE(resource3->isCacheValidator());
+    EXPECT_TRUE(resource3->stillNeedsLoad());
+
+    // load() can be called from any initiator. Here, call it from the latter.
+    resource3->load(fetcher);
+    Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
+    EXPECT_TRUE(resource3->isLoaded());
+    EXPECT_FALSE(resource3->errorOccurred());
+    EXPECT_TRUE(resource2->isLoaded());
+    EXPECT_FALSE(resource2->errorOccurred());
+
+    memoryCache()->remove(resource1);
+}
+
 TEST_F(ResourceFetcherTest, DontReuseMediaDataUrl)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     ResourceRequest request(KURL(ParsedURLString, "data:text/html,foo"));
     ResourceLoaderOptions options;
     options.dataBufferingPolicy = DoNotBufferData;
     FetchRequest fetchRequest = FetchRequest(request, FetchInitiatorTypeNames::internal, options);
     Resource* resource1 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
     Resource* resource2 = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Media));
     EXPECT_NE(resource1, resource2);
@@ skipping 39 matching lines @@
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Raw));
     Persistent<ServeRequestsOnCompleteClient> client = new ServeRequestsOnCompleteClient();
     resource->addClient(client);
     resource->loader()->cancel();
     resource->removeClient(client);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 } // namespace blink