3 files changed, 119 insertions, 109 deletions
diff --git a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
index 850749e14..ded410845 100644
--- a/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
+++ b/Source/WebKit/efl/DefaultTheme/CMakeLists.txt
@@ -1,110 +1,116 @@
-SET(DefaultTheme_RESOURCE_NAME default.edj)
-SET(DefaultTheme_DIR "${WEBKIT_DIR}/efl/DefaultTheme")
+MACRO (GENERATE_THEME _target_name _name _option)
+    SET(DefaultTheme_DIR "${WEBKIT_DIR}/efl/DefaultTheme")
+
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${THEME_BINARY_DIR}/${_name}
+        COMMAND ${EDJE_CC_EXECUTABLE} -v ${_option} default.edc ${THEME_BINARY_DIR}/${_name}
+        DEPENDS
+            default.edc
+            widget/button/button.edc
+            widget/button/img_button_focus.png
+            widget/button/img_button_hover.png
+            widget/button/img_button_normal.png
+            widget/button/img_button_press.png
+            widget/check/check.edc
+            widget/check/img_check_off_focus.png
+            widget/check/img_check_off_hover.png
+            widget/check/img_check_off.png
+            widget/check/img_check_on_focus.png
+            widget/check/img_check_on_hover.png
+            widget/check/img_check_on.png
+            widget/combo/combo.edc
+            widget/combo/combo_focus_button.png
+            widget/combo/combo_focus.png
+            widget/combo/combo_hover_button.png
+            widget/combo/combo_hover.png
+            widget/combo/combo_normal_button.png
+            widget/combo/combo_normal.png
+            widget/combo/combo_press_button.png
+            widget/combo/combo_press.png
+            widget/combo/icon.png
+            widget/entry/entry.edc
+            widget/entry/img_focused.png
+            widget/entry/img_hovered.png
+            widget/entry/img_normal.png
+            widget/file/file.edc
+            widget/file/file_focus.png
+            widget/file/file_hover.png
+            widget/file/file_normal.png
+            widget/file/file_press.png
+            widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
+            widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
+            widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
+            widget/mediacontrol/mutebutton/mute_button.edc
+            widget/mediacontrol/mutebutton/mutebutton.png
+            widget/mediacontrol/mutebutton/unmutebutton.png
+            widget/mediacontrol/playpausebutton/pausebutton.png
+            widget/mediacontrol/playpausebutton/playbutton.png
+            widget/mediacontrol/playpausebutton/playpause_button.edc
+            widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
+            widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
+            widget/mediacontrol/seekforwardbutton/seekforward_button.edc
+            widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
+            widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
+            widget/mediacontrol/togglecaptionsbutton/closedcaption.png
+            widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
+            widget/progressbar/bt_base.png
+            widget/progressbar/progressbar.edc
+            widget/progressbar/shelf_inset.png
+            widget/radio/img_radio_off_focus.png
+            widget/radio/img_radio_off_hover.png
+            widget/radio/img_radio_off.png
+            widget/radio/img_radio_on_focus.png
+            widget/radio/img_radio_on_hover.png
+            widget/radio/img_radio_on.png
+            widget/radio/radio.edc
+            widget/scrollbar/scrollbar.edc
+            widget/scrollbar/scrollbar_h.png
+            widget/scrollbar/scrollbar_knob_h.png
+            widget/scrollbar/scrollbar_knob_v.png
+            widget/scrollbar/scrollbar_v.png
+            widget/search/cancel/cancel_normal_button2.png
+            widget/search/cancel/cancel_normal_button.png
+            widget/search/cancel/search_cancel.edc
+            widget/search/decoration/decoration_normal_button.png
+            widget/search/decoration/search_decoration.edc
+            widget/search/field/field_focused.png
+            widget/search/field/field_hovered.png
+            widget/search/field/field_normal.png
+            widget/search/field/search_field.edc
+            widget/slider/slider.edc
+            widget/slider/slider_fill_h.png
+            widget/slider/slider_fill_v.png
+            widget/slider/slider_h.png
+            widget/slider/slider_thumb_h.png
+            widget/slider/slider_thumb_press_h.png
+            widget/slider/slider_thumb_press_v.png
+            widget/slider/slider_thumb_v.png
+            widget/slider/slider_v.png
+            widget/spinner/sp_bg.png
+            widget/spinner/sp_down_default.png
+            widget/spinner/sp_down_hover.png
+            widget/spinner/sp_down_pressed.png
+            widget/spinner/spinner.edc
+            widget/spinner/sp_up_default.png
+            widget/spinner/sp_up_hover.png
+            widget/spinner/sp_up_pressed.png
+        WORKING_DIRECTORY ${DefaultTheme_DIR}
+        VERBATIM
+    )
+
+    ADD_CUSTOM_TARGET(${_target_name} ALL
+        DEPENDS ${THEME_BINARY_DIR}/${_name}
+    )
+ENDMACRO()
 
 SET(DefaultTheme_DEFINITION "")
 IF (ENABLE_PROGRESS_ELEMENT)
     LIST(APPEND DefaultTheme_DEFINITION "-DENABLE_PROGRESS_ELEMENT")
 ENDIF ()
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
-    COMMAND ${EDJE_CC_EXECUTABLE} -v ${DefaultTheme_DEFINITION} default.edc ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
-    DEPENDS
-        default.edc
-        widget/button/button.edc
-        widget/button/img_button_focus.png
-        widget/button/img_button_hover.png
-        widget/button/img_button_normal.png
-        widget/button/img_button_press.png
-        widget/check/check.edc
-        widget/check/img_check_off_focus.png
-        widget/check/img_check_off_hover.png
-        widget/check/img_check_off.png
-        widget/check/img_check_on_focus.png
-        widget/check/img_check_on_hover.png
-        widget/check/img_check_on.png
-        widget/combo/combo.edc
-        widget/combo/combo_focus_button.png
-        widget/combo/combo_focus.png
-        widget/combo/combo_hover_button.png
-        widget/combo/combo_hover.png
-        widget/combo/combo_normal_button.png
-        widget/combo/combo_normal.png
-        widget/combo/combo_press_button.png
-        widget/combo/combo_press.png
-        widget/combo/icon.png
-        widget/entry/entry.edc
-        widget/entry/img_focused.png
-        widget/entry/img_hovered.png
-        widget/entry/img_normal.png
-        widget/file/file.edc
-        widget/file/file_focus.png
-        widget/file/file_hover.png
-        widget/file/file_normal.png
-        widget/file/file_press.png
-        widget/mediacontrol/fullscreenbutton/enterfullscreenbutton.png
-        widget/mediacontrol/fullscreenbutton/exitfullscreenbutton.png
-        widget/mediacontrol/fullscreenbutton/fullscreen_button.edc
-        widget/mediacontrol/mutebutton/mute_button.edc
-        widget/mediacontrol/mutebutton/mutebutton.png
-        widget/mediacontrol/mutebutton/unmutebutton.png
-        widget/mediacontrol/playpausebutton/pausebutton.png
-        widget/mediacontrol/playpausebutton/playbutton.png
-        widget/mediacontrol/playpausebutton/playpause_button.edc
-        widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc
-        widget/mediacontrol/seekbackwardbutton/seekbackwardbutton.png
-        widget/mediacontrol/seekforwardbutton/seekforward_button.edc
-        widget/mediacontrol/seekforwardbutton/seekforwardbutton.png
-        widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png
-        widget/mediacontrol/togglecaptionsbutton/closedcaption.png
-        widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc
-        widget/progressbar/bt_base.png
-        widget/progressbar/progressbar.edc
-        widget/progressbar/shelf_inset.png
-        widget/radio/img_radio_off_focus.png
-        widget/radio/img_radio_off_hover.png
-        widget/radio/img_radio_off.png
-        widget/radio/img_radio_on_focus.png
-        widget/radio/img_radio_on_hover.png
-        widget/radio/img_radio_on.png
-        widget/radio/radio.edc
-        widget/scrollbar/scrollbar.edc
-        widget/scrollbar/scrollbar_h.png
-        widget/scrollbar/scrollbar_knob_h.png
-        widget/scrollbar/scrollbar_knob_v.png
-        widget/scrollbar/scrollbar_v.png
-        widget/search/cancel/cancel_normal_button2.png
-        widget/search/cancel/cancel_normal_button.png
-        widget/search/cancel/search_cancel.edc
-        widget/search/decoration/decoration_normal_button.png
-        widget/search/decoration/search_decoration.edc
-        widget/search/field/field_focused.png
-        widget/search/field/field_hovered.png
-        widget/search/field/field_normal.png
-        widget/search/field/search_field.edc
-        widget/slider/slider.edc
-        widget/slider/slider_fill_h.png
-        widget/slider/slider_fill_v.png
-        widget/slider/slider_h.png
-        widget/slider/slider_thumb_h.png
-        widget/slider/slider_thumb_press_h.png
-        widget/slider/slider_thumb_press_v.png
-        widget/slider/slider_thumb_v.png
-        widget/slider/slider_v.png
-        widget/spinner/sp_bg.png
-        widget/spinner/sp_down_default.png
-        widget/spinner/sp_down_hover.png
-        widget/spinner/sp_down_pressed.png
-        widget/spinner/spinner.edc
-        widget/spinner/sp_up_default.png
-        widget/spinner/sp_up_hover.png
-        widget/spinner/sp_up_pressed.png
-    WORKING_DIRECTORY ${DefaultTheme_DIR}
-    VERBATIM
-)
+GENERATE_THEME(DefaultTheme "default.edj" "${DefaultTheme_DEFINITION}")
+INSTALL(FILES "${THEME_BINARY_DIR}/default.edj" DESTINATION ${DATA_INSTALL_DIR}/themes)
 
-ADD_CUSTOM_TARGET(DefaultTheme ALL
-    DEPENDS ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME}
-)
-
-INSTALL(FILES ${THEME_BINARY_DIR}/${DefaultTheme_RESOURCE_NAME} DESTINATION ${DATA_INSTALL_DIR}/themes)
+IF (ENABLE_API_TESTS)
+    GENERATE_THEME(BigButtonTheme "big_button_theme.edj" "-DBIG_BUTTON_THEME_FOR_TESTING")
+ENDIF ()
diff --git a/Source/WebKit/efl/DefaultTheme/default.edc b/Source/WebKit/efl/DefaultTheme/default.edc
index e234839d7..2ac69c5c3 100644
--- a/Source/WebKit/efl/DefaultTheme/default.edc
+++ b/Source/WebKit/efl/DefaultTheme/default.edc
@@ -21,14 +21,14 @@
 
 color_classes {
    color_class {
-      name: "webkit/selection/active";
-      color: 255 255 255 255; /* foreground */
-      color2: 86 86 209 255; /* background */
+      name: "webkit/selection/foreground";
+      color: 255 255 255 255; /* active */
+      color2: 255 255 255 255; /* inactive */
    }
    color_class {
-      name: "webkit/selection/inactive";
-      color: 255 255 255 255; /* foreground */
-      color2: 0 0 128 128; /* background */
+      name: "webkit/selection/background";
+      color: 86 86 209 255; /* active */
+      color2: 0 0 128 128; /* inactive */
    }
    color_class {
       name: "webkit/focus_ring";
diff --git a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
index 78cc72a54..b435ed139 100644
--- a/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
+++ b/Source/WebKit/efl/DefaultTheme/widget/button/button.edc
@@ -113,7 +113,11 @@
                }
                rel2 {
                   relative: 1.0 1.0;
+#ifdef BIG_BUTTON_THEME_FOR_TESTING
+                  offset: -285 -11;
+#else
                   offset: -16 -11;
+#endif
                }
             }
          }