Title: [138976] trunk/Source/WebCore
- Revision
- 138976
- Author
- [email protected]
- Date
- 2013-01-07 12:33:53 -0800 (Mon, 07 Jan 2013)
Log Message
Clear pending container size requests as early as possible
https://bugs.webkit.org/show_bug.cgi?id=106162
Reviewed by Eric Seidel.
http://trac.webkit.org/changeset/137981 contained a bug where pending container size
requests were only cleared for images that use container sizes. Bitmap images do not use
container sizes so these requests were not being cleared. This patch does the trivial
refactoring so that container size requests are cleared as early as possible.
No new tests as this is just a refactoring of some messy code added in r137981.
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::createImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (138975 => 138976)
--- trunk/Source/WebCore/ChangeLog 2013-01-07 20:23:29 UTC (rev 138975)
+++ trunk/Source/WebCore/ChangeLog 2013-01-07 20:33:53 UTC (rev 138976)
@@ -1,3 +1,20 @@
+2013-01-07 Philip Rogers <[email protected]>
+
+ Clear pending container size requests as early as possible
+ https://bugs.webkit.org/show_bug.cgi?id=106162
+
+ Reviewed by Eric Seidel.
+
+ http://trac.webkit.org/changeset/137981 contained a bug where pending container size
+ requests were only cleared for images that use container sizes. Bitmap images do not use
+ container sizes so these requests were not being cleared. This patch does the trivial
+ refactoring so that container size requests are cleared as early as possible.
+
+ No new tests as this is just a refactoring of some messy code added in r137981.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::createImage):
+
2013-01-07 Sheriff Bot <[email protected]>
Unreviewed, rolling out r137632.
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (138975 => 138976)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2013-01-07 20:23:29 UTC (rev 138975)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2013-01-07 20:33:53 UTC (rev 138976)
@@ -329,10 +329,12 @@
else
m_image = BitmapImage::create(this);
- // Send queued container size requests.
- if (m_image && m_image->usesContainerSize()) {
- for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
- setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
+ if (m_image) {
+ // Send queued container size requests.
+ if (m_image->usesContainerSize()) {
+ for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
+ setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
+ }
m_pendingContainerSizeRequests.clear();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
