Attachment 135029 Details for Bug 82860 – patch

[patch] patch

patch.diff (text/plain), 7.23 KB, created by Kamil Blank on 2012-04-02 00:10:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kamil Blank

Created: 2012-04-02 00:10:01 PDT

Size: 7.23 KB

patch

obsolete

>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index ca9211f..414c6c3 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-03-28  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=XXX
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable test connected with seAuthorAndUserStylesEnabled.
>+
>+        * 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..af32623 100644
>--- a/Source/WebKit/efl/ChangeLog
>+++ b/Source/WebKit/efl/ChangeLog
>@@ -1,3 +1,19 @@
>+2012-03-28  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=XXX
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make it possible to enable author and user styles.
>+
>+        * ewk/ewk_view.cpp:
>+        (_Ewk_View_Private_Data):
>+        (_ewk_view_priv_new):
>+        (ewk_view_setting_enable_author_and_user_styles_get):
>+        (ewk_view_setting_enable_author_and_user_styles_set):
>+        * ewk/ewk_view.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/ewk/ewk_view.cpp b/Source/WebKit/efl/ewk/ewk_view.cpp
>index 26b555c..899ec68 100644
>--- a/Source/WebKit/efl/ewk/ewk_view.cpp
>+++ b/Source/WebKit/efl/ewk/ewk_view.cpp
>@@ -210,6 +210,7 @@ struct _Ewk_View_Private_Data {
>         } zoomRange;
>         float devicePixelRatio;
>         double domTimerInterval;
>+        bool enableAuthorAndUserStyles : 1;
>     } settings;
>     struct {
>         struct {
>@@ -715,6 +716,7 @@ static Ewk_View_Private_Data* _ewk_view_priv_new(Ewk_View_Smart_Data* smartData)
>     priv->settings.devicePixelRatio = devicePixelRatio;
> 
>     priv->settings.domTimerInterval = priv->pageSettings->defaultMinDOMTimerInterval();
>+    priv->settings.enableAuthorAndUserStyles = priv->pageSettings->authorAndUserStylesEnabled();
> 
>     priv->mainFrame = _ewk_view_core_frame_new(smartData, priv, 0).get();
> 
>@@ -2437,6 +2439,25 @@ double ewk_view_setting_minimum_timer_interval_get(const Evas_Object* ewkView)
>     return priv->settings.domTimerInterval;
> }
> 
>+Eina_Bool ewk_view_setting_enable_author_and_user_styles_get(const Evas_Object* ewkView)
>+{
>+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
>+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
>+    return priv->settings.enableAuthorAndUserStyles;
>+}
>+
>+Eina_Bool ewk_view_setting_enable_author_and_user_styles_set(Evas_Object* ewkView, Eina_Bool enable)
>+{
>+    EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, false);
>+    EWK_VIEW_PRIV_GET_OR_RETURN(smartData, priv, false);
>+    enable = !!enable;
>+    if (priv->settings.enableAuthorAndUserStyles != enable) {
>+        priv->pageSettings->setAuthorAndUserStylesEnabled(enable);
>+        priv->settings.enableAuthorAndUserStyles = enable;
>+    }
>+    return true;
>+}
>+
> Ewk_View_Smart_Data* ewk_view_smart_data_get(const Evas_Object* ewkView)
> {
>     EWK_VIEW_SD_GET_OR_RETURN(ewkView, smartData, 0);
>diff --git a/Source/WebKit/efl/ewk/ewk_view.h b/Source/WebKit/efl/ewk/ewk_view.h
>index 1c53335..e1b9224 100644
>--- a/Source/WebKit/efl/ewk/ewk_view.h
>+++ b/Source/WebKit/efl/ewk/ewk_view.h
>@@ -1940,6 +1940,27 @@ EAPI Eina_Bool    ewk_view_setting_minimum_timer_interval_set(Evas_Object *o, do
> EAPI double       ewk_view_setting_minimum_timer_interval_get(const Evas_Object *o);
> 
> /**
>+ * Queries if author and user styles are enabled.
>+ *
>+ * @param o view object to query if author and user styles are enabled
>+ *
>+ * @return @c EINA_TRUE if author and user styles are enabled, @c EINA_FALSE
>+ *         otherwise
>+ */
>+EAPI Eina_Bool    ewk_view_setting_enable_author_and_user_styles_get(const Evas_Object *o);
>+
>+/**
>+ * Enables/disables author and user styles.
>+ *
>+ * @param o view object to enable/disable author and user styles
>+ * @param enable @c EINA_TRUE to enable author and user styles, @c EINA_FALSE to
>+ *               disable
>+ *
>+ * @return @c EINA_TRUE on success or @EINA_FALSE on failure
>+ */
>+EAPI Eina_Bool    ewk_view_setting_enable_author_and_user_styles_set(Evas_Object *o, Eina_Bool enable);
>+
>+/**
>  * Gets the internal data of @a o.
>  *
>  * This is similar to evas_object_smart_data_get(), but additionally does type checking.
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e87aa00..f8f47ec 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-03-28  Kamil Blank  <k.blank@samsung.com>
>+
>+        [EFL] Add setting API for author and user styles.
>+        https://bugs.webkit.org/show_bug.cgi?id=XXX
>+
>+        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..6e3a575 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();
>+    ewk_view_setting_enable_author_and_user_styles_set(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