summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/core/style/StyleFetchedImage.h
diff options
context:
space:
mode:
authorhiroshige <hiroshige@chromium.org>2016-03-25 17:50:09 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-26 00:52:02 +0000
commita4581858f57e20724f9b8a3166ef9c864f79a758 (patch)
treee4cd0359bc77080c16949c5f287f939906bb0aff /third_party/WebKit/Source/core/style/StyleFetchedImage.h
parenta36877470caa77972faf9a1313eba92d8cd67fde (diff)
downloadchromium_src-a4581858f57e20724f9b8a3166ef9c864f79a758.zip
chromium_src-a4581858f57e20724f9b8a3166ef9c864f79a758.tar.gz
chromium_src-a4581858f57e20724f9b8a3166ef9c864f79a758.tar.bz2
Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]
We are planning to move ResourceClient to on-heap, but LayoutObject (an ImageResourceClient subclass) is hard to move to on-heap. This series of CLs splits ImageResourceClient into - ResourceClient (notified via Resource, to be moved to Oilpan heap) and - ImageResourceObserver (notified via ImageObserver, to remain non-heap) and makes LayoutObject to be ImageResourceObserver but not ResourceClient. This is the [1/2] CL that - Splits ImageResourceClient into ResourceClient and ImageResourceObserver, - Makes LayoutObject and all of its subclasses (except for LayoutImage and its subclasses) to be ImageResourceObserver but not ResourceClient. LayoutImage will be made non-ResourceClient by the [2/2] CL: https://codereview.chromium.org/1728313003/. Original CL: https://codereview.chromium.org/1697713002/ by Nate Chapin. In addition to Nate's original CL (Patch Set 1), this CL: - Fixes layout test (Patch Set 2). - Reuses ResourceClientWalker to iterate ImageResourceObserver (Patch Set 3). - Handles ResourceClient and ImageResourceObserver more similarly (Patch Set 4). - Renames methods to reflect whether they are for both ResourceClient and ImageResourceObserver (Patch Set 6). BUG=587663 Review URL: https://codereview.chromium.org/1706083002 Cr-Commit-Position: refs/heads/master@{#383425}
Diffstat (limited to 'third_party/WebKit/Source/core/style/StyleFetchedImage.h')
-rw-r--r--third_party/WebKit/Source/core/style/StyleFetchedImage.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImage.h b/third_party/WebKit/Source/core/style/StyleFetchedImage.h
index 4cf22ee..5bda657 100644
--- a/third_party/WebKit/Source/core/style/StyleFetchedImage.h
+++ b/third_party/WebKit/Source/core/style/StyleFetchedImage.h
@@ -24,7 +24,7 @@
#ifndef StyleFetchedImage_h
#define StyleFetchedImage_h
-#include "core/fetch/ImageResourceClient.h"
+#include "core/fetch/ResourceClient.h"
#include "core/style/StyleImage.h"
namespace blink {
@@ -32,7 +32,7 @@ namespace blink {
class Document;
class ImageResource;
-class StyleFetchedImage final : public StyleImage, private ImageResourceClient {
+class StyleFetchedImage final : public StyleImage, private ResourceClient {
USING_FAST_MALLOC_WILL_BE_REMOVED(StyleFetchedImage);
WILL_BE_USING_PRE_FINALIZER(StyleFetchedImage, dispose);
public: