Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (100177 => 100178)
--- trunk/Source/WebCore/CMakeLists.txt 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-11-14 20:46:51 UTC (rev 100178)
@@ -2055,12 +2055,10 @@
IF (ENABLE_VIDEO_TRACK)
LIST(APPEND WebCore_SOURCES
- html/CueIndex.cpp
html/HTMLTrackElement.cpp
html/LoadableTextTrack.cpp
html/TextTrack.cpp
html/TextTrackCue.cpp
- html/TextTrackCueIndex.cpp
html/TextTrackCueList.cpp
html/track/TextTrackList.cpp
html/track/TrackBase.cpp
Modified: trunk/Source/WebCore/ChangeLog (100177 => 100178)
--- trunk/Source/WebCore/ChangeLog 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/ChangeLog 2011-11-14 20:46:51 UTC (rev 100178)
@@ -1,3 +1,20 @@
+2011-11-14 Anna Cavender <[email protected]>
+
+ Remove TextTrackCueIndex and TextTrackCueSet. No longer needed.
+ https://bugs.webkit.org/show_bug.cgi?id=72216
+
+ Reviewed by Sam Weinig.
+
+ No new tests. No new functionality.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.gypi:
+ * WebCore.xcodeproj/project.pbxproj:
+ * html/TextTrackCueIndex.cpp: Removed.
+ * html/TextTrackCueIndex.h: Removed.
+
2011-10-10 Robert Hogan <[email protected]>
CSS 2.1 failure: border-spacing-applies-to-015.htm
Modified: trunk/Source/WebCore/GNUmakefile.list.am (100177 => 100178)
--- trunk/Source/WebCore/GNUmakefile.list.am 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2011-11-14 20:46:51 UTC (rev 100178)
@@ -1980,8 +1980,6 @@
Source/WebCore/html/TextTrack.h \
Source/WebCore/html/TextTrackCue.cpp \
Source/WebCore/html/TextTrackCue.h \
- Source/WebCore/html/TextTrackCueIndex.cpp \
- Source/WebCore/html/TextTrackCueIndex.h \
Source/WebCore/html/TextTrackCueList.cpp \
Source/WebCore/html/TextTrackCueList.h \
Source/WebCore/html/TimeInputType.cpp \
Modified: trunk/Source/WebCore/Target.pri (100177 => 100178)
--- trunk/Source/WebCore/Target.pri 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/Target.pri 2011-11-14 20:46:51 UTC (rev 100178)
@@ -1869,7 +1869,6 @@
html/TextDocument.h \
html/TextTrack.h \
html/TextTrackCue.h \
- html/TextTrackCueIndex.h \
html/TextTrackCueList.h \
html/TimeRanges.h \
html/ValidityState.h \
Modified: trunk/Source/WebCore/WebCore.gypi (100177 => 100178)
--- trunk/Source/WebCore/WebCore.gypi 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/WebCore.gypi 2011-11-14 20:46:51 UTC (rev 100178)
@@ -5650,8 +5650,6 @@
'html/TextTrack.h',
'html/TextTrackCue.cpp',
'html/TextTrackCue.h',
- 'html/TextTrackCueIndex.cpp',
- 'html/TextTrackCueIndex.h',
'html/TextTrackCueList.cpp',
'html/TextTrackCueList.h',
'html/TimeInputType.cpp',
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (100177 => 100178)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2011-11-14 20:46:51 UTC (rev 100178)
@@ -4160,8 +4160,6 @@
B10B6981140C174000BC1C26 /* WebVTTTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B10B697E140C174000BC1C26 /* WebVTTTokenizer.cpp */; };
B10B6982140C174000BC1C26 /* WebVTTTokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = B10B697F140C174000BC1C26 /* WebVTTTokenizer.h */; };
B1827493134CA4C100B98C2D /* CallbackFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1827492134CA4C100B98C2D /* CallbackFunction.cpp */; };
- B1AD4E5C13A12A0B00846B27 /* TextTrackCueIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */; };
- B1AD4E5D13A12A0B00846B27 /* TextTrackCueIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */; };
B1AD4E5E13A12A0B00846B27 /* LoadableTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */; };
B1AD4E5F13A12A0B00846B27 /* LoadableTextTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */; };
B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */; };
@@ -11277,8 +11275,6 @@
B10B697E140C174000BC1C26 /* WebVTTTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTTokenizer.cpp; sourceTree = "<group>"; };
B10B697F140C174000BC1C26 /* WebVTTTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTTokenizer.h; sourceTree = "<group>"; };
B1827492134CA4C100B98C2D /* CallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackFunction.cpp; sourceTree = "<group>"; };
- B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrackCueIndex.cpp; sourceTree = "<group>"; };
- B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueIndex.h; sourceTree = "<group>"; };
B1AD4E4D13A12A0B00846B27 /* LoadableTextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadableTextTrack.cpp; sourceTree = "<group>"; };
B1AD4E4E13A12A0B00846B27 /* LoadableTextTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadableTextTrack.h; sourceTree = "<group>"; };
B1AD4E5513A12A0B00846B27 /* TextTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextTrack.cpp; sourceTree = "<group>"; };
@@ -17391,8 +17387,6 @@
B1AD4E5713A12A0B00846B27 /* TextTrackCue.cpp */,
B1AD4E5813A12A0B00846B27 /* TextTrackCue.h */,
0707569D1422979800414161 /* TextTrackCue.idl */,
- B1AD4E4B13A12A0B00846B27 /* TextTrackCueIndex.cpp */,
- B1AD4E4C13A12A0B00846B27 /* TextTrackCueIndex.h */,
B1AD4E5913A12A0B00846B27 /* TextTrackCueList.cpp */,
B1AD4E5A13A12A0B00846B27 /* TextTrackCueList.h */,
0707569E1422979800414161 /* TextTrackCueList.idl */,
@@ -24427,7 +24421,6 @@
B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
B1AD4E6713A12A0B00846B27 /* TextTrack.h in Headers */,
B1AD4E6913A12A0B00846B27 /* TextTrackCue.h in Headers */,
- B1AD4E5D13A12A0B00846B27 /* TextTrackCueIndex.h in Headers */,
B1AD4E6B13A12A0B00846B27 /* TextTrackCueList.h in Headers */,
B1AD4E7413A12A4600846B27 /* TextTrackLoader.h in Headers */,
498770F11242C535002226BA /* Texture.h in Headers */,
@@ -27331,7 +27324,6 @@
B2C3DA4A0D006C1D00EF6F26 /* TextStream.cpp in Sources */,
B1AD4E6613A12A0B00846B27 /* TextTrack.cpp in Sources */,
B1AD4E6813A12A0B00846B27 /* TextTrackCue.cpp in Sources */,
- B1AD4E5C13A12A0B00846B27 /* TextTrackCueIndex.cpp in Sources */,
B1AD4E6A13A12A0B00846B27 /* TextTrackCueList.cpp in Sources */,
B1AD4E7313A12A4600846B27 /* TextTrackLoader.cpp in Sources */,
498770F01242C535002226BA /* Texture.cpp in Sources */,
Deleted: trunk/Source/WebCore/html/TextTrackCueIndex.cpp (100177 => 100178)
--- trunk/Source/WebCore/html/TextTrackCueIndex.cpp 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/html/TextTrackCueIndex.cpp 2011-11-14 20:46:51 UTC (rev 100178)
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-
-#if ENABLE(VIDEO_TRACK)
-
-#include "TextTrackCueIndex.h"
-
-#include "TextTrackCue.h"
-#include "TextTrackCueList.h"
-
-namespace WebCore {
-
-TextTrackCueSet TextTrackCueSet::difference(const TextTrackCueSet&) const
-{
- // FIXME(62883): Implement.
- return TextTrackCueSet();
-}
-
-TextTrackCueSet TextTrackCueSet::unionSet(const TextTrackCueSet&) const
-{
- // FIXME(62883): Implement.
- return TextTrackCueSet();
-}
-
-void TextTrackCueSet::add(const TextTrackCue&)
-{
- // FIXME(62883): Implement.
-}
-
-bool TextTrackCueSet::contains(const TextTrackCue&) const
-{
- // FIXME(62883): Implement.
- return false;
-}
-
-void TextTrackCueSet::remove(const TextTrackCue&)
-{
- // FIXME(62883): Implement.
-}
-
-bool TextTrackCueSet::isEmpty() const
-{
- // FIXME(62883): Implement.
- return false;
-}
-
-int TextTrackCueSet::size() const
-{
- // FIXME(62883): Implement.
- return 0;
-}
-
-void TextTrackCueIndex::fetchNewCuesFromLoader(TextTrackLoader*)
-{
- // FIXME(62883): Implement.
-}
-
-void TextTrackCueIndex::removeCuesFromIndex(const TextTrackCueList*)
-{
- // FIXME(62883): Implement.
-}
-
-TextTrackCueSet TextTrackCueIndex::visibleCuesAtTime(double) const
-{
- // FIXME(62855): Implement.
- return TextTrackCueSet();
-}
-
-void TextTrackCueIndex::add(TextTrackCue*)
-{
- // FIXME(62890): Implement.
-}
-
-void TextTrackCueIndex::remove(TextTrackCue*)
-{
- // FIXME(62890): Implement.
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/html/TextTrackCueIndex.h (100177 => 100178)
--- trunk/Source/WebCore/html/TextTrackCueIndex.h 2011-11-14 20:41:04 UTC (rev 100177)
+++ trunk/Source/WebCore/html/TextTrackCueIndex.h 2011-11-14 20:46:51 UTC (rev 100178)
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TextTrackCueIndex_h
-#define TextTrackCueIndex_h
-
-#if ENABLE(VIDEO_TRACK)
-
-#include "TextTrackLoader.h"
-#include <wtf/HashSet.h>
-
-namespace WebCore {
-
-class TextTrackCue;
-class TextTrackCueList;
-
-class TextTrackCueSet {
-public:
- TextTrackCueSet() { }
- ~TextTrackCueSet() { }
- TextTrackCueSet difference(const TextTrackCueSet&) const;
- TextTrackCueSet unionSet(const TextTrackCueSet&) const;
- void add(const TextTrackCue&);
- bool contains(const TextTrackCue&) const;
- void remove(const TextTrackCue&);
- bool isEmpty() const;
- int size() const;
-private:
- HashSet<TextTrackCue*> m_set;
-};
-
-class TextTrackCueIndex : public TextTrackLoaderClient {
-public:
- // TextTrackLoaderClient methods.
- void fetchNewCuesFromLoader(TextTrackLoader*);
- void removeCuesFromIndex(const TextTrackCueList*);
-
- // Returns set of cues visible at a time in seconds.
- TextTrackCueSet visibleCuesAtTime(double) const;
- void add(TextTrackCue*);
- void remove(TextTrackCue*);
-};
-
-} // namespace WebCore
-
-#endif
-#endif
