Attachment 135834 Details for Bug 82860 – patch

[patch] patch

patch3.diff (text/plain), 5.47 KB, created by Kamil Blank on 2012-04-05 08:48:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Blank

Created: 2012-04-05 08:48:55 PDT

Size: 5.47 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3ed460e..b82c6b5 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-04-05  Keishi Hattori  <keishi@webkit.org>
> 
>         Hide datalist element
>diff --git a/LayoutTests/platform/efl/Skipped b/LayoutTests/platform/efl/Skipped
>index 248ee21..b204976 100644
>--- a/LayoutTests/platform/efl/Skipped
>+++ b/LayoutTests/platform/efl/Skipped
>@@ -452,9 +452,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 setJavaScriptProfilingEnabled
> fast/profiler
> 
>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 c9feeca..0889655 100644
>--- a/Source/WebKit/efl/ChangeLog
>+++ b/Source/WebKit/efl/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
>+
>+        Add missing implementation setAuthorAndUserStylesEnabled to EFL's
>+        DumpRenderTreeSupport.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
>+
> 2012-04-04  Raphael Kubo da Costa  <rakuco@webkit.org>
> 
>         Another unreviewed attempt at getting the EFL build bot to a
>diff --git a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>index 8ccf188..93b03d0 100644
>--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
>@@ -532,3 +532,12 @@ JSValueRef DumpRenderTreeSupportEfl::computedStyleIncludingVisitedInfo(JSContext
>     RefPtr<WebCore::CSSComputedStyleDeclaration> style = WebCore::CSSComputedStyleDeclaration::create(element, true);
>     return toRef(exec, toJS(exec, jsElement->globalObject(), style.get()));
> }
>+
>+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 606767d..a4f7966 100644
>--- a/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
>+++ b/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
>@@ -90,6 +90,7 @@ public:
>     static String markerTextForListItem(JSContextRef, JSValueRef nodeObject);
>     static void setInteractiveFormValidationEnabled(Evas_Object* ewkView, bool enabled);
>     static JSValueRef computedStyleIncludingVisitedInfo(JSContextRef, JSValueRef);
>+    static void setAuthorAndUserStylesEnabled(Evas_Object* ewkView, bool);
> };
> 
> #endif // DumpRenderTreeSupportEfl_h
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5a2b464..d7d621e 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-04-05  Kinuko Yasuda  <kinuko@chromium.org>
> 
>         Expose DataTransferItem.getAsEntry() to allow users access dropped files as FileEntry
>diff --git a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>index 7aa527c..671b85d 100644
>--- a/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>+++ b/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp
>@@ -350,9 +350,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)

Flags:

dbates: review+

Actions: View | Formatted Diff | Diff

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