Changeset 76173 in webkit

Timestamp:

Jan 19, 2011 3:23:15 PM (13 years ago)

Author:

ddkilzer@apple.com

Message:

<​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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (2 diffs)
• loader/FrameLoader.h (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -100 +100 @@
 #include <wtf/text/StringConcatenate.h>
 
-#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-#include "HTMLMediaElement.h"
-#endif
-
 #if ENABLE(SHARED_WORKERS)
 #include "SharedWorkerRepository.h"
@@ -989 +985 @@
     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

trunk/Source/WebCore/loader/FrameLoader.h

@@ -305 +305 @@
     void open(CachedFrameBase&);
 
+#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
+    void hideMediaPlayerProxyPlugin(Widget*);
+    void showMediaPlayerProxyPlugin(Widget*);
+#endif
+
     // FIXME: Should these really be public?
     void completed();

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -185 +185 @@
     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)