Introduce WebMediaSession

third_party/WebKit/Source/modules/mediasession/MediaSession.h

Index: third_party/WebKit/Source/modules/mediasession/MediaSession.h
diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSession.h b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
index bb9ce15e275adb89d5a6c5759c1dcc1aa486de4d..3508dabee0bd35d7ca33d241e16d8db1d77b33a0 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.h
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.h
@@ -5,23 +5,36 @@
 #ifndef MediaSession_h
 #define MediaSession_h
 
+#include "bindings/core/v8/ScriptPromise.h"
+#include "bindings/core/v8/ScriptPromiseResolver.h"

[mlamouri (slow - plz ping), 2015/10/07 14:19:31]

I don't think you need the Resolver header in here.

[davve, 2015/10/08 09:17:35]

Done.

 #include "bindings/core/v8/ScriptWrappable.h"
+#include "modules/ModulesExport.h"
 #include "platform/heap/Handle.h"
+#include "public/platform/modules/mediasession/WebMediaSession.h"

[mlamouri (slow - plz ping), 2015/10/07 14:19:31]

Can you fwd declare WebMediaSession? (Not sure what would happen with
PassOwnPtr)

[davve, 2015/10/08 09:17:35]

As you suspected, PassOwnPtr seems to not like that:

../../third_party/WebKit/Source/wtf/OwnPtrCommon.h:51:29: error: invalid
application of 'sizeof' to incomplete type 'blink::WebMediaSession'
         static_assert(sizeof(T) > 0, "type must be complete");
                             ^
../../third_party/WebKit/Source/wtf/OwnPtrCommon.h:52:9: error: possible problem
detected in invocation of delete operator: [-Werror=delete-incomplete]
         delete ptr;
         ^
../../third_party/WebKit/Source/wtf/OwnPtrCommon.h:48:30: error: 'ptr' has
incomplete type [-Werror]
     static void deletePtr(T* ptr)
                              ^
In file included from
../../third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.h:10:0,
                 from
../../third_party/WebKit/Source/modules/mediasession/HTMLMediaElementMediaSession.cpp:6:
../../third_party/WebKit/Source/modules/mediasession/MediaSession.h:17:7: error:
forward declaration of 'class blink::WebMediaSession' [-Werror]
 class WebMediaSession;
       ^

+#include "wtf/OwnPtr.h"
 
 namespace blink {
 
-class MediaSession : public GarbageCollected<MediaSession>, public ScriptWrappable {
+class ScriptState;
+class WebMediaSession;
+
+class MODULES_EXPORT MediaSession
+    : public GarbageCollectedFinalized<MediaSession>
+    , public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
-    static MediaSession* create();
+    static MediaSession* create(ExecutionContext*);
+    static MediaSession* createForTesting(PassOwnPtr<WebMediaSession>);

[mlamouri (slow - plz ping), 2015/10/07 14:19:31]

nit: I would prefer to have the test marked as a friend in order to be able to
call the private ctor instead of adding a "createForTesting" method but it might
be a matter of test so I will leave it up to you.

[davve, 2015/10/08 09:17:35]

That would require one to add a FRIEND_TEST_ALL_PREFIXES invocation to the
header for each test one adds? I don't have a strong feeling about it, but it
feels a bit cumbersome.

[philipj_slow, 2015/10/08 09:34:57]

FWIW, there's quite a few fooForTesting in Blink, so at least this wouldn't be
some outlier hack.

[mlamouri (slow - plz ping), 2015/10/09 13:01:28]

I replied in the new patchset. There is no need to use FRIEND_TEST_ALL_PREFIXES
and even if there are some fooForTest, having code specific for tests isn't a
great idea in general. I would prefer to allow test classes to access private
method as long as we can.

 
-    void activate();
-    void deactivate();
+    ScriptPromise activate(ScriptState*);
+    ScriptPromise deactivate(ScriptState*);
 
     DEFINE_INLINE_TRACE() { }
 
 private:
-    MediaSession() = default;
+    explicit MediaSession(PassOwnPtr<WebMediaSession>);
+
+    OwnPtr<WebMediaSession> m_webMediaSession;
 };
 
 } // namespace blink