Phase II Step 1: Remove updateImage() reentrancy around decodeError()

third_party/WebKit/Source/core/loader/resource/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 904 matching lines @@
       nullptr);
 
   EXPECT_EQ(0, observer->imageChangedCount());
 
   imageResource->loader()->didReceiveData("notactuallyanimage", 18);
 
   EXPECT_EQ(ResourceStatus::DecodeError, imageResource->getStatus());
   EXPECT_TRUE(observer->imageNotifyFinishedCalled());
   EXPECT_EQ(ResourceStatus::DecodeError,
             observer->statusOnImageNotifyFinished());
-  EXPECT_EQ(2, observer->imageChangedCount());
+  EXPECT_EQ(1, observer->imageChangedCount());

[hiroshige, 2017/01/25 02:49:15]

As mentioned in the design doc and CL description, the number of imageChanged()
is decreased by one, which probably looks safe.

   EXPECT_FALSE(imageResource->isLoading());
 }
 
 TEST(ImageResourceTest, DecodeErrorWithEmptyBody) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
   ResourceFetcher* fetcher =
       ResourceFetcher::create(ImageResourceTestMockFetchContext::create());
   FetchRequest request(testURL, FetchInitiatorInfo());
@@ skipping 189 matching lines @@
   imageResource->loader()->didReceiveResponse(
       WrappedResourceResponse(badResponse));
 
   EXPECT_EQ(0, observer->imageChangedCount());
 
   imageResource->loader()->didReceiveData(kBadData, sizeof(kBadData));
 
   // The dimensions could not be extracted, so the full original image should be
   // loading.
   EXPECT_FALSE(observer->imageNotifyFinishedCalled());
-  EXPECT_EQ(3, observer->imageChangedCount());
+  EXPECT_EQ(2, observer->imageChangedCount());

[hiroshige, 2017/01/25 02:49:15]

ditto.

 
   testThatReloadIsStartedAndDoReload(testURL, imageResource,
                                      imageResource->getContent(),
                                      observer.get(), false);
 }
 
 TEST(ImageResourceTest, FetchAllowPlaceholderPartialContentWithoutDimensions) {
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
   ScopedRegisteredURL scopedRegisteredURL(testURL);
 
@@ skipping 370 matching lines @@
   EXPECT_TRUE(observer->imageNotifyFinishedCalled());
   EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
   EXPECT_EQ(50, imageResource->getContent()->getImage()->width());
   EXPECT_EQ(50, imageResource->getContent()->getImage()->height());
 
   WTF::setTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink