Title: [121836] trunk
- Revision
- 121836
- Author
- [email protected]
- Date
- 2012-07-04 00:53:20 -0700 (Wed, 04 Jul 2012)
Log Message
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 <[email protected]> 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121835 => 121836)
--- trunk/LayoutTests/ChangeLog 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/LayoutTests/ChangeLog 2012-07-04 07:53:20 UTC (rev 121836)
@@ -1,3 +1,16 @@
+2012-07-04 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[EFL] Change format of return value of navigator.language
Deleted: trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt (121835 => 121836)
--- trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content-expected.txt 2012-07-04 07:53:20 UTC (rev 121836)
@@ -1,3 +0,0 @@
-This text should only appear once 10
-
-
Deleted: trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php (121835 => 121836)
--- trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/LayoutTests/http/tests/multipart/multipart-replace-non-html-content.php 2012-07-04 07:53:20 UTC (rev 121836)
@@ -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++;
-}
-?>
Modified: trunk/Source/WebCore/ChangeLog (121835 => 121836)
--- trunk/Source/WebCore/ChangeLog 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/Source/WebCore/ChangeLog 2012-07-04 07:53:20 UTC (rev 121836)
@@ -1,3 +1,19 @@
+2012-07-04 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[EFL] Change format of return value of navigator.language
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (121835 => 121836)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2012-07-04 07:53:20 UTC (rev 121836)
@@ -335,8 +335,7 @@
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::setupForReplaceByMIMEType(const String& newMIMEType)
{
- if (!mainResourceData())
+ if (!m_gotFirstByte)
return;
String oldMIMEType = m_response.mimeType();
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (121835 => 121836)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2012-07-04 07:33:41 UTC (rev 121835)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2012-07-04 07:53:20 UTC (rev 121836)
@@ -52,10 +52,8 @@
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));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
