<http://webkit.org/b/52687> Clean up FrameLoader methods for PLUGIN_PROXY_FOR_VIDEO
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Jan 2011 23:23:15 +0000 (23:23 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 19 Jan 2011 23:23:15 +0000 (23:23 +0000)
Reviewed by Eric Carlson.

* loader/FrameLoader.cpp: Declare the methods here.
(WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
(WebCore::FrameLoader::showMediaPlayerProxyPlugin):
* loader/FrameLoader.cpp: Moved methods to here...
(WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
(WebCore::FrameLoader::showMediaPlayerProxyPlugin):
* loader/SubframeLoader.cpp: ...from here.
(WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
(WebCore::FrameLoader::showMediaPlayerProxyPlugin):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/loader/FrameLoader.cpp
Source/WebCore/loader/FrameLoader.h
Source/WebCore/loader/SubframeLoader.cpp

index 06cda8958de6240cdc98247a7aa36ed83997d73b..a94130f8488b2576b8e4b3fa4373542ca4a2892d 100644 (file)
@@ -1,3 +1,19 @@
+2011-01-19  David D. Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/52687> Clean up FrameLoader methods for PLUGIN_PROXY_FOR_VIDEO
+
+        Reviewed by Eric Carlson.
+
+        * loader/FrameLoader.cpp: Declare the methods here.
+        (WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
+        (WebCore::FrameLoader::showMediaPlayerProxyPlugin):
+        * loader/FrameLoader.cpp: Moved methods to here...
+        (WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
+        (WebCore::FrameLoader::showMediaPlayerProxyPlugin):
+        * loader/SubframeLoader.cpp: ...from here.
+        (WebCore::FrameLoader::hideMediaPlayerProxyPlugin):
+        (WebCore::FrameLoader::showMediaPlayerProxyPlugin):
+
 2011-01-19  Tony Gentilcore  <tonyg@chromium.org>
 
         Reviewed by Mihai Parparita.
index 3caad8d4b01f9ed44e7e3e81e70955c44e0e3ba9..1b9346ffc36d43351281363a73f7005c2622ca3f 100644 (file)
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "SharedWorkerRepository.h"
 #endif
@@ -989,6 +985,18 @@ ObjectContentType FrameLoader::defaultObjectContentType(const KURL& url, const S
     return WebCore::ObjectContentNone;
 }
 
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+void FrameLoader::hideMediaPlayerProxyPlugin(Widget* widget)
+{
+    m_client->hideMediaPlayerProxyPlugin(widget);
+}
+
+void FrameLoader::showMediaPlayerProxyPlugin(Widget* widget)
+{
+    m_client->showMediaPlayerProxyPlugin(widget);
+}
+#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+
 String FrameLoader::outgoingReferrer() const
 {
     return m_outgoingReferrer;
index 11e99dc55d08be8703300339ca6fe818b713dba5..7ff5dbd0856a443b65e91dde56a81b292e67b79f 100644 (file)
@@ -304,6 +304,11 @@ public:
 
     void open(CachedFrameBase&);
 
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+    void hideMediaPlayerProxyPlugin(Widget*);
+    void showMediaPlayerProxyPlugin(Widget*);
+#endif
+
     // FIXME: Should these really be public?
     void completed();
     bool allAncestorsAreComplete() const; // including this
index eba3173c00d499378ccfea16db9148b1a55f791f..ae8ce98b002d270381330a6c5d4973e8a4fe9cb6 100644 (file)
@@ -184,17 +184,6 @@ PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(Node* node, const
 
     return widget ? widget.release() : 0;
 }
-
-void FrameLoader::hideMediaPlayerProxyPlugin(Widget* widget)
-{
-    m_client->hideMediaPlayerProxyPlugin(widget);
-}
-
-void FrameLoader::showMediaPlayerProxyPlugin(Widget* widget)
-{
-    m_client->showMediaPlayerProxyPlugin(widget);
-}
-
 #endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
 
 PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement* element, const HashMap<String, String>& args)