Diff
Modified: trunk/Source/WebCore/ChangeLog (141381 => 141382)
--- trunk/Source/WebCore/ChangeLog 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebCore/ChangeLog 2013-01-31 08:05:11 UTC (rev 141382)
@@ -1,3 +1,24 @@
+2013-01-31 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move MediaPlayerPrivateChromium to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=108415
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series; see tracking bug 106829.
+
+ * WebCore.gypi:
+ * platform/graphics/chromium/MediaPlayerPrivateChromium.cpp: Added.
+ (WebCore):
+ (WebCore::MediaPlayerPrivate::registerMediaEngine): call
+ registerMediaEngine through static function pointer that was set
+ during WebKit initializeWithoutV8
+ (WebCore::MediaPlayerPrivate::setMediaEngineRegisterSelfFunction):
+ new setter function that takes a function pointer that is used by registerMediaEngine
+ * platform/graphics/chromium/MediaPlayerPrivateChromium.h:
+ (WebCore):
+ (MediaPlayerPrivate):
+
2013-01-30 Patrick Gansterer <[email protected]>
Port DragImageWin.cpp to WinCE
Modified: trunk/Source/WebCore/WebCore.gypi (141381 => 141382)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-31 08:05:11 UTC (rev 141382)
@@ -3895,6 +3895,7 @@
'platform/graphics/chromium/ImageFrameGenerator.h',
'platform/graphics/chromium/LazyDecodingPixelRef.cpp',
'platform/graphics/chromium/LazyDecodingPixelRef.h',
+ 'platform/graphics/chromium/MediaPlayerPrivateChromium.cpp',
'platform/graphics/chromium/MediaPlayerPrivateChromium.h',
'platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.cpp',
'platform/graphics/chromium/OpaqueRectTrackingContentLayerDelegate.h',
Copied: trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.cpp (from rev 141381, trunk/Source/WebKit/chromium/src/MediaPlayerPrivateChromium.cpp) (0 => 141382)
--- trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.cpp 2013-01-31 08:05:11 UTC (rev 141382)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2009 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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 THE COPYRIGHT
+ * OWNER 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"
+#include "MediaPlayerPrivateChromium.h"
+
+#if ENABLE(VIDEO)
+
+namespace WebCore {
+
+static MediaEngineRegisterSelf* s_registerSelfFunction = 0;
+
+void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
+{
+ ASSERT(s_registerSelfFunction);
+ s_registerSelfFunction(registrar);
+}
+
+void MediaPlayerPrivate::setMediaEngineRegisterSelfFunction(MediaEngineRegisterSelf* registerSelfFunction)
+{
+ s_registerSelfFunction = registerSelfFunction;
+}
+
+} // namespace WebCore
+
+#endif
Modified: trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h (141381 => 141382)
--- trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebCore/platform/graphics/chromium/MediaPlayerPrivateChromium.h 2013-01-31 08:05:11 UTC (rev 141382)
@@ -37,13 +37,16 @@
namespace WebCore {
+typedef void MediaEngineRegisterSelf(MediaEngineRegistrar);
+
class MediaPlayerPrivate {
public:
static void registerMediaEngine(MediaEngineRegistrar);
+ static void setMediaEngineRegisterSelfFunction(MediaEngineRegisterSelf*);
};
} // namespace WebCore
-#endif
+#endif // ENABLE(VIDEO)
#endif // MediaPlayerPrivateChromium_h
Modified: trunk/Source/WebKit/chromium/ChangeLog (141381 => 141382)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-31 08:05:11 UTC (rev 141382)
@@ -1,3 +1,18 @@
+2013-01-31 Mark Pilgrim <[email protected]>
+
+ [Chromium] Move MediaPlayerPrivateChromium to WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=108415
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series; see tracking bug 106829.
+
+ * WebKit.gyp:
+ * src/MediaPlayerPrivateChromium.cpp: Removed.
+ * src/WebKit.cpp:
+ (WebKit::initializeWithoutV8): call new setter function in
+ WebCore::MediaPlayerPrivate
+
2013-01-30 Sheriff Bot <[email protected]>
Unreviewed, rolling out r141358.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (141381 => 141382)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-31 08:05:11 UTC (rev 141382)
@@ -400,7 +400,6 @@
'src/mac/WebSubstringUtil.mm',
'src/LocalFileSystemChromium.cpp',
'src/LocalizedStrings.cpp',
- 'src/MediaPlayerPrivateChromium.cpp',
'src/NotificationPresenterImpl.h',
'src/NotificationPresenterImpl.cpp',
'src/painting/ContinuousPainter.h',
Deleted: trunk/Source/WebKit/chromium/src/MediaPlayerPrivateChromium.cpp (141381 => 141382)
--- trunk/Source/WebKit/chromium/src/MediaPlayerPrivateChromium.cpp 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebKit/chromium/src/MediaPlayerPrivateChromium.cpp 2013-01-31 08:05:11 UTC (rev 141382)
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2009 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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"
-#include "MediaPlayerPrivateChromium.h"
-
-#if ENABLE(VIDEO)
-
-#include "WebMediaPlayerClientImpl.h"
-
-namespace WebCore {
-
-void MediaPlayerPrivate::registerMediaEngine(MediaEngineRegistrar registrar)
-{
- WebKit::WebMediaPlayerClientImpl::registerSelf(registrar);
-}
-
-} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebKit/chromium/src/WebKit.cpp (141381 => 141382)
--- trunk/Source/WebKit/chromium/src/WebKit.cpp 2013-01-31 08:00:54 UTC (rev 141381)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp 2013-01-31 08:05:11 UTC (rev 141382)
@@ -41,7 +41,6 @@
#include "TextEncoding.h"
#include "V8Binding.h"
#include "V8RecursionScope.h"
-#include "WebMediaPlayerClientImpl.h"
#include "WebSocket.h"
#include "platform/WebKitPlatformSupport.h"
#include "v8.h"
@@ -54,6 +53,11 @@
#include <wtf/UnusedParam.h>
#include <wtf/text/AtomicString.h>
+#if ENABLE(VIDEO)
+#include "MediaPlayerPrivateChromium.h"
+#include "WebMediaPlayerClientImpl.h"
+#endif
+
#if OS(DARWIN)
#include "WebSystemInterface.h"
#endif
@@ -143,6 +147,10 @@
// the initialization thread-safe, but given that so many code paths use
// this, initializing this lazily probably doesn't buy us much.
WebCore::UTF8Encoding();
+
+#if ENABLE(VIDEO)
+ WebCore::MediaPlayerPrivate::setMediaEngineRegisterSelfFunction(WebKit::WebMediaPlayerClientImpl::registerSelf);
+#endif
}
