Index: Source/core/loader/ImageLoader.cpp |
diff --git a/Source/core/loader/ImageLoader.cpp b/Source/core/loader/ImageLoader.cpp |
index 3d561064dd258e60e2ef5c7d0abe400ad9b6fd37..44d27a1802d673a9113aba53de1d6b7ea6cb40b0 100644 |
--- a/Source/core/loader/ImageLoader.cpp |
+++ b/Source/core/loader/ImageLoader.cpp |
@@ -268,14 +268,15 @@ void ImageLoader::updateFromElement(LoadType loadType) |
if (!m_failedLoadURL.isEmpty() && attr == m_failedLoadURL) |
return; |
+ // If we have a pending task, we have to clear it -- either we're |
+ // now loading immediately, or we need to reset the task's state. |
+ if (m_pendingTask) { |
+ m_pendingTask->clearLoader(); |
+ m_pendingTask.clear(); |
+ } |
+ |
KURL url = imageURL(); |
if (!attr.isNull() && !url.isNull()) { |
- // If we have a pending task, we have to clear it -- either we're |
- // now loading immediately, or we need to reset the task's state. |
- if (m_pendingTask) { |
- m_pendingTask->clearLoader(); |
- m_pendingTask.clear(); |
- } |
bool loadImmediately = shouldLoadImmediately(url) || (loadType == ForceLoadImmediately); |
if (loadImmediately) { |
doUpdateFromElement(false); |