Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1720)

Side by Side Diff: third_party/WebKit/Source/core/fetch/ImageResource.h

Issue 2417673003: Revert changes made to ImageResource memory accounting at crrev.com/2337733002 (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org> 3 Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 4 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 6
7 This library is free software; you can redistribute it and/or 7 This library is free software; you can redistribute it and/or
8 modify it under the terms of the GNU Library General Public 8 modify it under the terms of the GNU Library General Public
9 License as published by the Free Software Foundation; either 9 License as published by the Free Software Foundation; either
10 version 2 of the License, or (at your option) any later version. 10 version 2 of the License, or (at your option) any later version.
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 void allClientsAndObserversRemoved() override; 122 void allClientsAndObserversRemoved() override;
123 123
124 PassRefPtr<const SharedBuffer> resourceBuffer() const override; 124 PassRefPtr<const SharedBuffer> resourceBuffer() const override;
125 void appendData(const char*, size_t) override; 125 void appendData(const char*, size_t) override;
126 void error(const ResourceError&) override; 126 void error(const ResourceError&) override;
127 void responseReceived(const ResourceResponse&, 127 void responseReceived(const ResourceResponse&,
128 std::unique_ptr<WebDataConsumerHandle>) override; 128 std::unique_ptr<WebDataConsumerHandle>) override;
129 void finish(double finishTime = 0.0) override; 129 void finish(double finishTime = 0.0) override;
130 130
131 void onMemoryDump(WebMemoryDumpLevelOfDetail,
132 WebProcessMemoryDump*) const override;
133
134 // For compatibility, images keep loading even if there are HTTP errors. 131 // For compatibility, images keep loading even if there are HTTP errors.
135 bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; } 132 bool shouldIgnoreHTTPStatusCodeErrors() const override { return true; }
136 133
137 bool isImage() const override { return true; } 134 bool isImage() const override { return true; }
138 135
139 // ImageObserver 136 // ImageObserver
140 void decodedSizeChangedTo(const blink::Image*, size_t newSize) override; 137 void decodedSizeChangedTo(const blink::Image*, size_t newSize) override;
141 void didDraw(const blink::Image*) override; 138 void didDraw(const blink::Image*) override;
142 139
143 bool shouldPauseAnimation(const blink::Image*) override; 140 bool shouldPauseAnimation(const blink::Image*) override;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 bool m_hasDevicePixelRatioHeaderValue; 201 bool m_hasDevicePixelRatioHeaderValue;
205 HashCountedSet<ImageResourceObserver*> m_observers; 202 HashCountedSet<ImageResourceObserver*> m_observers;
206 HashCountedSet<ImageResourceObserver*> m_finishedObservers; 203 HashCountedSet<ImageResourceObserver*> m_finishedObservers;
207 }; 204 };
208 205
209 DEFINE_RESOURCE_TYPE_CASTS(Image); 206 DEFINE_RESOURCE_TYPE_CASTS(Image);
210 207
211 } // namespace blink 208 } // namespace blink
212 209
213 #endif 210 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/fetch/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698