Title: [173478] trunk/Source/WebCore
- Revision
- 173478
- Author
- [email protected]
- Date
- 2014-09-10 12:26:43 -0700 (Wed, 10 Sep 2014)
Log Message
Remove a workaround in frameIsCompleteAtIndex for a problem that was fixed in Lion
https://bugs.webkit.org/show_bug.cgi?id=136652
Reviewed by Dan Bernstein.
* platform/graphics/cg/ImageSourceCG.cpp:
(WebCore::ImageSource::frameIsCompleteAtIndex):
ImageIO returns the right thing now.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173477 => 173478)
--- trunk/Source/WebCore/ChangeLog 2014-09-10 19:15:28 UTC (rev 173477)
+++ trunk/Source/WebCore/ChangeLog 2014-09-10 19:26:43 UTC (rev 173478)
@@ -1,3 +1,14 @@
+2014-09-10 Tim Horton <[email protected]>
+
+ Remove a workaround in frameIsCompleteAtIndex for a problem that was fixed in Lion
+ https://bugs.webkit.org/show_bug.cgi?id=136652
+
+ Reviewed by Dan Bernstein.
+
+ * platform/graphics/cg/ImageSourceCG.cpp:
+ (WebCore::ImageSource::frameIsCompleteAtIndex):
+ ImageIO returns the right thing now.
+
2014-09-10 Myles C. Maxfield <[email protected]>
Laying out a TextRun using an SVG font is O(n^2)
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp (173477 => 173478)
--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-09-10 19:15:28 UTC (rev 173477)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCG.cpp 2014-09-10 19:26:43 UTC (rev 173478)
@@ -384,21 +384,7 @@
bool ImageSource::frameIsCompleteAtIndex(size_t index)
{
ASSERT(frameCount());
-
- // CGImageSourceGetStatusAtIndex claims that all frames of a multi-frame image are incomplete
- // when we've not yet received the complete data for an image that is using an incremental data
- // source (<rdar://problem/7679174>). We work around this by special-casing all frames except the
- // last in an image and treating them as complete if they are present and reported as being
- // incomplete. We do this on the assumption that loading new data can only modify the existing last
- // frame or append new frames. The last frame is only treated as being complete if the image source
- // reports it as such. This ensures that it is truly the last frame of the image rather than just
- // the last that we currently have data for.
-
- CGImageSourceStatus frameStatus = CGImageSourceGetStatusAtIndex(m_decoder, index);
- if (index < frameCount() - 1)
- return frameStatus >= kCGImageStatusIncomplete;
-
- return frameStatus == kCGImageStatusComplete;
+ return CGImageSourceGetStatusAtIndex(m_decoder, index) == kCGImageStatusComplete;
}
float ImageSource::frameDurationAtIndex(size_t index)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
