Title: [231490] trunk/Source/WebCore
- Revision
- 231490
- Author
- [email protected]
- Date
- 2018-05-08 10:20:09 -0700 (Tue, 08 May 2018)
Log Message
Text track cue logging should include cue text
https://bugs.webkit.org/show_bug.cgi?id=185353
<rdar://problem/40003565>
Reviewed by Brent Fulgham.
No new tests, tested manually.
* html/track/VTTCue.cpp:
(WebCore::VTTCue::toJSON const):
* platform/graphics/InbandTextTrackPrivateClient.h:
(WebCore::GenericCueData::toJSONString const):
* platform/graphics/iso/ISOVTTCue.cpp:
(WebCore::ISOWebVTTCue::toJSONString const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (231489 => 231490)
--- trunk/Source/WebCore/ChangeLog 2018-05-08 17:15:38 UTC (rev 231489)
+++ trunk/Source/WebCore/ChangeLog 2018-05-08 17:20:09 UTC (rev 231490)
@@ -1,3 +1,20 @@
+2018-05-08 Eric Carlson <[email protected]>
+
+ Text track cue logging should include cue text
+ https://bugs.webkit.org/show_bug.cgi?id=185353
+ <rdar://problem/40003565>
+
+ Reviewed by Brent Fulgham.
+
+ No new tests, tested manually.
+
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCue::toJSON const):
+ * platform/graphics/InbandTextTrackPrivateClient.h:
+ (WebCore::GenericCueData::toJSONString const):
+ * platform/graphics/iso/ISOVTTCue.cpp:
+ (WebCore::ISOWebVTTCue::toJSONString const):
+
2018-05-08 Sam Weinig <[email protected]>
More cleanup of XMLHttpRequestUpload
Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (231489 => 231490)
--- trunk/Source/WebCore/html/track/VTTCue.cpp 2018-05-08 17:15:38 UTC (rev 231489)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2018-05-08 17:20:09 UTC (rev 231490)
@@ -1191,7 +1191,9 @@
{
TextTrackCue::toJSON(object);
+#if !LOG_DISABLED
object.setString(ASCIILiteral("text"), text());
+#endif
object.setString(ASCIILiteral("vertical"), vertical());
object.setBoolean(ASCIILiteral("snapToLines"), snapToLines());
object.setDouble(ASCIILiteral("line"), m_linePosition);
@@ -1198,7 +1200,6 @@
object.setDouble(ASCIILiteral("position"), position());
object.setInteger(ASCIILiteral("size"), m_cueSize);
object.setString(ASCIILiteral("align"), align());
- object.setString(ASCIILiteral("text"), text());
object.setString(ASCIILiteral("regionId"), regionId());
}
Modified: trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h (231489 => 231490)
--- trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h 2018-05-08 17:15:38 UTC (rev 231489)
+++ trunk/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h 2018-05-08 17:20:09 UTC (rev 231490)
@@ -120,7 +120,9 @@
{
auto object = JSON::Object::create();
+#if !LOG_DISABLED
object->setString(ASCIILiteral("text"), m_content);
+#endif
object->setDouble(ASCIILiteral("start"), m_startTime.toDouble());
object->setDouble(ASCIILiteral("end"), m_endTime.toDouble());
Modified: trunk/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp (231489 => 231490)
--- trunk/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp 2018-05-08 17:15:38 UTC (rev 231489)
+++ trunk/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp 2018-05-08 17:20:09 UTC (rev 231490)
@@ -114,7 +114,9 @@
{
auto object = JSON::Object::create();
+#if !LOG_DISABLED
object->setString(ASCIILiteral("text"), m_cueText);
+#endif
object->setString(ASCIILiteral("sourceId"), m_sourceID);
object->setString(ASCIILiteral("id"), m_identifier);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
