Title: [253511] trunk/Source/WebCore
- Revision
- 253511
- Author
- jer.no...@apple.com
- Date
- 2019-12-13 17:20:30 -0800 (Fri, 13 Dec 2019)
Log Message
Unreviewed 32-bit build fix: explicitly cast the bitrate to an int when creating a JSON
object for logging purposes.
* platform/mediacapabilities/MediaCapabilitiesLogging.cpp:
(WebCore::toJSONObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (253510 => 253511)
--- trunk/Source/WebCore/ChangeLog 2019-12-14 01:10:10 UTC (rev 253510)
+++ trunk/Source/WebCore/ChangeLog 2019-12-14 01:20:30 UTC (rev 253511)
@@ -1,3 +1,11 @@
+2019-12-13 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed 32-bit build fix: explicitly cast the bitrate to an int when creating a JSON
+ object for logging purposes.
+
+ * platform/mediacapabilities/MediaCapabilitiesLogging.cpp:
+ (WebCore::toJSONObject):
+
2019-12-13 Dean Jackson <d...@apple.com>
MacCatalyst build of libANGLE is installed in the incorrect location
Modified: trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp (253510 => 253511)
--- trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp 2019-12-14 01:10:10 UTC (rev 253510)
+++ trunk/Source/WebCore/platform/mediacapabilities/MediaCapabilitiesLogging.cpp 2019-12-14 01:20:30 UTC (rev 253511)
@@ -49,7 +49,7 @@
object->setString("contentType"_s, configuration.contentType);
object->setInteger("width"_s, configuration.width);
object->setInteger("height"_s, configuration.height);
- object->setInteger("bitrate"_s, configuration.bitrate);
+ object->setInteger("bitrate"_s, static_cast<int>(configuration.bitrate));
object->setDouble("framerate"_s, configuration.framerate);
if (configuration.alphaChannel)
object->setBoolean("alphaChannel"_s, configuration.alphaChannel.value());
@@ -67,7 +67,7 @@
auto object = JSON::Object::create();
object->setString("contentType"_s, configuration.contentType);
object->setString("channels"_s, configuration.channels);
- object->setInteger("bitrate"_s, configuration.bitrate);
+ object->setInteger("bitrate"_s, static_cast<int>(configuration.bitrate));
object->setDouble("samplerate"_s, configuration.samplerate);
return object;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
