Title: [230951] trunk/Source/WebCore
- Revision
- 230951
- Author
- [email protected]
- Date
- 2018-04-24 01:31:19 -0700 (Tue, 24 Apr 2018)
Log Message
Attempt to fix the Apple Internal build following r230922
(https://bugs.webkit.org/show_bug.cgi?id=184737)
Cast the return value of std::map::size() to a size_t before logging it with format specifier
"%zu". std::map::size() returns a size_type. According to <http://en.cppreference.com/w/cpp/container/map>
size_type is "usually a size_t", but it may not be. An Apple Internal debug builder reports
that size_type = unsigned int != unsigned long = size_t.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::provideMediaData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230950 => 230951)
--- trunk/Source/WebCore/ChangeLog 2018-04-24 08:15:41 UTC (rev 230950)
+++ trunk/Source/WebCore/ChangeLog 2018-04-24 08:31:19 UTC (rev 230951)
@@ -1,3 +1,16 @@
+2018-04-24 Daniel Bates <[email protected]>
+
+ Attempt to fix the Apple Internal build following r230922
+ (https://bugs.webkit.org/show_bug.cgi?id=184737)
+
+ Cast the return value of std::map::size() to a size_t before logging it with format specifier
+ "%zu". std::map::size() returns a size_type. According to <http://en.cppreference.com/w/cpp/container/map>
+ size_type is "usually a size_t", but it may not be. An Apple Internal debug builder reports
+ that size_type = unsigned int != unsigned long = size_t.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::provideMediaData):
+
2018-04-24 Zan Dobersek <[email protected]>
[CoordGraphics] Avoid painting backing stores for zero-opacity layers
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (230950 => 230951)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2018-04-24 08:15:41 UTC (rev 230950)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2018-04-24 08:31:19 UTC (rev 230951)
@@ -1852,7 +1852,7 @@
#endif
}
- LOG(MediaSource, "SourceBuffer::provideMediaData(%p) - Enqueued %u samples, %zu remaining", this, enqueuedSamples, trackBuffer.decodeQueue.size());
+ LOG(MediaSource, "SourceBuffer::provideMediaData(%p) - Enqueued %u samples, %zu remaining", this, enqueuedSamples, static_cast<size_t>(trackBuffer.decodeQueue.size()));
trySignalAllSamplesInTrackEnqueued(trackID);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
