Changeset 113719 in webkit

Timestamp:

Apr 10, 2012 8:35:37 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] LayoutTestController needs implementation of addUserStyleSheet
​https://bugs.webkit.org/show_bug.cgi?id=82446

Source/WebKit/efl:

Add missing implementation addUserStyleSheet to EFL's
DumpRenderTreeSupport.

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-04-10
Reviewed by Antonio Gomes.

• WebCoreSupport/DumpRenderTreeSupportEfl.cpp:

(DumpRenderTreeSupportEfl::addUserStyleSheet):

• WebCoreSupport/DumpRenderTreeSupportEfl.h:

Tools:

Adding missing implementation addUserStyleSheet to EFL's LayoutTestController
so that we can unskip related tests from the skip list.

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-04-10
Reviewed by Antonio Gomes.

• DumpRenderTree/efl/LayoutTestControllerEfl.cpp:

(LayoutTestController::addUserStyleSheet): Implemented.

LayoutTests:

Unskipping the following test cases:
userscripts/mixed-case-stylesheet.html
userscripts/user-style-all-frames.html
userscripts/simple-stylesheet.html
userscripts/script-run-at-end.html

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-04-10
Reviewed by Antonio Gomes.

• platform/efl/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• Source/WebKit/efl/ChangeLog (modified) (1 diff)
• Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (modified) (2 diffs)
• Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-04-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [EFL] LayoutTestController needs implementation of addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=82446
+
+        Unskipping the following test cases:
+        userscripts/mixed-case-stylesheet.html 
+        userscripts/user-style-all-frames.html
+        userscripts/simple-stylesheet.html 
+        userscripts/script-run-at-end.html
+
+        Reviewed by Antonio Gomes.
+
+        * platform/efl/Skipped:
+
 2012-04-10  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -633 +633 @@
 
 # EFL's LayoutTestController does not implement addUserScript
-userscripts
-
-# EFL's LayoutTestController does not implement addUserStyleSheet
-#userscripts
-printing/page-rule-selection.html
+userscripts/document-element-available-at-start.html
+userscripts/script-not-run-for-fragments.html
+userscripts/script-run-at-start.html
+userscripts/user-script-all-frames.html
+userscripts/user-script-audio-document.html
+userscripts/user-script-image-document.html
+userscripts/user-script-plugin-document.html
+userscripts/user-script-top-frame-only.html
+userscripts/user-script-video-document.html
+userscripts/user-style-top-frame-only.html
+userscripts/window-onerror-for-isolated-world-1.html
+userscripts/window-onerror-for-isolated-world-2.html
 
 # EFL's LayoutTestController does not implement setAsynchronousSpellCheckingEnabled

trunk/Source/WebKit/efl/ChangeLog

@@ +1 @@
+2012-04-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [EFL] LayoutTestController needs implementation of addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=82446
+
+        Add missing implementation addUserStyleSheet to EFL's
+        DumpRenderTreeSupport.
+
+        Reviewed by Antonio Gomes.
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        (DumpRenderTreeSupportEfl::addUserStyleSheet):
+        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
 2012-04-04  Raphael Kubo da Costa  <rakuco@webkit.org>
 

trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp

@@ -38 +38 @@
 #include <JSCSSStyleDeclaration.h>
 #include <JSElement.h>
+#include <PageGroup.h>
 #include <PrintContext.h>
 #include <RenderTreeAsText.h>
@@ -351 +352 @@
 }
 
+void DumpRenderTreeSupportEfl::addUserStyleSheet(const Evas_Object* ewkView, const char* sourceCode, bool allFrames)
+{
+    WebCore::Page* page = EWKPrivate::corePage(ewkView);
+    if (!page)
+        return;
+
+    page->group().addUserStyleSheetToWorld(WebCore::mainThreadNormalWorld(), sourceCode, WebCore::KURL(), nullptr, nullptr, allFrames ? WebCore::InjectInAllFrames : WebCore::InjectInTopFrameOnly);
+}
+
 bool DumpRenderTreeSupportEfl::findString(const Evas_Object* ewkView, const char* text, WebCore::FindOptions options)
 {

trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h

@@ -69 +69 @@
     static void setDefersLoading(Evas_Object* ewkView, bool defers);
 
+    static void addUserStyleSheet(const Evas_Object* ewkView, const char* sourceCode, bool allFrames);
     static bool findString(const Evas_Object* ewkView, const char* text, WebCore::FindOptions);
     static void setSmartInsertDeleteEnabled(Evas_Object* ewkView, bool enabled);

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-10  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [EFL] LayoutTestController needs implementation of addUserStyleSheet
+        https://bugs.webkit.org/show_bug.cgi?id=82446
+
+        Adding missing implementation addUserStyleSheet to EFL's LayoutTestController 
+        so that we can unskip related tests from the skip list. 
+
+        Reviewed by Antonio Gomes.
+
+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+        (LayoutTestController::addUserStyleSheet): Implemented.
+
 2012-04-10  Philip Rogers  <pdr@google.com>
 

trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp

@@ -656 +656 @@
 }
 
-void LayoutTestController::addUserStyleSheet(JSStringRef, bool)
-{
-    // FIXME: needs more investigation why userscripts/user-style-top-frame-only.html fails when allFrames is false.
-    notImplemented();
+void LayoutTestController::addUserStyleSheet(JSStringRef source, bool allFrames)
+{
+    DumpRenderTreeSupportEfl::addUserStyleSheet(browser->mainView(), source->ustring().utf8().data(), allFrames);
 }