Title: [210199] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 210199
- Author
- [email protected]
- Date
- 2016-12-28 04:16:01 -0800 (Wed, 28 Dec 2016)
Log Message
Merge r206637 - Unreviewed, fix 32-bit build.
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::decodedSizeChanged):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (210198 => 210199)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-28 12:15:48 UTC (rev 210198)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-12-28 12:16:01 UTC (rev 210199)
@@ -1,5 +1,12 @@
2016-09-30 Said Abou-Hallawa <[email protected]>
+ Unreviewed, fix 32-bit build.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::decodedSizeChanged):
+
+2016-09-30 Said Abou-Hallawa <[email protected]>
+
Change the MemoryCache and CachedResource adjustSize functions to take a long argument
https://bugs.webkit.org/show_bug.cgi?id=162708
<rdar://problem/28555702>
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/cache/CachedImage.cpp (210198 => 210199)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/cache/CachedImage.cpp 2016-12-28 12:15:48 UTC (rev 210198)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/loader/cache/CachedImage.cpp 2016-12-28 12:16:01 UTC (rev 210199)
@@ -468,7 +468,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
