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

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

Issue 2208073004: Fix ImageLoader::m_hasPendingLoadEvent/m_imageComplete in ImageDocument Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * Copyright (C) 2004, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 virtual void noImageResourceToLoad() { } 121 virtual void noImageResourceToLoad() { }
122 122
123 void updatedHasPendingEvent(); 123 void updatedHasPendingEvent();
124 124
125 void dispatchPendingLoadEvent(); 125 void dispatchPendingLoadEvent();
126 void dispatchPendingErrorEvent(); 126 void dispatchPendingErrorEvent();
127 127
128 LayoutImageResource* layoutImageResource(); 128 LayoutImageResource* layoutImageResource();
129 void updateLayoutObject(); 129 void updateLayoutObject();
130 130
131 // Sets |m_image| and flags as loading is completed.
131 void setImageWithoutConsideringPendingLoadEvent(ImageResource*); 132 void setImageWithoutConsideringPendingLoadEvent(ImageResource*);
133 // Sets |m_image| and flags as loading is pending/not completed
134 // if |newImage| is non-null.
135 void setImagePending(ImageResource* /* newImage */);
136
132 void clearFailedLoadURL(); 137 void clearFailedLoadURL();
133 void dispatchErrorEvent(); 138 void dispatchErrorEvent();
134 void crossSiteOrCSPViolationOccurred(AtomicString); 139 void crossSiteOrCSPViolationOccurred(AtomicString);
135 void enqueueImageLoadingMicroTask(UpdateFromElementBehavior, ReferrerPolicy) ; 140 void enqueueImageLoadingMicroTask(UpdateFromElementBehavior, ReferrerPolicy) ;
136 141
137 void timerFired(TimerBase*); 142 void timerFired(TimerBase*);
138 143
139 KURL imageSourceToKURL(AtomicString) const; 144 KURL imageSourceToKURL(AtomicString) const;
140 145
141 // Used to determine whether to immediately initiate the load 146 // Used to determine whether to immediately initiate the load
(...skipping 22 matching lines...) Expand all
164 bool m_hasPendingErrorEvent : 1; 169 bool m_hasPendingErrorEvent : 1;
165 bool m_imageComplete : 1; 170 bool m_imageComplete : 1;
166 bool m_loadingImageDocument : 1; 171 bool m_loadingImageDocument : 1;
167 bool m_elementIsProtected : 1; 172 bool m_elementIsProtected : 1;
168 bool m_suppressErrorEvents : 1; 173 bool m_suppressErrorEvents : 1;
169 }; 174 };
170 175
171 } // namespace blink 176 } // namespace blink
172 177
173 #endif 178 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698