Remove MediaSourcePrivate/SourceBufferPrivate

Source/modules/mediasource/SourceBuffer.h

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef SourceBuffer_h
 #define SourceBuffer_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
-#include "core/platform/graphics/SourceBufferPrivate.h"
 #include "platform/AsyncMethodRunner.h"
 #include "weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
 
+namespace blink {
+class WebSourceBuffer;
+}
+
 namespace WebCore {
 
 class ExceptionState;
 class FileReaderLoader;
 class GenericEventQueue;
 class MediaSource;
 class Stream;
 class TimeRanges;
 
 class SourceBuffer : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable, public FileReaderLoaderClient {
     REFCOUNTED_EVENT_TARGET(SourceBuffer);
 public:
-    static PassRefPtr<SourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, MediaSource*, GenericEventQueue*);
+    static PassRefPtr<SourceBuffer> create(PassOwnPtr<blink::WebSourceBuffer>, MediaSource*, GenericEventQueue*);
 
     virtual ~SourceBuffer();
 
     // SourceBuffer.idl methods
     bool updating() const { return m_updating; }
     PassRefPtr<TimeRanges> buffered(ExceptionState&) const;
     double timestampOffset() const;
     void setTimestampOffset(double, ExceptionState&);
     void appendBuffer(PassRefPtr<ArrayBuffer> data, ExceptionState&);
     void appendBuffer(PassRefPtr<ArrayBufferView> data, ExceptionState&);
@@ skipping 13 matching lines @@
     virtual bool hasPendingActivity() const OVERRIDE;
     virtual void suspend() OVERRIDE;
     virtual void resume() OVERRIDE;
     virtual void stop() OVERRIDE;
 
     // EventTarget interface
     virtual ExecutionContext* executionContext() const OVERRIDE;
     virtual const AtomicString& interfaceName() const OVERRIDE;
 
 private:
-    SourceBuffer(PassOwnPtr<SourceBufferPrivate>, MediaSource*, GenericEventQueue*);
+    SourceBuffer(PassOwnPtr<blink::WebSourceBuffer>, MediaSource*, GenericEventQueue*);
 
     bool isRemoved() const;
     void scheduleEvent(const AtomicString& eventName);
 
     void appendBufferInternal(const unsigned char*, unsigned, ExceptionState&);
     void appendBufferAsyncPart();
 
     void removeAsyncPart();
 
     void appendStreamInternal(PassRefPtr<Stream>, ExceptionState&);
     void appendStreamAsyncPart();
     void appendStreamDone(bool success);
     void clearAppendStreamState();
 
     // FileReaderLoaderClient interface
     virtual void didStartLoading() OVERRIDE;
     virtual void didReceiveDataForClient(const char* data, unsigned dataLength) OVERRIDE;
     virtual void didFinishLoading() OVERRIDE;
     virtual void didFail(FileError::ErrorCode) OVERRIDE;
 
-    OwnPtr<SourceBufferPrivate> m_private;
+    OwnPtr<blink::WebSourceBuffer> m_webSourceBuffer;
     MediaSource* m_source;
     GenericEventQueue* m_asyncEventQueue;
 
     bool m_updating;
     double m_timestampOffset;
     double m_appendWindowStart;
     double m_appendWindowEnd;
 
     Vector<unsigned char> m_pendingAppendData;
     AsyncMethodRunner<SourceBuffer> m_appendBufferAsyncPartRunner;
 
     double m_pendingRemoveStart;
     double m_pendingRemoveEnd;
     AsyncMethodRunner<SourceBuffer> m_removeAsyncPartRunner;
 
     bool m_streamMaxSizeValid;
     unsigned long long m_streamMaxSize;
     AsyncMethodRunner<SourceBuffer> m_appendStreamAsyncPartRunner;
     RefPtr<Stream> m_stream;
     OwnPtr<FileReaderLoader> m_loader;
 };
 
 } // namespace WebCore
 
 #endif