Remove DataCue "text" attribute
authorb.long@cablelabs.com <b.long@cablelabs.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Dec 2014 00:18:09 +0000 (00:18 +0000)
committerb.long@cablelabs.com <b.long@cablelabs.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Dec 2014 00:18:09 +0000 (00:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139461

Reviewed by Eric Carlson.

Source/WebCore:

* html/track/DataCue.cpp:
* html/track/DataCue.h:
* html/track/DataCue.idl:

LayoutTests:

* media/track/track-datacue-expected.txt:
* media/track/track-datacue.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177190 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/media/track/track-datacue-expected.txt
LayoutTests/media/track/track-datacue.html
Source/WebCore/ChangeLog
Source/WebCore/html/track/DataCue.cpp
Source/WebCore/html/track/DataCue.h
Source/WebCore/html/track/DataCue.idl

index 0fa5139..540ed95 100644 (file)
@@ -1,3 +1,13 @@
+2014-12-11  Brendan Long  <b.long@cablelabs.com>
+
+        Remove DataCue "text" attribute
+        https://bugs.webkit.org/show_bug.cgi?id=139461
+
+        Reviewed by Eric Carlson.
+
+        * media/track/track-datacue-expected.txt:
+        * media/track/track-datacue.html:
+
 2014-12-11  Alexey Proskuryakov  <ap@apple.com>
 
         fast/workers/worker-constructor.html frequently crashes
index d13c3cd..c6ac5d6 100644 (file)
@@ -17,7 +17,6 @@ EXPECTED (new Uint8Array(cue.data)[1] == '5') OK
 EXPECTED (new Uint8Array(cue.data)[2] == '2') OK
 EXPECTED (new Uint8Array(cue.data)[3] == '1') OK
 EXPECTED (new Uint8Array(cue.data)[4] == '9') OK
-EXPECTED (cue.text == 'null') OK
 
 *** Changing the original buffer data should not effect DataCue.data.
 RUN(expectedData[0] = 7)
index 3b7c8c7..7a2b0a5 100644 (file)
@@ -22,7 +22,6 @@
                 consoleWrite("<br>*** Test DataCue interface.");
                 testExpected("cue", DataCue, "instanceof");
                 testArraysEqual("new Uint8Array(cue.data)", expectedData);
-                testExpected("cue.text", null);
 
                 // https://www.w3.org/Bugs/Public/show_bug.cgi?id=24687
                 consoleWrite("<br>*** Changing the original buffer data should not effect DataCue.data.");
index 8b2995d..958f0e4 100644 (file)
@@ -1,3 +1,14 @@
+2014-12-11  Brendan Long  <b.long@cablelabs.com>
+
+        Remove DataCue "text" attribute
+        https://bugs.webkit.org/show_bug.cgi?id=139461
+
+        Reviewed by Eric Carlson.
+
+        * html/track/DataCue.cpp:
+        * html/track/DataCue.h:
+        * html/track/DataCue.idl:
+
 2014-12-11  Alexey Proskuryakov  <ap@apple.com>
 
         Initialize m_ownsGeneratedFile when decoding a FormDataElement
index fbf8f3c..2f4804a 100644 (file)
@@ -101,14 +101,6 @@ void DataCue::setData(ArrayBuffer* data, ExceptionCode& ec)
     m_data = ArrayBuffer::create(data);
 }
 
-#if !ENABLE(DATACUE_VALUE)
-String DataCue::text(bool& isNull) const
-{
-    isNull = true;
-    return String();
-}
-#endif
-
 DataCue* toDataCue(TextTrackCue* cue)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(cue->cueType() == TextTrackCue::Data);
index f8a0d7a..b490f63 100644 (file)
@@ -86,8 +86,6 @@ public:
 
     String type() const { return m_type; }
     void setType(const String& type) { m_type = type; }
-#else
-    String text(bool&) const;
 #endif
 
     virtual bool isEqual(const TextTrackCue&, CueMatchRules) const override;
index 0352ed0..fa5e25e 100644 (file)
@@ -39,7 +39,5 @@
 #if defined(ENABLE_DATACUE_VALUE) && ENABLE_DATACUE_VALUE
     [CustomGetter, CustomSetter] attribute any value;
     readonly attribute DOMString type;
-#else
-    readonly attribute DOMString? text;
 #endif
 };