[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c885c0af415f284d548710db7265eebe837f1a98
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 06:27:06 2010 +0000

    REGRESSION(24929): PDF page doesn't load in background tab
    
    Reviewed by Dan Bernstein.
    
    * plugins/PluginView.cpp:
    (WebCore::PluginView::startOrAddToUnstartedList):
    Only delay loading of the plug-in if we'll kick off our own load of the
    plug-in data later, in start().
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54642 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d976ca7..43be8fa 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-10  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        REGRESSION(24929): PDF page doesn't load in background tab
+
+        Reviewed by Dan Bernstein.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::startOrAddToUnstartedList):
+        Only delay loading of the plug-in if we'll kick off our own load of the
+        plug-in data later, in start().
+
 2010-02-10  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 9e1d454..2640df0 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -201,7 +201,10 @@ bool PluginView::startOrAddToUnstartedList()
     if (!m_parentFrame->page())
         return false;
 
-    if (!m_parentFrame->page()->canStartPlugins()) {
+    // We only delay starting the plug-in if we're going to kick off the load
+    // ourselves. Otherwise, the loader will try to deliver data before we've
+    // started the plug-in.
+    if (!m_loadManually && !m_parentFrame->page()->canStartPlugins()) {
         m_parentFrame->page()->addUnstartedPlugin(this);
         m_isWaitingToStart = true;
         return true;

-- 
WebKit Debian packaging