Revert 182826 "Oilpan: Move MediaStreamSource, MediaStreamCompon..."

trunk/public/platform/WebMediaStreamTrack.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:
  * 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
@@ skipping 23 matching lines @@
 class MediaStreamComponent;
 class WebAudioSourceProvider;
 class WebMediaStream;
 class WebMediaStreamSource;
 class WebString;
 
 class WebMediaStreamTrack {
 public:
     class ExtraData {
     public:
-        ExtraData() { }
+        ExtraData() : m_owner(0) { }
         virtual ~ExtraData() { }
+
+        BLINK_PLATFORM_EXPORT WebMediaStreamTrack owner();
+
+#if INSIDE_BLINK
+        BLINK_PLATFORM_EXPORT void setOwner(MediaStreamComponent*);
+#endif
+
+    private:
+        MediaStreamComponent* m_owner;
     };
 
     WebMediaStreamTrack() { }
     WebMediaStreamTrack(const WebMediaStreamTrack& other) { assign(other); }
     ~WebMediaStreamTrack() { reset(); }
 
     WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other)
     {
         assign(other);
         return *this;
@@ skipping 18 matching lines @@
     // extra data pointer to be deleted.
     BLINK_PLATFORM_EXPORT ExtraData* extraData() const;
     BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
 
     // The lifetime of the WebAudioSourceProvider should outlive the
     // WebMediaStreamTrack, and clients are responsible for calling
     // setSourceProvider(0) before the WebMediaStreamTrack is going away.
     BLINK_PLATFORM_EXPORT void setSourceProvider(WebAudioSourceProvider*);
 
 #if INSIDE_BLINK
+    BLINK_PLATFORM_EXPORT WebMediaStreamTrack(PassRefPtr<MediaStreamComponent>);
     BLINK_PLATFORM_EXPORT WebMediaStreamTrack(MediaStreamComponent*);
     BLINK_PLATFORM_EXPORT WebMediaStreamTrack& operator=(MediaStreamComponent*);
+    BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamComponent>() const;
     BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const;
 #endif
 
 private:
     WebPrivatePtr<MediaStreamComponent> m_private;
 };
 
 } // namespace blink
 
 #endif // WebMediaStreamTrack_h