Merge "Ensure |m_image| is (re-)created in ImageResource::didAddClient()"

third_party/WebKit/Source/core/fetch/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 72 matching lines @@
     LayoutSize imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType = IntrinsicSize);
 
     bool isAccessAllowed(SecurityOrigin*);
 
     void updateImageAnimationPolicy();
 
     // If this ImageResource has the Lo-Fi response headers, reload it with
     // the Lo-Fi state set to off and bypassing the cache.
     void reloadIfLoFi(ResourceFetcher*);
 
+    void didAddClient(ResourceClient*) override;
+
     void addObserver(ImageResourceObserver*);
     void removeObserver(ImageResourceObserver*);
     bool hasClientsOrObservers() const override { return Resource::hasClientsOrObservers() || !m_observers.isEmpty() || !m_finishedObservers.isEmpty(); }
 
     ResourcePriority priorityFromObservers() override;
 
     void allClientsAndObserversRemoved() override;
 
     void appendData(const char*, size_t) override;
     void error(const ResourceError&) override;
@@ skipping 47 matching lines @@
 
     void clear();
 
     void createImage();
     void updateImage(bool allDataReceived);
     void updateImageAndClearBuffer();
     void clearImage();
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(const IntRect* changeRect = nullptr);
 
+    void ensureImage();
+
     void checkNotify() override;
     void markClientsAndObserversFinished() override;
 
     void doResetAnimation();
 
     float m_devicePixelRatioHeaderValue;
 
     Member<MultipartImageResourceParser> m_multipartParser;
     RefPtr<blink::Image> m_image;
     MultipartParsingState m_multipartParsingState = MultipartParsingState::WaitingForFirstPart;
     bool m_hasDevicePixelRatioHeaderValue;
     HashCountedSet<ImageResourceObserver*> m_observers;
     HashCountedSet<ImageResourceObserver*> m_finishedObservers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 } // namespace blink
 
 #endif