Fix loading placeholders for Lo-Fi

third_party/WebKit/Source/core/fetch/ImageResourceTest.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 316 matching lines @@
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_EQ(client->imageChangedCount(), 2);
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
 }
 
 TEST(ImageResourceTest, ReloadIfLoFi)
 {
     KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
     URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html", "text/html");
-    ImageResource* cachedImage = ImageResource::create(ResourceRequest(testURL));
+    ResourceRequest request = ResourceRequest(testURL);
+    request.setLoFiState(WebURLRequest::LoFiOn);
+    ImageResource* cachedImage = ImageResource::create(request);
     cachedImage->setStatus(Resource::Pending);
 
     Persistent<MockImageResourceClient> client = new MockImageResourceClient(cachedImage);
     ResourceFetcher* fetcher = ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
 
     // Send the image response.
     Vector<unsigned char> jpeg = jpegImage();
     ResourceResponse resourceResponse(KURL(), "image/jpeg", jpeg.size(), nullAtom, String());
     resourceResponse.addHTTPHeaderField("chrome-proxy", "q=low");
 
     cachedImage->responseReceived(resourceResponse, nullptr);
     cachedImage->appendData(reinterpret_cast<const char*>(jpeg.data()), jpeg.size());
     cachedImage->finish();
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_EQ(client->imageChangedCount(), 2);
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
+    EXPECT_EQ(1, cachedImage->getImage()->width());
+    EXPECT_EQ(1, cachedImage->getImage()->height());
 
     cachedImage->reloadIfLoFi(fetcher);
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_FALSE(cachedImage->resourceBuffer());
-    ASSERT_TRUE(cachedImage->hasImage());
+    ASSERT_FALSE(cachedImage->hasImage());
     ASSERT_EQ(client->imageChangedCount(), 3);
 
+    Vector<unsigned char> jpeg2 = jpegImage2();
     cachedImage->loader()->didReceiveResponse(nullptr, WrappedResourceResponse(resourceResponse), nullptr);
-    cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg.data()), jpeg.size(), jpeg.size());
-    cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg.size());
+    cachedImage->loader()->didReceiveData(nullptr, reinterpret_cast<const char*>(jpeg2.data()), jpeg2.size(), jpeg2.size());
+    cachedImage->loader()->didFinishLoading(nullptr, 0.0, jpeg2.size());
     ASSERT_FALSE(cachedImage->errorOccurred());
     ASSERT_TRUE(cachedImage->hasImage());
     ASSERT_FALSE(cachedImage->getImage()->isNull());
     ASSERT_TRUE(client->notifyFinishedCalled());
     ASSERT_TRUE(cachedImage->getImage()->isBitmapImage());
+    EXPECT_EQ(50, cachedImage->getImage()->width());
+    EXPECT_EQ(50, cachedImage->getImage()->height());
 }
 
 TEST(ImageResourceTest, SVGImage)
 {
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo");
     ImageResource* imageResource = ImageResource::create(ResourceRequest(url));
     Persistent<MockImageResourceClient> client = new MockImageResourceClient(imageResource);
 
     receiveResponse(imageResource, url, "image/svg+xml", svgImage());
 
@@ skipping 223 matching lines @@
     Persistent<MockResourceClient> client2 = new MockResourceClient(imageResource);
 
     ASSERT_TRUE(imageResource->hasImage());
     EXPECT_FALSE(imageResource->getImage()->isNull());
     EXPECT_EQ(1, imageResource->getImage()->width());
     EXPECT_EQ(1, imageResource->getImage()->height());
     EXPECT_TRUE(client2->notifyFinishedCalled());
 }
 
 } // namespace blink