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

[bweinstein at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 21ed13f199cb6a3fe5a047bffda7084ccdf0d3da
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 18:08:33 2010 +0000

    Assertion failure in PluginStream::~PluginStream when running userscripts/user-script-plugin-document.html
    https://bugs.webkit.org/show_bug.cgi?id=48751
    <rdar://problem/8615536>
    
    Reviewed by Anders Carlsson.
    
    WebKit/win:
    
    Always call committedLoad in WebFrameLoaderClient::finishedLoading, even if we have a manual loader. We were
    running into a case where we were trying to load an empty plugin document, which uses a manual loader, and
    PluginStream::didFinishLoading was never being called. The stream was never being stopped, making us fire
    an assert in the PluginStream destructor.
    
    * WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebFrameLoaderClient::finishedLoading):
    
    LayoutTests:
    
    Unskip userscripts/user-script-plugin-document.html because it is passing now.
    
    * platform/win/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index abae5cb..cdbca00 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-05  Brian Weinstein  <bweinstein at apple.com>
 
+        Reviewed by Anders Carlsson.
+
+        Assertion failure in PluginStream::~PluginStream when running userscripts/user-script-plugin-document.html
+        https://bugs.webkit.org/show_bug.cgi?id=48751
+        <rdar://problem/8615536>
+        
+        Unskip userscripts/user-script-plugin-document.html because it is passing now.
+
+        * platform/win/Skipped:
+
+2010-11-05  Brian Weinstein  <bweinstein at apple.com>
+
         Reviewed by Eric Carlson.
 
         userscripts/user-script-*-document.html tests are flaky on Windows
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 7a784bb..6caf42b 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -347,9 +347,6 @@ transitions/change-values-during-transition.html
 # Sometimes times out http://webkit.org/b/48457
 fast/workers/storage/use-same-database-in-page-and-workers.html
 
-# Assertion failure in PluginStream::~PluginStream http://webkit.org/b/48751
-userscripts/user-script-plugin-document.html
-
 # Times out on apple-windows-3 http://webkit.org/b/48750
 fast/frames/sandboxed-iframe-storage.html
 
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 40e2b01..5582e11 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-05  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Assertion failure in PluginStream::~PluginStream when running userscripts/user-script-plugin-document.html
+        https://bugs.webkit.org/show_bug.cgi?id=48751
+        <rdar://problem/8615536>
+        
+        Always call committedLoad in WebFrameLoaderClient::finishedLoading, even if we have a manual loader. We were
+        running into a case where we were trying to load an empty plugin document, which uses a manual loader, and
+        PluginStream::didFinishLoading was never being called. The stream was never being stopped, making us fire
+        an assert in the PluginStream destructor.
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::finishedLoading):
+
 2010-11-05  Chris Marrin  <cmarrin at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index d5b35ac..24f97ca 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -520,10 +520,10 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* loader)
     // Telling the frame we received some data and passing 0 as the data is our
     // way to get work done that is normally done when the first bit of data is
     // received, even for the case of a document with no data (like about:blank)
-    if (!m_manualLoader) {
-        committedLoad(loader, 0, 0);
+    committedLoad(loader, 0, 0);
+
+    if (!m_manualLoader)
         return;
-    }
 
     m_manualLoader->didFinishLoading();
     m_manualLoader = 0;

-- 
WebKit Debian packaging