Diff
Modified: trunk/LayoutTests/ChangeLog (130567 => 130568)
--- trunk/LayoutTests/ChangeLog 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/LayoutTests/ChangeLog 2012-10-05 23:42:42 UTC (rev 130568)
@@ -1,3 +1,14 @@
+2012-10-05 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=98524
+
+ Reviewed by Alexey Proskuryakov.
+
+ Unskip tests that are now passing.
+
+ * platform/wk2/TestExpectations:
+
2012-10-05 Sheriff Bot <[email protected]>
Unreviewed, rolling out r130556 and r130564.
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (130567 => 130568)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2012-10-05 23:42:42 UTC (rev 130568)
@@ -673,13 +673,6 @@
# requires video.buffered to be able to return multiple timeranges
http/tests/media/video-buffered.html
-# Tests that were added for https://bugs.webkit.org/show_bug.cgi?id=50758
-# These require DRT setSerializeHTTPLoads implementation for WebKit2 to be reliable.
-http/tests/local/link-stylesheet-load-order.html
-http/tests/local/link-stylesheet-load-order-preload.html
-fast/preloader/document-write.html
-fast/preloader/document-write-2.html
-
# WebKit2 needs Java support
dom/html/level2/html/HTMLAppletElement01.html
dom/html/level2/html/HTMLAppletElement02.html
Modified: trunk/Source/WebKit2/ChangeLog (130567 => 130568)
--- trunk/Source/WebKit2/ChangeLog 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-05 23:42:42 UTC (rev 130568)
@@ -1,3 +1,22 @@
+2012-10-05 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=98524
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add implementation for testRunner.setSerializeHTTPLoads in
+ WebKitTestRunner.
+
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetSerialLoadingEnabled):
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h:
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::setSerialLoadingEnabled):
+ (WebKit):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (InjectedBundle):
+
2012-10-05 Sheriff Bot <[email protected]>
Unreviewed, rolling out r130556 and r130564.
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (130567 => 130568)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2012-10-05 23:42:42 UTC (rev 130568)
@@ -323,3 +323,8 @@
{
toImpl(bundleRef)->setTabKeyCyclesThroughElements(toImpl(pageRef), enabled);
}
+
+void WKBundleSetSerialLoadingEnabled(WKBundleRef bundleRef, bool enabled)
+{
+ toImpl(bundleRef)->setSerialLoadingEnabled(enabled);
+}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (130567 => 130568)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2012-10-05 23:42:42 UTC (rev 130568)
@@ -113,6 +113,7 @@
WK_EXPORT size_t WKBundleGetWorkerThreadCount(WKBundleRef bundle);
WK_EXPORT void WKBundleSetTabKeyCyclesThroughElements(WKBundleRef bundle, WKBundlePageRef page, bool enabled);
+WK_EXPORT void WKBundleSetSerialLoadingEnabled(WKBundleRef bundle, bool enabled);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (130567 => 130568)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-10-05 23:42:42 UTC (rev 130568)
@@ -61,6 +61,7 @@
#include <WebCore/PageVisibilityState.h>
#include <WebCore/PrintContext.h>
#include <WebCore/ResourceHandle.h>
+#include <WebCore/ResourceLoadScheduler.h>
#include <WebCore/ScriptController.h>
#include <WebCore/SecurityOrigin.h>
#include <WebCore/SecurityPolicy.h>
@@ -646,4 +647,9 @@
page->corePage()->setTabKeyCyclesThroughElements(enabled);
}
+void InjectedBundle::setSerialLoadingEnabled(bool enabled)
+{
+ resourceLoadScheduler()->setSerialLoadingEnabled(enabled);
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (130567 => 130568)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-10-05 23:42:42 UTC (rev 130568)
@@ -179,6 +179,7 @@
static size_t workerThreadCount();
void setTabKeyCyclesThroughElements(WebPage*, bool enabled);
+ void setSerialLoadingEnabled(bool);
private:
explicit InjectedBundle(const String&);
Modified: trunk/Tools/ChangeLog (130567 => 130568)
--- trunk/Tools/ChangeLog 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Tools/ChangeLog 2012-10-05 23:42:42 UTC (rev 130568)
@@ -1,3 +1,22 @@
+2012-10-05 Sudarsana Nagineni <[email protected]>
+
+ [WK2][WTR] WebKitTestRunner needs testRunner.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=98524
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add implementation for testRunner.setSerializeHTTPLoads in
+ WebKitTestRunner.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::setSerializeHTTPLoads):
+ (WTR):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner):
+
2012-10-05 Richard Larocque <[email protected]>
TestResultsServer does not display sync_integration_tests results
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (130567 => 130568)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-10-05 23:42:42 UTC (rev 130568)
@@ -72,6 +72,7 @@
void setMinimumTimerInterval(in double interval); // Interval specified in seconds.
void setSpatialNavigationEnabled(in boolean value);
void setTabKeyCyclesThroughElements(in boolean enabled);
+ void setSerializeHTTPLoads();
// Special DOM functions.
void clearBackForwardList();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (130567 => 130568)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2012-10-05 23:42:42 UTC (rev 130568)
@@ -246,6 +246,7 @@
WKBundleSetPluginsEnabled(m_bundle, m_pageGroup, true);
WKBundleSetPopupBlockingEnabled(m_bundle, m_pageGroup, false);
WKBundleSetAlwaysAcceptCookies(m_bundle, false);
+ WKBundleSetSerialLoadingEnabled(m_bundle, false);
WKBundleRemoveAllUserContent(m_bundle, m_pageGroup);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (130567 => 130568)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-10-05 23:42:42 UTC (rev 130568)
@@ -749,6 +749,11 @@
WKBundleSetTabKeyCyclesThroughElements(InjectedBundle::shared().bundle(), InjectedBundle::shared().page()->page(), enabled);
}
+void TestRunner::setSerializeHTTPLoads()
+{
+ WKBundleSetSerialLoadingEnabled(InjectedBundle::shared().bundle(), true);
+}
+
void TestRunner::grantWebNotificationPermission(JSStringRef origin)
{
WKRetainPtr<WKStringRef> originWK = toWK(origin);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (130567 => 130568)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-10-05 23:28:42 UTC (rev 130567)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-10-05 23:42:42 UTC (rev 130568)
@@ -110,6 +110,7 @@
void setMinimumTimerInterval(double seconds); // Interval specified in seconds.
void setSpatialNavigationEnabled(bool);
void setTabKeyCyclesThroughElements(bool);
+ void setSerializeHTTPLoads();
// Special DOM functions.
JSValueRef computedStyleIncludingVisitedInfo(JSValueRef element);
