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

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

Issue 2797993007: Show image placeholders on dimension decode error (Closed)
Patch Set: fix comment Created 3 years, 5 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/loader/resource/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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 // Indicates if the ImageResource is currently scheduling a reload, e.g. 156 // Indicates if the ImageResource is currently scheduling a reload, e.g.
157 // because reloadIfLoFi() was called. 157 // because reloadIfLoFi() was called.
158 bool is_scheduling_reload_; 158 bool is_scheduling_reload_;
159 159
160 // Indicates if this ImageResource is either attempting to load a placeholder 160 // Indicates if this ImageResource is either attempting to load a placeholder
161 // image, or is a (possibly broken) placeholder image. 161 // image, or is a (possibly broken) placeholder image.
162 enum class PlaceholderOption { 162 enum class PlaceholderOption {
163 // Do not show or reload placeholder. 163 // Do not show or reload placeholder.
164 kDoNotReloadPlaceholder, 164 kDoNotReloadPlaceholder,
165 165
166 // Show placeholder, and do not reload. The original image will still be
167 // loaded and shown if the image is explicitly reloaded, e.g. when
168 // ReloadIfLoFiOrPlaceholderImage is called with kReloadAlways.
169 kShowAndDoNotReloadPlaceholder,
170
166 // Do not show placeholder, reload only when decode error occurs. 171 // Do not show placeholder, reload only when decode error occurs.
167 kReloadPlaceholderOnDecodeError, 172 kReloadPlaceholderOnDecodeError,
168 173
169 // Show placeholder and reload. 174 // Show placeholder and reload.
170 kShowAndReloadPlaceholderAlways, 175 kShowAndReloadPlaceholderAlways,
171 }; 176 };
172 PlaceholderOption placeholder_option_; 177 PlaceholderOption placeholder_option_;
173 178
174 Timer<ImageResource> flush_timer_; 179 Timer<ImageResource> flush_timer_;
175 double last_flush_time_ = 0.; 180 double last_flush_time_ = 0.;
176 }; 181 };
177 182
178 DEFINE_RESOURCE_TYPE_CASTS(Image); 183 DEFINE_RESOURCE_TYPE_CASTS(Image);
179 184
180 } // namespace blink 185 } // namespace blink
181 186
182 #endif 187 #endif
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/loader/resource/ImageResource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698