Changeset 70825 in webkit

Timestamp:

Oct 28, 2010 4:43:10 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

Part of <​https://bugs.webkit.org/show_bug.cgi?id=45980>
userscripts/user-script-*-document.html tests are flaky on Windows

Reviewed by Brady Eidson.

WebCore:

In WebFrameLoaderClient::committedLoad on Windows, we call through to PluginStream::didRecieveData
if our manual loader is a plugin stream, and we can call didRecieveData with a 0 length.

We shouldn't ASSERT that length is 0, because code paths exists where we call it with a 0 length.

This is tested by re-enabling user-script-plugin-document.html on Windows.

• plugins/PluginStream.cpp:

(WebCore::PluginStream::didReceiveData):

LayoutTests:

Unskip the user-script-plugin-document test because its issue is fixed.

• platform/win/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/PluginStream.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        Part of <https://bugs.webkit.org/show_bug.cgi?id=45980>
+        userscripts/user-script-*-document.html tests are flaky on Windows
+
+        Unskip the user-script-plugin-document test because its issue is fixed.
+
+        * platform/win/Skipped:
+
 2010-10-28  Mihai Parparita  <mihaip@chromium.org>
 

trunk/LayoutTests/platform/win/Skipped

@@ -989 +989 @@
 userscripts/user-script-video-document.html
 userscripts/user-script-audio-document.html
-userscripts/user-script-plugin-document.html
 
 # Directory upload is not enabled.

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-28  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        Part of <https://bugs.webkit.org/show_bug.cgi?id=45980>
+        userscripts/user-script-*-document.html tests are flaky on Windows
+
+        In WebFrameLoaderClient::committedLoad on Windows, we call through to PluginStream::didRecieveData
+        if our manual loader is a plugin stream, and we can call didRecieveData with a 0 length.
+        
+        We shouldn't ASSERT that length is 0, because code paths exists where we call it with a 0 length.
+        
+        This is tested by re-enabling user-script-plugin-document.html on Windows.
+
+        * plugins/PluginStream.cpp:
+        (WebCore::PluginStream::didReceiveData):
+
 2010-10-28  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebCore/plugins/PluginStream.cpp

@@ -414 +414 @@
 {
     ASSERT(loader == m_loader);
-    ASSERT(length > 0);
     ASSERT(m_streamState == StreamStarted);