Title: [146007] trunk/Source/WebCore
- Revision
- 146007
- Author
- [email protected]
- Date
- 2013-03-17 03:44:09 -0700 (Sun, 17 Mar 2013)
Log Message
[EFL] Provide default cursor groups as cursor.edc
https://bugs.webkit.org/show_bug.cgi?id=112403
Patch by Jinwoo Song <[email protected]> on 2013-03-17
Reviewed by Gyuyoung Kim.
This patch provides a cursor.edc to use the CSS cursor images files in the
WebCore/Resources directory. cursor.edc is included in the default.edc
so that views can use it by default.
* platform/efl/DefaultTheme/CMakeLists.txt:
* platform/efl/DefaultTheme/default.edc:
* platform/efl/DefaultTheme/widget/cursor/cursor.edc: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (146006 => 146007)
--- trunk/Source/WebCore/ChangeLog 2013-03-17 06:46:49 UTC (rev 146006)
+++ trunk/Source/WebCore/ChangeLog 2013-03-17 10:44:09 UTC (rev 146007)
@@ -1,3 +1,18 @@
+2013-03-17 Jinwoo Song <[email protected]>
+
+ [EFL] Provide default cursor groups as cursor.edc
+ https://bugs.webkit.org/show_bug.cgi?id=112403
+
+ Reviewed by Gyuyoung Kim.
+
+ This patch provides a cursor.edc to use the CSS cursor images files in the
+ WebCore/Resources directory. cursor.edc is included in the default.edc
+ so that views can use it by default.
+
+ * platform/efl/DefaultTheme/CMakeLists.txt:
+ * platform/efl/DefaultTheme/default.edc:
+ * platform/efl/DefaultTheme/widget/cursor/cursor.edc: Added.
+
2013-03-16 Pratik Solanki <[email protected]>
Disable High DPI Canvas on iOS
Modified: trunk/Source/WebCore/platform/efl/DefaultTheme/CMakeLists.txt (146006 => 146007)
--- trunk/Source/WebCore/platform/efl/DefaultTheme/CMakeLists.txt 2013-03-17 06:46:49 UTC (rev 146006)
+++ trunk/Source/WebCore/platform/efl/DefaultTheme/CMakeLists.txt 2013-03-17 10:44:09 UTC (rev 146007)
@@ -1,3 +1,4 @@
+set(Resources_DIR "${WEBCORE_DIR}/Resources")
macro(GENERATE_THEME _target_name _name _option)
set(DefaultTheme_DIR "${WEBCORE_DIR}/platform/efl/DefaultTheme")
@@ -28,6 +29,7 @@
widget/combo/combo_press_button.png
widget/combo/combo_press.png
widget/combo/icon.png
+ widget/cursor/cursor.edc
widget/entry/entry.edc
widget/entry/img_focused.png
widget/entry/img_hovered.png
@@ -94,6 +96,31 @@
widget/spinner/sp_up_default.png
widget/spinner/sp_up_hover.png
widget/spinner/sp_up_pressed.png
+ ${Resources_DIR}/aliasCursor.png
+ ${Resources_DIR}/cellCursor.png
+ ${Resources_DIR}/contextMenuCursor.png
+ ${Resources_DIR}/copyCursor.png
+ ${Resources_DIR}/eastResizeCursor.png
+ ${Resources_DIR}/eastWestResizeCursor.png
+ ${Resources_DIR}/helpCursor.png
+ ${Resources_DIR}/linkCursor.png
+ ${Resources_DIR}/moveCursor.png
+ ${Resources_DIR}/noDropCursor.png
+ ${Resources_DIR}/noneCursor.png
+ ${Resources_DIR}/northEastResizeCursor.png
+ ${Resources_DIR}/northEastSouthWestResizeCursor.png
+ ${Resources_DIR}/northResizeCursor.png
+ ${Resources_DIR}/northSouthResizeCursor.png
+ ${Resources_DIR}/northWestResizeCursor.png
+ ${Resources_DIR}/northWestSouthEastResizeCursor.png
+ ${Resources_DIR}/panIcon.png
+ ${Resources_DIR}/progressCursor.png
+ ${Resources_DIR}/southEastResizeCursor.png
+ ${Resources_DIR}/southResizeCursor.png
+ ${Resources_DIR}/southWestResizeCursor.png
+ ${Resources_DIR}/verticalTextCursor.png
+ ${Resources_DIR}/waitCursor.png
+ ${Resources_DIR}/westResizeCursor.png
WORKING_DIRECTORY ${DefaultTheme_DIR}
VERBATIM
)
@@ -108,9 +135,9 @@
list(APPEND DefaultTheme_DEFINITION "-DENABLE_PROGRESS_ELEMENT")
endif ()
-GENERATE_THEME(DefaultTheme "default.edj" "${DefaultTheme_DEFINITION}")
+GENERATE_THEME(DefaultTheme "default.edj" "${DefaultTheme_DEFINITION} -DCURSOR_IMAGE_DIR=${Resources_DIR}")
install(FILES "${THEME_BINARY_DIR}/default.edj" DESTINATION ${DATA_INSTALL_DIR}/themes)
if (ENABLE_API_TESTS)
- GENERATE_THEME(BigButtonTheme "big_button_theme.edj" "-DBIG_BUTTON_THEME_FOR_TESTING")
+ GENERATE_THEME(BigButtonTheme "big_button_theme.edj" "-DBIG_BUTTON_THEME_FOR_TESTING -DCURSOR_IMAGE_DIR=${Resources_DIR}")
endif ()
Modified: trunk/Source/WebCore/platform/efl/DefaultTheme/default.edc (146006 => 146007)
--- trunk/Source/WebCore/platform/efl/DefaultTheme/default.edc 2013-03-17 06:46:49 UTC (rev 146006)
+++ trunk/Source/WebCore/platform/efl/DefaultTheme/default.edc 2013-03-17 10:44:09 UTC (rev 146007)
@@ -43,24 +43,25 @@
}
#include "widget/button/button.edc"
-#include "widget/scrollbar/scrollbar.edc"
-#include "widget/radio/radio.edc"
#include "widget/check/check.edc"
+#include "widget/combo/combo.edc"
+#include "widget/cursor/cursor.edc"
#include "widget/entry/entry.edc"
-#include "widget/combo/combo.edc"
+#include "widget/file/file.edc"
+#include "widget/mediacontrol/fullscreenbutton/fullscreen_button.edc"
+#include "widget/mediacontrol/mutebutton/mute_button.edc"
+#include "widget/mediacontrol/playpausebutton/playpause_button.edc"
+#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
+#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
+#include "widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc"
#ifdef ENABLE_PROGRESS_ELEMENT
#include "widget/progressbar/progressbar.edc"
#endif
-#include "widget/file/file.edc"
-#include "widget/search/field/search_field.edc"
+#include "widget/radio/radio.edc"
+#include "widget/scrollbar/scrollbar.edc"
#include "widget/search/cancel/search_cancel.edc"
#include "widget/search/decoration/search_decoration.edc"
+#include "widget/search/field/search_field.edc"
#include "widget/slider/slider.edc"
#include "widget/spinner/spinner.edc"
-#include "widget/mediacontrol/playpausebutton/playpause_button.edc"
-#include "widget/mediacontrol/mutebutton/mute_button.edc"
-#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
-#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
-#include "widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc"
-#include "widget/mediacontrol/fullscreenbutton/fullscreen_button.edc"
}
Added: trunk/Source/WebCore/platform/efl/DefaultTheme/widget/cursor/cursor.edc (0 => 146007)
--- trunk/Source/WebCore/platform/efl/DefaultTheme/widget/cursor/cursor.edc (rev 0)
+++ trunk/Source/WebCore/platform/efl/DefaultTheme/widget/cursor/cursor.edc 2013-03-17 10:44:09 UTC (rev 146007)
@@ -0,0 +1,551 @@
+/*
+ * Copyright (C) 2013 Samsung Electronics. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef CURSOR_IMAGE_DIR
+ group {
+ name: "cursor/hand";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/linkCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "hand";
+ type: IMAGE;
+ description {
+ min: 20 20;
+ max: 20 20;
+ image {
+ normal: CURSOR_IMAGE_DIR"/linkCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/wait";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/waitCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "wait";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/waitCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/help";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/helpCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "help";
+ type: IMAGE;
+ description {
+ min: 18 18;
+ max: 18 18;
+ image {
+ normal: CURSOR_IMAGE_DIR"/helpCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/east_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/eastResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "eastResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/eastResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_east_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northEastResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northEastResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northEastResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_west_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northWestResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northWestResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northWestResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/south_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/southResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "southResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/southResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/south_east_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/southEastResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "southEastResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/southEastResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/south_west_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/southWestResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "southWestResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/southWestResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/west_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/westResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "westResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/westResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_south_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northSouthResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northSouthResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northSouthResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/east_west_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/eastWestResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "eastWestResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/eastWestResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_east_south_west_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northEastSouthWestResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northEastSouthWestResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northEastSouthWestResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/north_west_south_east_resize";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/northWestSouthEastResizeCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "northWestSouthEastResize";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/northWestSouthEastResizeCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/middle_panning";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/panIcon.png" COMP;
+ }
+ parts {
+ part {
+ name: "panIcon";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/panIcon.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/move";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/moveCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "move";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/moveCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/vertical_text";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/verticalTextCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "verticalText";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/verticalTextCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/cell";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/cellCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "cell";
+ type: IMAGE;
+ description {
+ min: 18 18;
+ max: 18 18;
+ image {
+ normal: CURSOR_IMAGE_DIR"/cellCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/context_menu";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/contextMenuCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "contextMenu";
+ type: IMAGE;
+ description {
+ min: 19 27;
+ max: 19 27;
+ image {
+ normal: CURSOR_IMAGE_DIR"/contextMenuCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/alias";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/aliasCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "alias";
+ type: IMAGE;
+ description {
+ min: 16 21;
+ max: 16 21;
+ image {
+ normal: CURSOR_IMAGE_DIR"/aliasCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/progress";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/progressCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "progress";
+ type: IMAGE;
+ description {
+ min: 25 37;
+ max: 25 37;
+ image {
+ normal: CURSOR_IMAGE_DIR"/progressCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/no_drop";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/noDropCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "noDrop";
+ type: IMAGE;
+ description {
+ min: 25 36;
+ max: 25 36;
+ image {
+ normal: CURSOR_IMAGE_DIR"/noDropCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/copy";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/copyCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "copy";
+ type: IMAGE;
+ description {
+ min: 25 37;
+ max: 25 37;
+ image {
+ normal: CURSOR_IMAGE_DIR"/copyCursor.png";
+ }
+ }
+ }
+ }
+ }
+
+ group {
+ name: "cursor/none";
+
+ images {
+ image: CURSOR_IMAGE_DIR"/noneCursor.png" COMP;
+ }
+ parts {
+ part {
+ name: "none";
+ type: IMAGE;
+ description {
+ min: 16 16;
+ max: 16 16;
+ image {
+ normal: CURSOR_IMAGE_DIR"/noneCursor.png";
+ }
+ }
+ }
+ }
+ }
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
