[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1cef322283b6a909275c9073f9ea5e7f01c0df58
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 00:40:30 2010 +0000

    2010-11-18  Darin Adler  <darin at apple.com>
    
            Reviewed by Kevin Decker.
    
            REGRESSION (WebKit2): Plug-ins and <video> start playing immediately in background tabs
            https://bugs.webkit.org/show_bug.cgi?id=49766
    
            Test: manual-tests/resources/video-tab.html
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::WebPage): Call setCanStartMedia(false) since the rest of the code
            starts out treating the page as "not in a window".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 34d25b0..0ea0307 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-18  Darin Adler  <darin at apple.com>
+
+        Reviewed by Kevin Decker.
+
+        REGRESSION (WebKit2): Plug-ins and <video> start playing immediately in background tabs
+        https://bugs.webkit.org/show_bug.cgi?id=49766
+
+        Test: manual-tests/resources/video-tab.html
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage): Call setCanStartMedia(false) since the rest of the code
+        starts out treating the page as "not in a window".
+
 2010-11-18  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index d9b6b3b..28e7051 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -27,9 +27,7 @@
 
 #include "Arguments.h"
 #include "DrawingArea.h"
-#if PLATFORM(QT)
 #include "HitTestResult.h"
-#endif
 #include "InjectedBundle.h"
 #include "InjectedBundleBackForwardList.h"
 #include "MessageID.h"
@@ -79,7 +77,7 @@
 #include <runtime/JSValue.h>
 
 #if ENABLE(PLUGIN_PROCESS)
-// FIXME: This is currently mac specific!
+// FIXME: This is currently Mac-specific!
 #include "MachPort.h"
 #endif
 
@@ -130,6 +128,14 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
     pageClients.backForwardClient = WebBackForwardListProxy::create(this);
     m_page = adoptPtr(new Page(pageClients));
 
+    // Windows and Qt do not yet call setIsInWindow. Until they do, just leave
+    // this line out so plug-ins and video will work. Eventually all platforms
+    // should call setIsInWindow and this comment and #if should be removed,
+    // leaving behind the setCanStartMedia call.
+#if !PLATFORM(WIN) && !PLATFORM(QT)
+    m_page->setCanStartMedia(false);
+#endif
+
     updatePreferences(parameters.store);
 
     m_page->setGroupName("WebKit2Group");
@@ -1009,6 +1015,7 @@ void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItemData& i
 }
 
 #if PLATFORM(MAC)
+
 void WebPage::addPluginView(PluginView* pluginView)
 {
     ASSERT(!m_pluginViews.contains(pluginView));

-- 
WebKit Debian packaging