Attachment 339720 Details for Bug 185353 – Patch for landing.

[patch] Patch for landing.

bug-185353-20180507080958.patch (text/plain), 5.12 KB, created by Eric Carlson on 2018-05-07 08:09:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-07 08:09:59 PDT

Size: 5.12 KB

patch

obsolete

>Subversion Revision: 231437
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b20d52b4d02a2bbc126d85eb4cb6b53df23a60f0..0e101ba5bc3297f130769a486e509ce485cffafb 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+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 Youenn Fablet.
>+
>+        No new tests, tested manually.
>+
>+        * html/track/VTTCue.cpp:
>+        (WebCore::VTTCue::toJSONString const): Use toJSON.
>+        (WebCore::VTTCue::toJSON const): New.
>+        * html/track/VTTCue.h:
>+
>+        * platform/graphics/InbandTextTrackPrivateClient.h:
>+        (WebCore::GenericCueData::toJSONString const): Log m_content.
>+
>+        * platform/graphics/iso/ISOVTTCue.cpp:
>+        (WebCore::ISOWebVTTCue::toJSONString const): Log m_cueText.
>+
> 2018-05-06  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add assertions for stale Display::Box geometry
>diff --git a/Source/WebCore/html/track/TextTrackCueGeneric.cpp b/Source/WebCore/html/track/TextTrackCueGeneric.cpp
>index 90e9886e88485fe9d08501dc62efa4c4711e67c8..c0da58b18ef7a9709e8a161deec184774a1c0f06 100644
>--- a/Source/WebCore/html/track/TextTrackCueGeneric.cpp
>+++ b/Source/WebCore/html/track/TextTrackCueGeneric.cpp
>@@ -272,7 +272,7 @@ String TextTrackCueGeneric::toJSONString() const
> {
>     auto object = JSON::Object::create();
> 
>-    VTTCue::toJSON(object.get());
>+    toJSON(object.get());
> 
>     if (m_foregroundColor.isValid())
>         object->setString(ASCIILiteral("foregroundColor"), m_foregroundColor.serialized());
>diff --git a/Source/WebCore/html/track/VTTCue.cpp b/Source/WebCore/html/track/VTTCue.cpp
>index 78f8adfc37e5d5c7c64b983fb7d0c54497646d7b..ed03bb874c4169e5785b36e7ea3a7d97321363f6 100644
>--- a/Source/WebCore/html/track/VTTCue.cpp
>+++ b/Source/WebCore/html/track/VTTCue.cpp
>@@ -1182,21 +1182,26 @@ const VTTCue* toVTTCue(const TextTrackCue* cue)
> String VTTCue::toJSONString() const
> {
>     auto object = JSON::Object::create();
>-
>-    TextTrackCue::toJSON(object.get());
>-
>-    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());
>+    toJSON(object.get());
> 
>     return object->toJSONString();
> }
> 
>+void VTTCue::toJSON(JSON::Object& object) const
>+{
>+    TextTrackCue::toJSON(object);
>+
>+    object.setString(ASCIILiteral("text"), text());
>+    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());
>+}
>+
> } // namespace WebCore
> 
> #endif
>diff --git a/Source/WebCore/html/track/VTTCue.h b/Source/WebCore/html/track/VTTCue.h
>index 3d968d62addbea0f84ddb0d534f8d2d8cc6efd94..88d4611b25eea7d4b013bc6d95e178eeb5437adc 100644
>--- a/Source/WebCore/html/track/VTTCue.h
>+++ b/Source/WebCore/html/track/VTTCue.h
>@@ -177,6 +177,8 @@ protected:
>     virtual Ref<VTTCueBox> createDisplayTree();
>     VTTCueBox& displayTreeInternal();
> 
>+    void toJSON(JSON::Object&) const final;
>+
> private:
>     void initialize(ScriptExecutionContext&);
>     void createWebVTTNodeTree();
>diff --git a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>index ccbb3d655f93c814be21ed85ddc2e0b9715d1c7e..4ebc6931ca32463318322694330e6756e7bd6a74 100644
>--- a/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>+++ b/Source/WebCore/platform/graphics/InbandTextTrackPrivateClient.h
>@@ -120,6 +120,7 @@ inline String GenericCueData::toJSONString() const
> {
>     auto object = JSON::Object::create();
> 
>+    object->setString(ASCIILiteral("text"), m_content);
>     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 a063bd22a36ff39d66f1fc67548604d9814923da..327fe9a7c7637c3a8b969d83852281b8f52536a0 100644
>--- a/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>+++ b/Source/WebCore/platform/graphics/iso/ISOVTTCue.cpp
>@@ -114,6 +114,7 @@ String ISOWebVTTCue::toJSONString() const
> {
>     auto object = JSON::Object::create();
> 
>+    object->setString(ASCIILiteral("text"), m_cueText);
>     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