- Revision
- 117804
- Author
- commit-qu...@webkit.org
- Date
- 2012-05-21 11:50:36 -0700 (Mon, 21 May 2012)
Log Message
[GTK] DRT support for layoutTestController.setSerializeHTTPLoads
https://bugs.webkit.org/show_bug.cgi?id=86653
Patch by Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com> on 2012-05-21
Reviewed by Gustavo Noronha Silva.
Source/WebKit/gtk:
Add support for setSerializeHTTPLoads in DumpRenderTreeSupportGtk
to allow testing resource load order.
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::setSerializeHTTPLoads):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):
Tools:
Add missing implementation setSerializeHTTPLoads to allow
testing resource load order.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::setSerializeHTTPLoads):
LayoutTests:
Unskip test cases which rely on LayoutTestController's setSerializeHTTPLoads
implementation.
* platform/gtk/fast/loader/file-protocol-fragment-expected.txt: Removed. The current
result matches the base expectation, so removed the platform-specific results.
* platform/gtk/test_expectations.txt:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (117803 => 117804)
--- trunk/LayoutTests/ChangeLog 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/LayoutTests/ChangeLog 2012-05-21 18:50:36 UTC (rev 117804)
@@ -1,3 +1,17 @@
+2012-05-21 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
+
+ [GTK] DRT support for layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86653
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Unskip test cases which rely on LayoutTestController's setSerializeHTTPLoads
+ implementation.
+
+ * platform/gtk/fast/loader/file-protocol-fragment-expected.txt: Removed. The current
+ result matches the base expectation, so removed the platform-specific results.
+ * platform/gtk/test_expectations.txt:
+
2012-05-21 Brady Eidson <beid...@apple.com>
Checking in correct test results for https://bugs.webkit.org/show_bug.cgi?id=86119
Deleted: trunk/LayoutTests/platform/gtk/fast/loader/file-protocol-fragment-expected.txt (117803 => 117804)
--- trunk/LayoutTests/platform/gtk/fast/loader/file-protocol-fragment-expected.txt 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/LayoutTests/platform/gtk/fast/loader/file-protocol-fragment-expected.txt 2012-05-21 18:50:36 UTC (rev 117804)
@@ -1,8 +0,0 @@
-resources/stylesheet.css - willSendRequest <NSURLRequest URL resources/stylesheet.css, main document URL file-protocol-fragment.html, http method GET> redirectResponse (null)
-resources/stylesheet.css - willSendRequest <NSURLRequest URL resources/stylesheet.css, main document URL file-protocol-fragment.html, http method GET> redirectResponse (null)
-<unknown> - didFinishLoading
-resources/stylesheet.css - didReceiveResponse <NSURLResponse resources/stylesheet.css, http status code 0>
-resources/stylesheet.css - didReceiveResponse <NSURLResponse resources/stylesheet.css, http status code 0>
-resources/stylesheet.css - didFinishLoading
-resources/stylesheet.css - didFinishLoading
-This tests that file: URL are loaded separately even if they differ by the fragment only.
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (117803 => 117804)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-21 18:50:36 UTC (rev 117804)
@@ -1053,11 +1053,7 @@
BUGWK50740 : editing/spelling/spellcheck-sequencenum.html = FAIL
BUGWK50740 : editing/spelling/spellcheck-async-mutation.html = FAIL
-// These require DRT setSerializeHTTPLoads implementation to be reliable.
-BUGWK50758 : http/tests/local/link-stylesheet-load-order.html = FAIL
-BUGWK50758 : http/tests/local/link-stylesheet-load-order-preload.html = FAIL
-BUGWK50758 : fast/preloader/document-write.html = FAIL
-BUGWK50758 : fast/preloader/document-write-2.html = FAIL
+BUGWK82675 : http/tests/local/link-stylesheet-load-order.html = FAIL
// Passing just a username or just a password to
// layoutTestController.queueLoad() does not work
Modified: trunk/Source/WebKit/gtk/ChangeLog (117803 => 117804)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-05-21 18:50:36 UTC (rev 117804)
@@ -1,3 +1,18 @@
+2012-05-21 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
+
+ [GTK] DRT support for layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86653
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add support for setSerializeHTTPLoads in DumpRenderTreeSupportGtk
+ to allow testing resource load order.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setSerializeHTTPLoads):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+
2012-05-18 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r117628.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (117803 => 117804)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-05-21 18:50:36 UTC (rev 117804)
@@ -56,6 +56,7 @@
#include "RenderListItem.h"
#include "RenderTreeAsText.h"
#include "RenderView.h"
+#include "ResourceLoadScheduler.h"
#include "SchemeRegistry.h"
#include "SecurityOrigin.h"
#include "SecurityPolicy.h"
@@ -885,3 +886,8 @@
{
SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String::fromUTF8(urlScheme));
}
+
+void DumpRenderTreeSupportGtk::setSerializeHTTPLoads(bool enabled)
+{
+ resourceLoadScheduler()->setSerialLoadingEnabled(enabled);
+}
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (117803 => 117804)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-05-21 18:50:36 UTC (rev 117804)
@@ -127,6 +127,7 @@
static void deliverAllMutationsIfNecessary();
static void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const char* urlScheme);
+ static void setSerializeHTTPLoads(bool enabled);
private:
static bool s_drtRun;
Modified: trunk/Tools/ChangeLog (117803 => 117804)
--- trunk/Tools/ChangeLog 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Tools/ChangeLog 2012-05-21 18:50:36 UTC (rev 117804)
@@ -1,3 +1,18 @@
+2012-05-21 Sudarsana Nagineni <sudarsana.nagin...@linux.intel.com>
+
+ [GTK] DRT support for layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86653
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add missing implementation setSerializeHTTPLoads to allow
+ testing resource load order.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::setSerializeHTTPLoads):
+
2012-05-21 Elliot Poger <epo...@chromium.org>
add skia_test_expectations override file to chromium NRWT
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (117803 => 117804)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-05-21 18:50:36 UTC (rev 117804)
@@ -450,6 +450,7 @@
DumpRenderTreeSupportGtk::setSelectTrailingWhitespaceEnabled(false);
DumpRenderTreeSupportGtk::setSmartInsertDeleteEnabled(webView, true);
DumpRenderTreeSupportGtk::setDefersLoading(webView, false);
+ DumpRenderTreeSupportGtk::setSerializeHTTPLoads(false);
if (axController)
axController->resetToConsistentState();
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (117803 => 117804)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-05-21 18:42:59 UTC (rev 117803)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-05-21 18:50:36 UTC (rev 117804)
@@ -966,9 +966,9 @@
DumpRenderTreeSupportGtk::dumpConfigurationForViewport(webView, deviceDPI, deviceWidth, deviceHeight, availableWidth, availableHeight);
}
-void LayoutTestController::setSerializeHTTPLoads(bool)
+void LayoutTestController::setSerializeHTTPLoads(bool serialize)
{
- // FIXME: Implement if needed for https://bugs.webkit.org/show_bug.cgi?id=50758.
+ DumpRenderTreeSupportGtk::setSerializeHTTPLoads(serialize);
}
void LayoutTestController::setMinimumTimerInterval(double minimumTimerInterval)
