Unreviewed, rolling out r121813.

http://trac.webkit.org/changeset/121813
https://bugs.webkit.org/show_bug.cgi?id=90522

Causes browser_tests failure:
ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-07-04

Source/WebCore:

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::commitData):
(WebCore::DocumentLoader::setupForReplaceByMIMEType):
* testing/js/WebCoreTestSupport.cpp:
(WebCoreTestSupport::resetInternalsObject):

LayoutTests:

* http/tests/multipart/multipart-replace-non-html-content-expected.txt: Removed.
* http/tests/multipart/multipart-replace-non-html-content.php: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121836 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0a7053d..8e6deff 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r121813.
+        http://trac.webkit.org/changeset/121813
+        https://bugs.webkit.org/show_bug.cgi?id=90522
+
+        Causes browser_tests failure:
+        ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
+        Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).
+
+        * http/tests/multipart/multipart-replace-non-html-content-expected.txt: Removed.
+        * http/tests/multipart/multipart-replace-non-html-content.php: Removed.
+
 2012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
 
         [EFL] Change format of return value of navigator.language

diff --git a/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt b/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt
deleted file mode 100644 (file)
index 746bac8..0000000
--- a/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This text should only appear once 10                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
-
-

diff --git a/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php b/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php
deleted file mode 100644 (file)
index 3890cb8..0000000
--- a/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-header('Content-type: multipart/x-mixed-replace; boundary=boundary');
-header('Connection: keep-alive');
-echo "--boundary\r\n";
-echo "Content-Type: text/html\r\n\r\n";
-echo str_pad('', 5000);
-?>
-
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-</script>
-
-<?php
-for ($i = 0; $i <= 10; $i++) {
-    echo "--boundary\r\n";
-    echo "Content-Type: text/plain\r\n\r\n";
-    echo "This text should only appear once ";
-    echo $i;
-    echo str_pad('', 5000);
-    echo "\r\n\r\n";
-    flush();
-    usleep(100000);
-    $i++;
-}
-?>

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 3c0b573..23f8795 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2012-07-04  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r121813.
+        http://trac.webkit.org/changeset/121813
+        https://bugs.webkit.org/show_bug.cgi?id=90522
+
+        Causes browser_tests failure:
+        ErrorPageTest.DNSError_GoBack2{Forward2,AndForward} on
+        Chromium {Linux,Mac,Win} (Requested by yosin on #webkit).
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::commitData):
+        (WebCore::DocumentLoader::setupForReplaceByMIMEType):
+        * testing/js/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::resetInternalsObject):
+
 2012-07-04  Kihong Kwon  <kihong.kwon@samsung.com>
 
         [EFL] Change format of return value of navigator.language

diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp
index bf6cb9e..302a7ad 100644 (file)
--- a/Source/WebCore/loader/DocumentLoader.cpp
+++ b/Source/WebCore/loader/DocumentLoader.cpp
@@ -335,8 +335,7 @@ void DocumentLoader::commitData(const char* bytes, size_t length)
             m_frame->document()->setBaseURLOverride(m_archive->mainResource()->url());
 #endif
 
-        if (!frameLoader()->isReplacing())
-            frameLoader()->receivedFirstData();
+        frameLoader()->receivedFirstData();
 
         bool userChosen = true;
         String encoding = overrideEncoding();
@@ -367,7 +366,7 @@ void DocumentLoader::receivedData(const char* data, int length)
 
 void DocumentLoader::setupForReplaceByMIMEType(const String& newMIMEType)
 {
-    if (!mainResourceData())
+    if (!m_gotFirstByte)
         return;
     
     String oldMIMEType = m_response.mimeType();

diff --git a/Source/WebCore/testing/js/WebCoreTestSupport.cpp b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
index cfb9387..f36e4a0 100644 (file)
--- a/Source/WebCore/testing/js/WebCoreTestSupport.cpp
+++ b/Source/WebCore/testing/js/WebCoreTestSupport.cpp
@@ -52,10 +52,8 @@ void resetInternalsObject(JSContextRef context)
     ExecState* exec = toJS(context);
     JSLockHolder lock(exec);
     JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
-    JSValue internalsJS = globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId));
-    if (internalsJS.isNull() || internalsJS.isEmpty())
-        return;
-    if (Internals* internals = toInternals(internalsJS)) {
+    Internals * internals = toInternals(globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId)));
+    if (internals) {
         ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
         if (scriptContext->isDocument())
             internals->reset(static_cast<Document*>(scriptContext));