Diff
Modified: trunk/LayoutTests/ChangeLog (138068 => 138069)
--- trunk/LayoutTests/ChangeLog 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/LayoutTests/ChangeLog 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1,3 +1,13 @@
+2012-12-18 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102579
+ [mac] Enable scaled cursors
+
+ Reviewed by Dean Jackson.
+
+ Un-skip these tests now that the feature is enabled.
+ * platform/mac/TestExpectations:
+
2012-12-18 Dominic Mazzoni <dmazz...@google.com>
[chromium] Unreviewed gardening.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (138068 => 138069)
--- trunk/LayoutTests/platform/mac/TestExpectations 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1238,10 +1238,6 @@
# Mountain Lion and prior do not support custom media data loading
Bug(jernoble) [ MountainLion Lion SnowLeopard ] media/video-src-blob.html
-# Needs ENABLE(MOUSE_CURSOR_SCALE)
-webkit.org/b/102579 fast/css/cursor-parsing-image-set.html [ Failure ]
-webkit.org/b/102579 fast/events/mouse-cursor-image-set.html [ Failure ]
-
# Mountain Lion and prior do not allow access to in-band text tracks
webkit.org/b/103663 [ MountainLion Lion SnowLeopard ] media/track/track-in-band.html
webkit.org/b/103663 [ MountainLion Lion SnowLeopard ] media/track/track-in-band-cues-added-once.html
Modified: trunk/Source/_javascript_Core/ChangeLog (138068 => 138069)
--- trunk/Source/_javascript_Core/ChangeLog 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1,3 +1,12 @@
+2012-12-18 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102579
+ [mac] Enable scaled cursors
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-12-18 Mark Hahnenberg <mhahnenb...@apple.com>
Restrictions on oversize CopiedBlock allocations should be relaxed
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (138068 => 138069)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2012-12-18 22:25:11 UTC (rev 138069)
@@ -114,7 +114,7 @@
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MICRODATA = ;
-ENABLE_MOUSE_CURSOR_SCALE = ;
+ENABLE_MOUSE_CURSOR_SCALE = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
Modified: trunk/Source/WebCore/ChangeLog (138068 => 138069)
--- trunk/Source/WebCore/ChangeLog 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebCore/ChangeLog 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1,3 +1,18 @@
+2012-12-18 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102579
+ [mac] Enable scaled cursors
+
+ Reviewed by Dean Jackson.
+
+ Not much is required to get this turned on. We just need the feature to be
+ defined, and we need to initialize m_imageScaleFactor in the Cursor constructors.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/mac/CursorMac.mm:
+ (WebCore::Cursor::Cursor):
+ (WebCore::Cursor::operator=):
+
2012-12-18 Joseph Pecoraro <pecor...@apple.com>
[Mac] Add Build Phase to Check Headers for Inappropriate Macros (Platform.h macros)
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (138068 => 138069)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2012-12-18 22:25:11 UTC (rev 138069)
@@ -114,7 +114,7 @@
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MICRODATA = ;
-ENABLE_MOUSE_CURSOR_SCALE = ;
+ENABLE_MOUSE_CURSOR_SCALE = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
Modified: trunk/Source/WebCore/platform/mac/CursorMac.mm (138068 => 138069)
--- trunk/Source/WebCore/platform/mac/CursorMac.mm 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebCore/platform/mac/CursorMac.mm 2012-12-18 22:25:11 UTC (rev 138069)
@@ -340,6 +340,7 @@
: m_type(other.m_type)
, m_image(other.m_image)
, m_hotSpot(other.m_hotSpot)
+ , m_imageScaleFactor(other.m_imageScaleFactor)
, m_platformCursor(other.m_platformCursor)
{
}
@@ -349,6 +350,7 @@
m_type = other.m_type;
m_image = other.m_image;
m_hotSpot = other.m_hotSpot;
+ m_imageScaleFactor = other.m_imageScaleFactor;
m_platformCursor = other.m_platformCursor;
return *this;
}
Modified: trunk/Source/WebKit/mac/ChangeLog (138068 => 138069)
--- trunk/Source/WebKit/mac/ChangeLog 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1,3 +1,12 @@
+2012-12-18 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102579
+ [mac] Enable scaled cursors
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-12-16 Levi Weintraub <le...@chromium.org>
Push pixel snapping logic into TransformState
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (138068 => 138069)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2012-12-18 22:25:11 UTC (rev 138069)
@@ -114,7 +114,7 @@
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MICRODATA = ;
-ENABLE_MOUSE_CURSOR_SCALE = ;
+ENABLE_MOUSE_CURSOR_SCALE = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
Modified: trunk/Source/WebKit2/ChangeLog (138068 => 138069)
--- trunk/Source/WebKit2/ChangeLog 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-18 22:25:11 UTC (rev 138069)
@@ -1,3 +1,12 @@
+2012-12-18 Beth Dakin <bda...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=102579
+ [mac] Enable scaled cursors
+
+ Reviewed by Dean Jackson.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2012-12-18 Joseph Pecoraro <pecor...@apple.com>
[Mac] Add Build Phase to Check Headers for Inappropriate Macros (Platform.h macros)
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (138068 => 138069)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-12-18 22:16:07 UTC (rev 138068)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2012-12-18 22:25:11 UTC (rev 138069)
@@ -114,7 +114,7 @@
ENABLE_METER_ELEMENT = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MICRODATA = ;
-ENABLE_MOUSE_CURSOR_SCALE = ;
+ENABLE_MOUSE_CURSOR_SCALE = ENABLE_MOUSE_CURSOR_SCALE;
ENABLE_MUTATION_OBSERVERS = ENABLE_MUTATION_OBSERVERS;
ENABLE_NAVIGATOR_CONTENT_UTILS = ;
ENABLE_NOTIFICATIONS = $(ENABLE_NOTIFICATIONS_$(PLATFORM_NAME));
