Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (112204 => 112205)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-27 04:41:38 UTC (rev 112205)
@@ -1,3 +1,16 @@
+2012-03-26 Andrew Scherkus <[email protected]>
+
+ [chromium] Remove WebMediaElement from Chromium WebKit API.
+ https://bugs.webkit.org/show_bug.cgi?id=82277
+
+ Reviewed by James Robinson.
+
+ This was added in r63859 but is no longer used by anyone.
+
+ * WebKit.gyp:
+ * public/WebMediaElement.h: Removed.
+ * src/WebMediaElement.cpp: Removed.
+
2012-03-26 Scott Byer <[email protected]>
Enable layout testing of the scroll animator.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (112204 => 112205)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-27 04:41:38 UTC (rev 112205)
@@ -199,7 +199,6 @@
'public/WebIntentServiceInfo.h',
'public/WebKit.h',
'public/WebLabelElement.h',
- 'public/WebMediaElement.h',
'public/WebMediaHints.h',
'public/WebMediaPlayer.h',
'public/WebMediaPlayerAction.h',
@@ -608,7 +607,6 @@
'src/WebLayerTreeView.cpp',
'src/WebLayerTreeViewImpl.cpp',
'src/WebLayerTreeViewImpl.h',
- 'src/WebMediaElement.cpp',
'src/WebMediaHints.cpp',
'src/WebMediaPlayerClientImpl.cpp',
'src/WebMediaPlayerClientImpl.h',
Deleted: trunk/Source/WebKit/chromium/public/WebMediaElement.h (112204 => 112205)
--- trunk/Source/WebKit/chromium/public/WebMediaElement.h 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/public/WebMediaElement.h 2012-03-27 04:41:38 UTC (rev 112205)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010 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.
- */
-
-#ifndef WebMediaElement_h
-#define WebMediaElement_h
-
-#include "WebElement.h"
-
-#if WEBKIT_IMPLEMENTATION
-namespace WebCore { class HTMLMediaElement; }
-#endif
-
-namespace WebKit {
-
-class WebMediaPlayer;
-
-class WebMediaElement : public WebElement {
-public:
- WEBKIT_EXPORT WebMediaPlayer* player() const;
-
-#if WEBKIT_IMPLEMENTATION
- WebMediaElement(const WTF::PassRefPtr<WebCore::HTMLMediaElement>&);
- WebMediaElement& operator=(const WTF::PassRefPtr<WebCore::HTMLMediaElement>&);
- operator WTF::PassRefPtr<WebCore::HTMLMediaElement>() const;
-#endif
-};
-} // namespace WebKit
-
-#endif // WebMediaElement_h
Deleted: trunk/Source/WebKit/chromium/src/WebMediaElement.cpp (112204 => 112205)
--- trunk/Source/WebKit/chromium/src/WebMediaElement.cpp 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/src/WebMediaElement.cpp 2012-03-27 04:41:38 UTC (rev 112205)
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010 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 "WebMediaElement.h"
-
-#include "HTMLMediaElement.h"
-#include "MediaPlayer.h"
-#include "WebMediaPlayer.h"
-#include "WebMediaPlayerClientImpl.h"
-#include <wtf/PassRefPtr.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebMediaPlayer* WebMediaElement::player() const
-{
- return WebMediaPlayerClientImpl::fromMediaElement(this)->mediaPlayer();
-}
-
-WebMediaElement::WebMediaElement(const PassRefPtr<HTMLMediaElement>& elem)
- : WebElement(elem)
-{
-}
-
-WebMediaElement& WebMediaElement::operator=(const PassRefPtr<HTMLMediaElement>& elem)
-{
- m_private = elem;
- return *this;
-}
-
-WebMediaElement::operator PassRefPtr<HTMLMediaElement>() const
-{
- return static_cast<HTMLMediaElement*>(m_private.get());
-}
-} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (112204 => 112205)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-03-27 04:41:38 UTC (rev 112205)
@@ -25,7 +25,6 @@
#include "WebFrameClient.h"
#include "WebFrameImpl.h"
#include "WebKit.h"
-#include "WebMediaElement.h"
#include "WebMediaPlayer.h"
#include "WebViewImpl.h"
#include "cc/CCProxy.h"
@@ -87,12 +86,6 @@
}
}
-WebMediaPlayerClientImpl* WebMediaPlayerClientImpl::fromMediaElement(const WebMediaElement* element)
-{
- PlatformMedia pm = element->constUnwrap<HTMLMediaElement>()->platformMedia();
- return static_cast<WebMediaPlayerClientImpl*>(pm.media.chromiumMediaPlayer);
-}
-
WebMediaPlayer* WebMediaPlayerClientImpl::mediaPlayer() const
{
return m_webMediaPlayer.get();
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (112204 => 112205)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-03-27 04:25:16 UTC (rev 112204)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2012-03-27 04:41:38 UTC (rev 112205)
@@ -49,7 +49,6 @@
namespace WebKit {
class WebAudioSourceProvider;
-class WebMediaElement;
class WebMediaPlayer;
// This class serves as a bridge between WebCore::MediaPlayer and
@@ -66,8 +65,6 @@
static void setIsEnabled(bool);
static void registerSelf(WebCore::MediaEngineRegistrar);
- static WebMediaPlayerClientImpl* fromMediaElement(const WebMediaElement* element);
-
// Returns the encapsulated WebKit::WebMediaPlayer.
WebMediaPlayer* mediaPlayer() const;
