Title: [208233] tags/Safari-602.3.7/Source/WebCore
- Revision
- 208233
- Author
- [email protected]
- Date
- 2016-11-01 11:57:22 -0700 (Tue, 01 Nov 2016)
Log Message
Merge r206637. rdar://problem/28718754
Modified Paths
Diff
Modified: tags/Safari-602.3.7/Source/WebCore/ChangeLog (208232 => 208233)
--- tags/Safari-602.3.7/Source/WebCore/ChangeLog 2016-11-01 18:56:05 UTC (rev 208232)
+++ tags/Safari-602.3.7/Source/WebCore/ChangeLog 2016-11-01 18:57:22 UTC (rev 208233)
@@ -1,3 +1,14 @@
+2016-11-01 Matthew Hanson <[email protected]>
+
+ Merge r206637. rdar://problem/28718754
+
+ 2016-09-30 Said Abou-Hallawa <[email protected]>
+
+ Unreviewed, fix 32-bit build.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::decodedSizeChanged):
+
2016-10-31 Matthew Hanson <[email protected]>
Merge r208151. rdar://problem/29032335
Modified: tags/Safari-602.3.7/Source/WebCore/loader/cache/CachedImage.cpp (208232 => 208233)
--- tags/Safari-602.3.7/Source/WebCore/loader/cache/CachedImage.cpp 2016-11-01 18:56:05 UTC (rev 208232)
+++ tags/Safari-602.3.7/Source/WebCore/loader/cache/CachedImage.cpp 2016-11-01 18:57:22 UTC (rev 208233)
@@ -469,7 +469,7 @@
return;
ASSERT(delta >= 0 || decodedSize() + delta >= 0);
- setDecodedSize(decodedSize() + delta);
+ setDecodedSize(static_cast<unsigned>(decodedSize() + delta));
}
void CachedImage::didDraw(const Image* image)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
