Changeset 121912 in webkit

Timestamp:

Jul 5, 2012 10:19:13 AM (12 years ago)

Author:

Nate Chapin

Message:

Source/WebCore: REGRESSION (r115654): Sometimes does not replace content for multipart/x-mixed-replace
​https://bugs.webkit.org/show_bug.cgi?id=88436

Reviewed by Brady Eidson.

Test: http/tests/multipart/multipart-replace-non-html-content.php

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::commitData): We should only send receivedFirstData() once per main resource load,

rather than multiple times in a multipart load.

(WebCore::DocumentLoader::setupForReplaceByMIMEType): m_gotFirstByte isn't set to true until data is

actually committed, and multipart data is often not committed until the part is finished. Check
whether the SharedBuffer is non-null instead.

• testing/js/WebCoreTestSupport.cpp:

(WebCoreTestSupport::resetInternalsObject): The JSInternals object my have already been cleared if the window shell

was cleared as part of creation of a new Document. Check it before using it.

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=88436.

Reviewed by Brady Eidson.

• http/tests/multipart/multipart-replace-non-html-content-expected.txt: Added.
• http/tests/multipart/multipart-replace-non-html-content.php: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt (added)
• LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/DocumentLoader.cpp (modified) (2 diffs)
• Source/WebCore/testing/js/WebCoreTestSupport.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-05  Nate Chapin  <japhet@chromium.org>
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=88436.
+
+        Reviewed by Brady Eidson.
+
+        * http/tests/multipart/multipart-replace-non-html-content-expected.txt: Added.
+        * http/tests/multipart/multipart-replace-non-html-content.php: Added.
+
 2012-07-05  Vincent Scheib  <scheib@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-05  Nate Chapin  <japhet@chromium.org>
+
+        REGRESSION (r115654): Sometimes does not replace content for multipart/x-mixed-replace
+        https://bugs.webkit.org/show_bug.cgi?id=88436
+
+        Reviewed by Brady Eidson.
+
+        Test: http/tests/multipart/multipart-replace-non-html-content.php
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::commitData): We should only send receivedFirstData() once per main resource load,
+            rather than multiple times in a multipart load. 
+        (WebCore::DocumentLoader::setupForReplaceByMIMEType): m_gotFirstByte isn't set to true until data is
+            actually committed, and multipart data is often not committed until the part is finished. Check
+            whether the SharedBuffer is non-null instead.
+        * testing/js/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::resetInternalsObject): The JSInternals object my have already been cleared if the window shell
+            was cleared as part of creation of a new Document. Check it before using it.
+
 2012-07-05  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -336 +336 @@
 #endif
 
-        frameLoader()->receivedFirstData();
+        if (!frameLoader()->isReplacing())
+            frameLoader()->receivedFirstData();
 
         bool userChosen = true;
@@ -367 +368 @@
 void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType)
 {
-    if (!m_gotFirstByte)
+    if (!mainResourceData())
         return;
     

trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

@@ -53 +53 @@
     JSLockHolder lock(exec);
     JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
-    Internals * internals = toInternals(globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId)));
-    if (internals) {
+    JSValue internalsJS = globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId));
+    if (internalsJS.isNull() || internalsJS.isEmpty())
+        return;
+    if (Internals* internals = toInternals(internalsJS)) {
         ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
         if (scriptContext->isDocument())