- Revision
- 149362
- Author
- [email protected]
- Date
- 2013-04-30 06:17:19 -0700 (Tue, 30 Apr 2013)
Log Message
[EFL] Enable scaled cursors
https://bugs.webkit.org/show_bug.cgi?id=106242
Reviewed by Gyuyoung Kim.
.:
Enable MOUSE_CURSOR_SCALE flag for EFL port.
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/WebCore:
Correctly copy WebCore::Cursor's m_imageScaleFactor
member in CursorEfl.cpp when MOUSE_CURSOR_SCALE is
enabled.
No new tests, already covered by existing tests.
* platform/efl/CursorEfl.cpp:
(WebCore::Cursor::Cursor):
(WebCore::Cursor::operator=):
Tools:
Enable ENABLE_MOUSE_CURSOR_SCALE for EFL port.
* Scripts/webkitperl/FeatureList.pm:
LayoutTests:
Unskip fast/css/cursor-parsing-image-set.html for EFL port
now that scaled cursors are enabled. Update expectation for
fast/events/mouse-cursor-image-set.html to explain the
reason why it is failing and set its bug URL.
* platform/efl/TestExpectations:
Modified Paths
Diff
Modified: trunk/ChangeLog (149361 => 149362)
--- trunk/ChangeLog 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/ChangeLog 2013-04-30 13:17:19 UTC (rev 149362)
@@ -1,3 +1,15 @@
+2013-04-30 Christophe Dumez <[email protected]>
+
+ [EFL] Enable scaled cursors
+ https://bugs.webkit.org/show_bug.cgi?id=106242
+
+ Reviewed by Gyuyoung Kim.
+
+ Enable MOUSE_CURSOR_SCALE flag for EFL port.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2013-04-29 Zan Dobersek <[email protected]>
[GTK] Disable Shadow DOM feature
Modified: trunk/LayoutTests/ChangeLog (149361 => 149362)
--- trunk/LayoutTests/ChangeLog 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/LayoutTests/ChangeLog 2013-04-30 13:17:19 UTC (rev 149362)
@@ -1,3 +1,17 @@
+2013-04-30 Christophe Dumez <[email protected]>
+
+ [EFL] Enable scaled cursors
+ https://bugs.webkit.org/show_bug.cgi?id=106242
+
+ Reviewed by Gyuyoung Kim.
+
+ Unskip fast/css/cursor-parsing-image-set.html for EFL port
+ now that scaled cursors are enabled. Update expectation for
+ fast/events/mouse-cursor-image-set.html to explain the
+ reason why it is failing and set its bug URL.
+
+ * platform/efl/TestExpectations:
+
2013-04-30 Zoltan Arvai <[email protected]>
[Qt] Unreviewed gardening.
Modified: trunk/LayoutTests/platform/efl/TestExpectations (149361 => 149362)
--- trunk/LayoutTests/platform/efl/TestExpectations 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2013-04-30 13:17:19 UTC (rev 149362)
@@ -59,10 +59,6 @@
fast/dom/Window/slow-unload-handler.html
fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
-# Need ENABLE(MOUSE_CURSOR_SCALE)
-fast/css/cursor-parsing-image-set.html
-fast/events/mouse-cursor-image-set.html
-
# ----------------------------------------
# Tests which also fail in other platforms
# ----------------------------------------
@@ -529,6 +525,9 @@
webkit.org/b/95182 fast/css/sticky/inline-sticky-abspos-child.html [ ImageOnlyFailure ]
webkit.org/b/95182 fast/css/sticky/inline-sticky.html [ ImageOnlyFailure ]
+# Test is failing due to a scrolling problem on second iteration.
+webkit.org/b/106240 fast/events/mouse-cursor-image-set.html [ Failure ]
+
# Testcase assumes a thumb width of 12px, default there uses 29px.
webkit.org/b/95071 fast/forms/range/slider-in-multi-column.html [ Failure ]
webkit.org/b/95071 fast/forms/range/slider-transformed.html [ Failure ]
Modified: trunk/Source/WebCore/ChangeLog (149361 => 149362)
--- trunk/Source/WebCore/ChangeLog 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Source/WebCore/ChangeLog 2013-04-30 13:17:19 UTC (rev 149362)
@@ -1,3 +1,20 @@
+2013-04-30 Christophe Dumez <[email protected]>
+
+ [EFL] Enable scaled cursors
+ https://bugs.webkit.org/show_bug.cgi?id=106242
+
+ Reviewed by Gyuyoung Kim.
+
+ Correctly copy WebCore::Cursor's m_imageScaleFactor
+ member in CursorEfl.cpp when MOUSE_CURSOR_SCALE is
+ enabled.
+
+ No new tests, already covered by existing tests.
+
+ * platform/efl/CursorEfl.cpp:
+ (WebCore::Cursor::Cursor):
+ (WebCore::Cursor::operator=):
+
2013-04-30 Thiago Marcos P. Santos <[email protected]>
CSSParser::parseFontFamily should allow the keyword "default" as part of a font name
Modified: trunk/Source/WebCore/platform/efl/CursorEfl.cpp (149361 => 149362)
--- trunk/Source/WebCore/platform/efl/CursorEfl.cpp 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Source/WebCore/platform/efl/CursorEfl.cpp 2013-04-30 13:17:19 UTC (rev 149362)
@@ -44,6 +44,9 @@
: m_type(other.m_type)
, m_image(other.m_image)
, m_hotSpot(other.m_hotSpot)
+#if ENABLE(MOUSE_CURSOR_SCALE)
+ , m_imageScaleFactor(other.m_imageScaleFactor)
+#endif
, m_platformCursor(other.m_platformCursor)
{
}
@@ -57,7 +60,11 @@
m_type = other.m_type;
m_image = other.m_image;
m_hotSpot = other.m_hotSpot;
+#if ENABLE(MOUSE_CURSOR_SCALE)
+ m_imageScaleFactor = other.m_imageScaleFactor;
+#endif
m_platformCursor = other.m_platformCursor;
+
return *this;
}
Modified: trunk/Source/cmake/OptionsEfl.cmake (149361 => 149362)
--- trunk/Source/cmake/OptionsEfl.cmake 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-04-30 13:17:19 UTC (rev 149362)
@@ -81,6 +81,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MHTML ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MICRODATA ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (149361 => 149362)
--- trunk/Source/cmake/WebKitFeatures.cmake 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2013-04-30 13:17:19 UTC (rev 149362)
@@ -89,7 +89,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_METER_ELEMENT "Toggle Meter Tag support" ON)
WEBKIT_OPTION_DEFINE(ENABLE_MHTML "Toggle MHTML support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MICRODATA "Toggle Microdata support" OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_ENABLE_MOUSE_CURSOR_SCALE "Toggle Scaled mouse cursor support" OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_MOUSE_CURSOR_SCALE "Toggle Scaled mouse cursor support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_NAVIGATOR_CONTENT_UTILS "Toggle Navigator Content Utils support" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" OFF)
WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" ON)
Modified: trunk/Tools/ChangeLog (149361 => 149362)
--- trunk/Tools/ChangeLog 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Tools/ChangeLog 2013-04-30 13:17:19 UTC (rev 149362)
@@ -1,5 +1,16 @@
2013-04-30 Christophe Dumez <[email protected]>
+ [EFL] Enable scaled cursors
+ https://bugs.webkit.org/show_bug.cgi?id=106242
+
+ Reviewed by Gyuyoung Kim.
+
+ Enable ENABLE_MOUSE_CURSOR_SCALE for EFL port.
+
+ * Scripts/webkitperl/FeatureList.pm:
+
+2013-04-30 Christophe Dumez <[email protected]>
+
Replace "Optional" extended attribute by proper Web IDL "optional" keyword
https://bugs.webkit.org/show_bug.cgi?id=115380
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (149361 => 149362)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-04-30 12:41:43 UTC (rev 149361)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-04-30 13:17:19 UTC (rev 149362)
@@ -359,7 +359,7 @@
define => "ENABLE_MICRODATA", default => (isEfl() || isBlackBerry() || isGtk()), value => \$microdataSupport },
{ option => "mouse-cursor-scale", desc => "Toggle Scaled mouse cursor support",
- define => "ENABLE_MOUSE_CURSOR_SCALE", default => 0, value => \$mouseCursorScaleSupport },
+ define => "ENABLE_MOUSE_CURSOR_SCALE", default => isEfl(), value => \$mouseCursorScaleSupport },
{ option => "navigator-content-utils", desc => "Toggle Navigator Content Utils support",
define => "ENABLE_NAVIGATOR_CONTENT_UTILS", default => (isBlackBerry() || isEfl()), value => \$registerProtocolHandlerSupport },
