From 78459fb899b52ba156a4ce4f48f6d483625c8f3b Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 18 May 2012 08:15:58 +0000 Subject: [PATCH] [EFL] DRT needs an implementation of layoutTestController.setSerializeHTTPLoads https://bugs.webkit.org/show_bug.cgi?id=86101 Patch by Sudarsana Nagineni on 2012-05-18 Reviewed by Ryosuke Niwa. Source/WebKit/efl: Add missing implementation setSerializeHTTPLoads to EFL's DumpRenderTreeSupport to allow testing resource load order. * WebCoreSupport/DumpRenderTreeSupportEfl.cpp: (DumpRenderTreeSupportEfl::setSerializeHTTPLoads): * WebCoreSupport/DumpRenderTreeSupportEfl.h: Tools: Add missing implementation setSerializeHTTPLoads to allow testing resource load order. * DumpRenderTree/efl/DumpRenderTreeChrome.cpp: (DumpRenderTreeChrome::resetDefaultsToConsistentValues): * DumpRenderTree/efl/LayoutTestControllerEfl.cpp: (LayoutTestController::setSerializeHTTPLoads): LayoutTests: 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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117561 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 18 ++++++++++++++++++ LayoutTests/platform/efl/Skipped | 6 ------ .../fast/loader/file-protocol-fragment-expected.txt | 8 -------- .../efl/fast/preloader/document-write-2-expected.txt | 6 ++++++ .../efl/fast/preloader/document-write-expected.txt | 6 ++++++ LayoutTests/platform/efl/test_expectations.txt | 2 ++ Source/WebKit/efl/ChangeLog | 14 ++++++++++++++ .../efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp | 6 ++++++ .../efl/WebCoreSupport/DumpRenderTreeSupportEfl.h | 1 + Tools/ChangeLog | 15 +++++++++++++++ Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp | 1 + Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp | 5 ++--- 12 files changed, 71 insertions(+), 17 deletions(-) delete mode 100644 LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt create mode 100644 LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt create mode 100644 LayoutTests/platform/efl/fast/preloader/document-write-expected.txt diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 4f1c5a3..dcfd66c 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,21 @@ +2012-05-18 Sudarsana Nagineni + + [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 Chromium Mac rebaseline after r117556. diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped index 14343cb..9895bc9 100644 --- a/LayoutTests/platform/efl/Skipped +++ b/LayoutTests/platform/efl/Skipped @@ -342,12 +342,6 @@ fast/viewport/viewport-legacy-xhtmlmp.html # 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 diff --git a/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt b/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt deleted file mode 100644 index ce220b5..0000000 --- a/LayoutTests/platform/efl/fast/loader/file-protocol-fragment-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -resources/stylesheet.css - willSendRequest redirectResponse (null) -resources/stylesheet.css - willSendRequest redirectResponse (null) - - didFinishLoading -resources/stylesheet.css - didReceiveResponse -resources/stylesheet.css - didReceiveResponse -resources/stylesheet.css - didFinishLoading -resources/stylesheet.css - didFinishLoading -This tests that file: URL are loaded separately even if they differ by the fragment only. diff --git a/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt b/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt new file mode 100644 index 0000000..1db65e4 --- /dev/null +++ b/LayoutTests/platform/efl/fast/preloader/document-write-2-expected.txt @@ -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. diff --git a/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt b/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt new file mode 100644 index 0000000..1db65e4 --- /dev/null +++ b/LayoutTests/platform/efl/fast/preloader/document-write-expected.txt @@ -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. diff --git a/LayoutTests/platform/efl/test_expectations.txt b/LayoutTests/platform/efl/test_expectations.txt index 595c5bc..309a628 100644 --- a/LayoutTests/platform/efl/test_expectations.txt +++ b/LayoutTests/platform/efl/test_expectations.txt @@ -361,6 +361,8 @@ BUGWK85902 SLOW DEBUG : fast/overflow/lots-of-sibling-inline-boxes.html = PASS 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. diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog index 5d3599c..d9c5900 100644 --- a/Source/WebKit/efl/ChangeLog +++ b/Source/WebKit/efl/ChangeLog @@ -1,3 +1,17 @@ +2012-05-18 Sudarsana Nagineni + + [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 [EFL] appcache tests are flaky diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp index cdbd894..e4b5e53 100644 --- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp +++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -680,6 +681,11 @@ void DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(Evas_Object* ewkVie 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); diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h index 5bbae4b..e31fa0d 100644 --- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h +++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h @@ -101,6 +101,7 @@ public: 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); diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 2365516..e5f71d9 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-05-18 Sudarsana Nagineni + + [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 [chromium] plumb the frame for which a drag was initiated to the WebViewClient diff --git a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp index 4d458e4..7d2302d 100644 --- a/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp +++ b/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp @@ -271,6 +271,7 @@ void DumpRenderTreeChrome::resetDefaultsToConsistentValues() DumpRenderTreeSupportEfl::setEditingBehavior(mainView(), defaultEditingBehavior()); DumpRenderTreeSupportEfl::setJavaScriptProfilingEnabled(mainView(), false); DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(mainView(), false); + DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false); } static CString pathSuitableForTestResult(const char* uriString) diff --git a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp index 7953886..6c6073d 100644 --- a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp +++ b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp @@ -788,10 +788,9 @@ void LayoutTestController::dumpConfigurationForViewport(int deviceDPI, int devic 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) -- 2.7.4