Title: [137367] trunk/Source/WebCore
- Revision
- 137367
- Author
- [email protected]
- Date
- 2012-12-11 15:16:18 -0800 (Tue, 11 Dec 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=104725
Crash in EventHandler::selectCursor() on Mac bots running
fast/events/mouse-cursor-image-set.html
Reviewed by Tim Horton.
https://bugs.webkit.org/show_bug.cgi?id=99493 enabled image-set for
the CSS cursor property. Most of the change is guarded behind #if
ENABLE(MOUSE_CURSOR_SCALE). However, image-set was still allowed to
parse for the cursor property as long as image-set is enabled
(which is the current state on the Mac). This would lead to an
inconsistent state where style information would reflect a world
where mouse cursor scaling is enabled even though nothing else on
the Mac would.
The parsing should also be guarded by the cursor scaling flag.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137366 => 137367)
--- trunk/Source/WebCore/ChangeLog 2012-12-11 23:11:20 UTC (rev 137366)
+++ trunk/Source/WebCore/ChangeLog 2012-12-11 23:16:18 UTC (rev 137367)
@@ -1,3 +1,24 @@
+2012-12-11 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=104725
+ Crash in EventHandler::selectCursor() on Mac bots running
+ fast/events/mouse-cursor-image-set.html
+
+ Reviewed by Tim Horton.
+
+ https://bugs.webkit.org/show_bug.cgi?id=99493 enabled image-set for
+ the CSS cursor property. Most of the change is guarded behind #if
+ ENABLE(MOUSE_CURSOR_SCALE). However, image-set was still allowed to
+ parse for the cursor property as long as image-set is enabled
+ (which is the current state on the Mac). This would lead to an
+ inconsistent state where style information would reflect a world
+ where mouse cursor scaling is enabled even though nothing else on
+ the Mac would.
+
+ The parsing should also be guarded by the cursor scaling flag.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+
2012-12-11 Emil A Eklund <[email protected]>
Clamp out-of-range numbers in CSS
Modified: trunk/Source/WebCore/css/CSSParser.cpp (137366 => 137367)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-12-11 23:11:20 UTC (rev 137366)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-12-11 23:16:18 UTC (rev 137367)
@@ -1925,7 +1925,7 @@
String uri = value->string;
if (!uri.isNull())
image = CSSImageValue::create(completeURL(uri));
-#if ENABLE(CSS_IMAGE_SET)
+#if ENABLE(CSS_IMAGE_SET) && ENABLE(MOUSE_CURSOR_SCALE)
} else if (value->unit == CSSParserValue::Function && equalIgnoringCase(value->function->name, "-webkit-image-set(")) {
image = parseImageSet(m_valueList.get());
if (!image)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
