Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)

New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream

1 files changed, 4 insertions, 17 deletions

diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
index 335bfbd36..bdc614989 100644
--- a/Source/WebCore/html/HTMLMediaElement.h
+++ b/Source/WebCore/html/HTMLMediaElement.h
@@ -175,20 +175,7 @@ public:
 #if ENABLE(MEDIA_SOURCE)
 //  Media Source.
     const KURL& webkitMediaSourceURL() const { return m_mediaSourceURL; }
-    void webkitSourceAddId(const String&, const String&, ExceptionCode&);
-    void webkitSourceRemoveId(const String&, ExceptionCode&);
-    PassRefPtr<TimeRanges> webkitSourceBuffered(const String&, ExceptionCode&);
-    void webkitSourceAppend(const String&, PassRefPtr<Uint8Array> data, ExceptionCode&);
-    void webkitSourceAbort(const String&, ExceptionCode&);
-    enum EndOfStreamStatus { EOS_NO_ERROR, EOS_NETWORK_ERR, EOS_DECODE_ERR };
-    void webkitSourceEndOfStream(unsigned short, ExceptionCode&);
-    enum SourceState { SOURCE_CLOSED, SOURCE_OPEN, SOURCE_ENDED };
-    SourceState webkitSourceState() const;
-    void setSourceState(SourceState);
-
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitsourceopen);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitsourceended);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitsourceclose);
+    void setSourceState(const String&);
 #endif 
 
 #if ENABLE(ENCRYPTED_MEDIA)
@@ -328,6 +315,8 @@ public:
 
     virtual bool dispatchEvent(PassRefPtr<Event>);
 
+    virtual bool willRespondToMouseClickEvents() OVERRIDE;
+
 protected:
     HTMLMediaElement(const QualifiedName&, Document*, bool);
     virtual ~HTMLMediaElement();
@@ -418,7 +407,6 @@ private:
 #if ENABLE(MEDIA_SOURCE)
     virtual void mediaPlayerSourceOpened();
     virtual String mediaPlayerSourceURL() const;
-    bool isValidSourceId(const String&, ExceptionCode&) const;
 #endif
 
 #if ENABLE(ENCRYPTED_MEDIA)
@@ -596,8 +584,7 @@ private:
 
 #if ENABLE(MEDIA_SOURCE)
     KURL m_mediaSourceURL;
-    SourceState m_sourceState;
-    HashSet<String> m_sourceIDs;
+    RefPtr<MediaSource> m_mediaSource;
 #endif
 
     mutable float m_cachedTime;