[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ddkilzer at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 2d5a389af9aac7d5007b4063608681c13f413184
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 23:23:15 2011 +0000

    <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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 06cda89..a94130f 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-19  David D. Kilzer  <ddkilzer at 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 at chromium.org>
 
         Reviewed by Mihai Parparita.
diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
index 3caad8d..1b9346f 100644
--- a/Source/WebCore/loader/FrameLoader.cpp
+++ b/Source/WebCore/loader/FrameLoader.cpp
@@ -99,10 +99,6 @@
 #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;
diff --git a/Source/WebCore/loader/FrameLoader.h b/Source/WebCore/loader/FrameLoader.h
index 11e99dc..7ff5dbd 100644
--- a/Source/WebCore/loader/FrameLoader.h
+++ b/Source/WebCore/loader/FrameLoader.h
@@ -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
diff --git a/Source/WebCore/loader/SubframeLoader.cpp b/Source/WebCore/loader/SubframeLoader.cpp
index eba3173..ae8ce98 100644
--- a/Source/WebCore/loader/SubframeLoader.cpp
+++ b/Source/WebCore/loader/SubframeLoader.cpp
@@ -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)

-- 
WebKit Debian packaging