Diff
Modified: trunk/LayoutTests/ChangeLog (117560 => 117561)
--- trunk/LayoutTests/ChangeLog 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/LayoutTests/ChangeLog 2012-05-18 08:15:58 UTC (rev 117561)
@@ -1,3 +1,21 @@
+2012-05-18 Sudarsana Nagineni <[email protected]>
+
+ [EFL] DRT needs an implementation of layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86101
+
+ Reviewed by Ryosuke Niwa.
+
+ Unskip test cases which rely on LayoutTestController's setSerializeHTTPLoads
+ implementation and add EFL expectations for tests same as in mac port (MIME
+ type is "application/_javascript_" instead of "application/x-_javascript_").
+
+ * platform/efl/Skipped:
+ * platform/efl/fast/loader/file-protocol-fragment-expected.txt: Removed. The current
+ result matches the base expectation, so removed the platform-specific results.
+ * platform/efl/fast/preloader/document-write-2-expected.txt: Added.
+ * platform/efl/fast/preloader/document-write-expected.txt: Added.
+ * platform/efl/test_expectations.txt:
+
2012-05-18 Ryosuke Niwa <[email protected]>
Chromium Mac rebaseline after r117556.
Modified: trunk/LayoutTests/platform/efl/Skipped (117560 => 117561)
--- trunk/LayoutTests/platform/efl/Skipped 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-05-18 08:15:58 UTC (rev 117561)
@@ -342,12 +342,6 @@
# viewport meta tag tests that failed because window.devicePixelRatio is not implemented
fast/viewport/viewport-133.html
-# EFL's LayoutTestController does not implement setSerializeHTTPLoads
-fast/preloader/document-write-2.html
-fast/preloader/document-write.html
-http/tests/local/link-stylesheet-load-order-preload.html
-http/tests/local/link-stylesheet-load-order.html
-
# EFL's LayoutTestController does not implement setTextDirection
fast/html/set-text-direction.html
Deleted: trunk/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt (117560 => 117561)
--- trunk/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt 2012-05-18 08:15:58 UTC (rev 117561)
@@ -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.
Added: trunk/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt (0 => 117561)
--- trunk/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt 2012-05-18 08:15:58 UTC (rev 117561)
@@ -0,0 +1,6 @@
+document-write-plaintext.js has MIME type application/_javascript_
+script1.js has MIME type application/_javascript_
+
+This test requires DumpRenderTree to see the log of what resources are loaded.
+
+The first script document.writes a plaintext tag so the main parser will not load the subsequent resources. Preload scanner won't know this so it will still kick off the loads, allowing us to verify that preloading is working as expected.
Added: trunk/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt (0 => 117561)
--- trunk/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt 2012-05-18 08:15:58 UTC (rev 117561)
@@ -0,0 +1,6 @@
+document-write-plaintext.js has MIME type application/_javascript_
+script1.js has MIME type application/_javascript_
+
+This test requires DumpRenderTree to see the log of what resources are loaded.
+
+The first script document.writes a plaintext tag so the main parser will not load the subsequent resources. Preload scanner won't know this so it will still kick off the loads, allowing us to verify that preloading is working as expected.
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (117560 => 117561)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-05-18 08:15:58 UTC (rev 117561)
@@ -361,6 +361,8 @@
BUGWK85799 : fast/css/font-face-download-error.html = TIMEOUT
+BUGWK82675 : http/tests/local/link-stylesheet-load-order.html = TEXT
+
BUGWKEFL SLOW DEBUG : http/tests/incremental/slow-utf8-html.pl = PASS
// Perf tests are way too slow on debug builds.
Modified: trunk/Source/WebKit/efl/ChangeLog (117560 => 117561)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-18 08:15:58 UTC (rev 117561)
@@ -1,3 +1,17 @@
+2012-05-18 Sudarsana Nagineni <[email protected]>
+
+ [EFL] DRT needs an implementation of layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86101
+
+ Reviewed by Ryosuke Niwa.
+
+ Add missing implementation setSerializeHTTPLoads to EFL's
+ DumpRenderTreeSupport to allow testing resource load order.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::setSerializeHTTPLoads):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
2012-05-18 Christophe Dumez <[email protected]>
[EFL] appcache tests are flaky
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (117560 => 117561)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-18 08:15:58 UTC (rev 117561)
@@ -46,6 +46,7 @@
#include <PageGroup.h>
#include <PrintContext.h>
#include <RenderTreeAsText.h>
+#include <ResourceLoadScheduler.h>
#include <ScriptValue.h>
#include <Settings.h>
#include <TextIterator.h>
@@ -680,6 +681,11 @@
corePage->settings()->setAuthorAndUserStylesEnabled(enabled);
}
+void DumpRenderTreeSupportEfl::setSerializeHTTPLoads(bool enabled)
+{
+ WebCore::resourceLoadScheduler()->setSerialLoadingEnabled(enabled);
+}
+
void DumpRenderTreeSupportEfl::setComposition(Evas_Object* ewkView, const char* text, int start, int length)
{
WebCore::Page* page = EWKPrivate::corePage(ewkView);
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (117560 => 117561)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-18 08:15:58 UTC (rev 117561)
@@ -101,6 +101,7 @@
static void setInteractiveFormValidationEnabled(Evas_Object* ewkView, bool enabled);
static JSValueRef computedStyleIncludingVisitedInfo(JSContextRef, JSValueRef);
static void setAuthorAndUserStylesEnabled(Evas_Object* ewkView, bool);
+ static void setSerializeHTTPLoads(bool);
// TextInputController
static void setComposition(Evas_Object*, const char*, int, int);
Modified: trunk/Tools/ChangeLog (117560 => 117561)
--- trunk/Tools/ChangeLog 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Tools/ChangeLog 2012-05-18 08:15:58 UTC (rev 117561)
@@ -1,3 +1,18 @@
+2012-05-18 Sudarsana Nagineni <[email protected]>
+
+ [EFL] DRT needs an implementation of layoutTestController.setSerializeHTTPLoads
+ https://bugs.webkit.org/show_bug.cgi?id=86101
+
+ Reviewed by Ryosuke Niwa.
+
+ Add missing implementation setSerializeHTTPLoads to allow
+ testing resource load order.
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+ (LayoutTestController::setSerializeHTTPLoads):
+
2012-05-18 Jochen Eisinger <[email protected]>
[chromium] plumb the frame for which a drag was initiated to the WebViewClient
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (117560 => 117561)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-18 08:15:58 UTC (rev 117561)
@@ -271,6 +271,7 @@
DumpRenderTreeSupportEfl::setEditingBehavior(mainView(), defaultEditingBehavior());
DumpRenderTreeSupportEfl::setJavaScriptProfilingEnabled(mainView(), false);
DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(mainView(), false);
+ DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false);
}
static CString pathSuitableForTestResult(const char* uriString)
Modified: trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (117560 => 117561)
--- trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-05-18 08:12:03 UTC (rev 117560)
+++ trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-05-18 08:15:58 UTC (rev 117561)
@@ -788,10 +788,9 @@
WebCore::IntSize(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.
- notImplemented();
+ DumpRenderTreeSupportEfl::setSerializeHTTPLoads(serialize);
}
void LayoutTestController::setMinimumTimerInterval(double minimumTimerInterval)
