Attachment 135817 Details for Bug 82860 – patch

[patch] patch

patch2.diff (text/plain), 5.46 KB, created by Kamil Blank on 2012-04-05 07:01:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Blank

Created: 2012-04-05 07:01:19 PDT

Size: 5.46 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ca9211f..1b97294 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-04-05  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=82860
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable test connected with setAuthorAndUserStylesEnabled.
>+
>+        * platform/efl/Skipped:
>+        * platform/efl/fast/css/disabled-author-styles-expected.txt: Added.
>+
> 2012-03-26  Pablo Flouret  <pablof@motorola.com>
> 
>         Fix flaky test fast/eventsource/eventsource-url-attribute.html
>diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped
>index 76edcd6..373567f 100644
>--- a/LayoutTests/platform/efl/Skipped
>+++ b/LayoutTests/platform/efl/Skipped
>@@ -461,9 +461,6 @@ fast/frames/location-change-no-file-access.html
> fast/xmlhttprequest/xmlhttprequest-no-file-access.html
> fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
> 
>-# EFL's LayoutTestController does not implement setAuthorAndUserStylesEnabled
>-fast/css/disabled-author-styles.html
>-
> # EFL's LayoutTestController does not implement disableImageLoading
> http/tests/misc/favicon-loads-with-icon-loading-override.html
> http/tests/misc/favicon-loads-with-images-disabled.html
>diff --git a/LayoutTests/platform/efl/fast/css/disabled-author-styles-expected.txt b/LayoutTests/platform/efl/fast/css/disabled-author-styles-expected.txt
>new file mode 100644
>index 0000000..35bee5c
>--- /dev/null
>+++ b/LayoutTests/platform/efl/fast/css/disabled-author-styles-expected.txt
>@@ -0,0 +1,9 @@
>+layer at (0,0) size 800x600
>+  RenderView at (0,0) size 800x600
>+layer at (0,0) size 800x600
>+  RenderBlock {HTML} at (0,0) size 800x600
>+    RenderBody {BODY} at (8,8) size 784x584
>+      RenderBlock {DIV} at (0,0) size 784x18
>+        RenderText {#text} at (0,0) size 214x19
>+          text run at (0,0) width 214: "This text should be black, not red."
>+      RenderBlock {DIV} at (0,18) size 784x0
>diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
>index a6a7dc7..4429b1a 100644
>--- a/Source/WebKit/efl/ChangeLog
>+++ b/Source/WebKit/efl/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-04-05  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=82860
>+
>+        Add missing implementation setAuthorAndUserStylesEnabled to EFL's
>+        DumpRenderTreeSupport.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
>+        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
>+
> 2012-03-23  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
> 
>         [EFL][DRT] Implement LayoutTestController's methods related with editing.
>diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>index 4620d16..10976cd 100644
>--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>@@ -472,3 +472,12 @@ String DumpRenderTreeSupportEfl::markerTextForListItem(JSContextRef context, JSV
> 
>     return WebCore::markerTextForListItem(element);
> }
>+
>+void DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(Evas_Object* ewkView, bool enabled)
>+{
>+    WebCore::Page* corePage = EWKPrivate::corePage(ewkView);
>+    if (!corePage)
>+        return;
>+
>+    corePage->settings()->setAuthorAndUserStylesEnabled(enabled);
>+}
>diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
>index 9c3df14..0128537 100644
>--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
>+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
>@@ -85,6 +85,7 @@ public:
>     static void deliverAllMutationsIfNecessary();
>     static void setEditingBehavior(Evas_Object* ewkView, const char* editingBehavior);
>     static String markerTextForListItem(JSContextRef, JSValueRef nodeObject);
>+    static void setAuthorAndUserStylesEnabled(Evas_Object* ewkView, bool);
> };
> 
> #endif // DumpRenderTreeSupportEfl_h
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e87aa00..d032dc5 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-04-05  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=82860
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Implementation of setAuthorAndUserStylesEnabled.
>+
>+        * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
>+        (LayoutTestController::setAuthorAndUserStylesEnabled):
>+
> 2012-03-26  Scott Byer  <scottbyer@chromium.org>
> 
>         Enable layout testing of the scroll animator.
>diff --git a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>index d922ccb..320bec0 100644
>--- a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>+++ b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>@@ -347,9 +347,9 @@ void LayoutTestController::setAllowFileAccessFromFileURLs(bool)
>     notImplemented();
> }
> 
>-void LayoutTestController::setAuthorAndUserStylesEnabled(bool)
>+void LayoutTestController::setAuthorAndUserStylesEnabled(bool flag)
> {
>-    notImplemented();
>+    DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(browser->mainView(), flag);
> }
> 
> void LayoutTestController::setAutofilled(JSContextRef context, JSValueRef nodeObject, bool autofilled)

Actions: View | Formatted Diff | Diff

Attachments on bug 82860: 135029 | 135030 | 135817 | 135834 | 138042