Phase II Step 2: Remove setIsPlaceholder() in updateImage()

third_party/WebKit/Source/core/loader/resource/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
@@ skipping 77 matching lines @@
 
   // For compatibility, images keep loading even if there are HTTP errors.
   bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
 
   bool isImage() const override { return true; }
 
   // MultipartImageResourceParser::Client
   void onePartInMultipartReceived(const ResourceResponse&) final;
   void multipartDataReceived(const char*, size_t) final;
 
-  // Used by tests.
-  bool isPlaceholder() const { return m_isPlaceholder; }
+  bool shouldShowPlaceholder() const;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   enum class MultipartParsingState : uint8_t {
     WaitingForFirstPart,
     ParsingFirstPart,
     FinishedParsingFirstPart,
   };
 
@@ skipping 18 matching lines @@
                    ImageResourceContent::UpdateImageOption,
                    bool allDataReceived);
 
   void checkNotify() override;
 
   void destroyDecodedDataIfPossible() override;
   void destroyDecodedDataForFailedRevalidation() override;
 
   void flushImageIfNeeded(TimerBase*);
 
-  bool shouldReloadBrokenPlaceholder() const {
-    return m_isPlaceholder && willPaintBrokenImage();
-  }
-
-  bool willPaintBrokenImage() const;
+  bool shouldReloadBrokenPlaceholder() const;
 
   Member<ImageResourceContent> m_content;
 
   // TODO(hiroshige): move |m_devicePixelRatioHeaderValue| and
   // |m_hasDevicePixelRatioHeaderValue| to ImageResourceContent and update
   // it via ImageResourceContent::updateImage().
   float m_devicePixelRatioHeaderValue;
 
   Member<MultipartImageResourceParser> m_multipartParser;
   MultipartParsingState m_multipartParsingState =
       MultipartParsingState::WaitingForFirstPart;
   bool m_hasDevicePixelRatioHeaderValue;
 
   // Indicates if the ImageResource is currently scheduling a reload, e.g.
   // because reloadIfLoFi() was called.
   bool m_isSchedulingReload;
 
   // Indicates if this ImageResource is either attempting to load a placeholder
   // image, or is a (possibly broken) placeholder image.
-  bool m_isPlaceholder;
+  enum PlaceholderOption {

[yhirano, 2017/02/13 11:36:57]

enum class?

[hiroshige, 2017/02/23 20:52:38]

Done.

+    // Do not show or reload placeholder.
+    DoNotReloadPlaceholder,
+
+    // Do not show placeholder, reload only when decode error occurs.
+    ReloadPlaceholderOnDecodeError,
+
+    // Show placeholder and reload.
+    ShowAndReloadPlaceholderAlways,
+  };
+  PlaceholderOption m_placeholderOption;
 
   Timer<ImageResource> m_flushTimer;
   double m_lastFlushTime = 0.;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }  // namespace blink
 
 #endif