Title: [87651] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (87650 => 87651)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-29 21:01:09 UTC (rev 87650)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-05-29 21:01:13 UTC (rev 87651)
@@ -1,5 +1,20 @@
2011-05-29 Mark Rowe <[email protected]>
+ Merge r87633.
+
+ 2011-05-28 Alexey Proskuryakov <[email protected]>
+
+ Suggested by Simon Fraser.
+
+ REGRESSION (r85375): Load event is sometimes lost when multiple image elements use the same URL
+ https://bugs.webkit.org/show_bug.cgi?id=61692
+ <rdar://problem/9488628>
+
+ * loader/ImageLoader.cpp: (WebCore::ImageLoader::notifyFinished): There was no need to use
+ ASSERT_UNUSED here.
+
+2011-05-29 Mark Rowe <[email protected]>
+
Merge r87628.
2011-05-28 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/loader/ImageLoader.cpp (87650 => 87651)
--- branches/safari-534-branch/Source/WebCore/loader/ImageLoader.cpp 2011-05-29 21:01:09 UTC (rev 87650)
+++ branches/safari-534-branch/Source/WebCore/loader/ImageLoader.cpp 2011-05-29 21:01:13 UTC (rev 87651)
@@ -216,7 +216,7 @@
void ImageLoader::notifyFinished(CachedResource* resource)
{
ASSERT(m_failedLoadURL.isEmpty());
- ASSERT_UNUSED(m_image, resource == m_image.get());
+ ASSERT(resource == m_image.get());
m_imageComplete = true;
if (haveFiredBeforeLoadEvent())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
