Attachment 339753 Details for Bug 185353 – Only log cue text in debug build

[patch] Only log cue text in debug build

bug-185353-20180507143400.patch (text/plain), 3.22 KB, created by Eric Carlson on 2018-05-07 14:34:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-07 14:34:01 PDT

Size: 3.22 KB

patch

obsolete

>Subversion Revision: 231455
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fd142b5eb23aa67dab46fe5a586368ba2f066edb..a5d5233fbc1ef79c178aaffcdca1bf57f16422b2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-07  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Text track cue logging should include cue text
>+        https://bugs.webkit.org/show_bug.cgi?id=185353
>+        <rdar://problem/40003565>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-07  Chris Dumez  <cdumez@apple.com>
> 
>         ASSERT(!childItemWithTarget(child->target())) is hit in HistoryItem::addChildItem()
>diff --git a/Source/WebCore/html/track/VTTCue.cpp b/Source/WebCore/html/track/VTTCue.cpp
>index ed03bb874c4169e5785b36e7ea3a7d97321363f6..40406f45c68df23d4df4492867ddd28e54be4ea2 100644
>--- a/Source/WebCore/html/track/VTTCue.cpp
>+++ b/Source/WebCore/html/track/VTTCue.cpp
>@@ -1191,14 +1191,15 @@ void VTTCue::toJSON(JSON::Object& object) const
> {
>     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);
>     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());
> }
> 
>diff --git a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>index 4ebc6931ca32463318322694330e6756e7bd6a74..66f1b63584d0ddfc706d9dbec17ae6c424a855ad 100644
>--- a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>+++ b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>@@ -120,7 +120,9 @@ inline String GenericCueData::toJSONString() const
> {
>     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());
> 
>diff --git a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>index 327fe9a7c7637c3a8b969d83852281b8f52536a0..923880de9bc1ed406cacae9fdc08bd8bda17bbce 100644
>--- a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>+++ b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>@@ -114,7 +114,9 @@ String ISOWebVTTCue::toJSONString() const
> {
>     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);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185353: 339657 | 339667 | 339720 | 339753