Diff
Modified: trunk/LayoutTests/ChangeLog (116624 => 116625)
--- trunk/LayoutTests/ChangeLog 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/LayoutTests/ChangeLog 2012-05-10 10:56:00 UTC (rev 116625)
@@ -1,5 +1,16 @@
2012-05-10 Mikhail Pozdnyakov <[email protected]>
+ [EFL][DRT] Clear added user style sheets before a new testcase execution.
+ https://bugs.webkit.org/show_bug.cgi?id=84792
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Unskip userscripts/user-style-top-frame-only.html
+
+ * platform/efl/Skipped:
+
+2012-05-10 Mikhail Pozdnyakov <[email protected]>
+
[EFL][DRT] fast/events/js-keyboard-event-creation.html needs rebaselining
https://bugs.webkit.org/show_bug.cgi?id=85485
Modified: trunk/LayoutTests/platform/efl/Skipped (116624 => 116625)
--- trunk/LayoutTests/platform/efl/Skipped 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-05-10 10:56:00 UTC (rev 116625)
@@ -1336,7 +1336,6 @@
http/tests/websocket/tests/hixie76/url-no-trailing-slash.html
http/tests/websocket/tests/hixie76/url-with-credential.html
http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html
-userscripts/user-style-top-frame-only.html
userscripts/window-onerror-for-isolated-world-2.html
# Unexpected flakiness (tests timed out)
Modified: trunk/Source/WebKit/efl/ChangeLog (116624 => 116625)
--- trunk/Source/WebKit/efl/ChangeLog 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-05-10 10:56:00 UTC (rev 116625)
@@ -1,3 +1,16 @@
+2012-05-10 Mikhail Pozdnyakov <[email protected]>
+
+ [EFL][DRT] Clear added user style sheets before a new testcase execution.
+ https://bugs.webkit.org/show_bug.cgi?id=84792
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add a helper function for clearing of the added user style sheets.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::clearUserStyleSheets):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
2012-05-09 Gyuyoung Kim <[email protected]>
Move suspendAnimations to use Internals interface.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (116624 => 116625)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-05-10 10:56:00 UTC (rev 116625)
@@ -397,6 +397,15 @@
page->group().addUserStyleSheetToWorld(WebCore::mainThreadNormalWorld(), sourceCode, WebCore::KURL(), nullptr, nullptr, allFrames ? WebCore::InjectInAllFrames : WebCore::InjectInTopFrameOnly);
}
+void DumpRenderTreeSupportEfl::clearUserStyleSheets(const Evas_Object* ewkView)
+{
+ WebCore::Page* page = EWKPrivate::corePage(ewkView);
+ if (!page)
+ return;
+
+ page->group().removeUserStyleSheetsFromWorld(WebCore::mainThreadNormalWorld());
+}
+
void DumpRenderTreeSupportEfl::executeCoreCommandByName(const Evas_Object* ewkView, const char* name, const char* value)
{
WebCore::Page* page = EWKPrivate::corePage(ewkView);
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (116624 => 116625)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-05-10 10:56:00 UTC (rev 116625)
@@ -73,6 +73,7 @@
static void addUserScript(const Evas_Object* ewkView, const String& sourceCode, bool runAtStart, bool allFrames);
static void clearUserScripts(const Evas_Object* ewkView);
static void addUserStyleSheet(const Evas_Object* ewkView, const String& sourceCode, bool allFrames);
+ static void clearUserStyleSheets(const Evas_Object* ewkView);
static void executeCoreCommandByName(const Evas_Object* ewkView, const char* name, const char* value);
static bool findString(const Evas_Object* ewkView, const String& text, WebCore::FindOptions);
static bool isCommandEnabled(const Evas_Object* ewkView, const char* name);
Modified: trunk/Tools/ChangeLog (116624 => 116625)
--- trunk/Tools/ChangeLog 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/Tools/ChangeLog 2012-05-10 10:56:00 UTC (rev 116625)
@@ -1,3 +1,16 @@
+2012-05-10 Mikhail Pozdnyakov <[email protected]>
+
+ [EFL][DRT] Clear added user style sheets before a new testcase execution.
+ https://bugs.webkit.org/show_bug.cgi?id=84792
+
+ Reviewed Gustavo Noronha Silva.
+
+ The added user style sheets from the previous testcases are cleared in order to avoid
+ flaky results.
+
+ * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+ (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+
2012-05-09 Gyuyoung Kim <[email protected]>
Move suspendAnimations to use Internals interface.
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (116624 => 116625)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-10 10:06:14 UTC (rev 116624)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp 2012-05-10 10:56:00 UTC (rev 116625)
@@ -255,6 +255,7 @@
DumpRenderTreeSupportEfl::clearFrameName(mainFrame());
DumpRenderTreeSupportEfl::clearOpener(mainFrame());
DumpRenderTreeSupportEfl::clearUserScripts(mainView());
+ DumpRenderTreeSupportEfl::clearUserStyleSheets(mainView());
DumpRenderTreeSupportEfl::setInteractiveFormValidationEnabled(mainView(), true);
DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(mainView(), true);
DumpRenderTreeSupportEfl::setSmartInsertDeleteEnabled(mainView(), false);
