Modified: trunk/Source/WebCore/ChangeLog (131585 => 131586)
--- trunk/Source/WebCore/ChangeLog 2012-10-17 11:28:39 UTC (rev 131585)
+++ trunk/Source/WebCore/ChangeLog 2012-10-17 11:30:23 UTC (rev 131586)
@@ -1,3 +1,20 @@
+2012-10-17 Luke Macpherson <[email protected]>
+
+ Move handling of CSSPropertyPointerEvents from StyleResolver into StyleBuilder.
+ https://bugs.webkit.org/show_bug.cgi?id=99536
+
+ Reviewed by Alexis Menard.
+
+ One small step towards removing the giant switch statement in StyleResolver,
+ this patch moves pointer event property into StyleBuilder.
+
+ Covered by fast/events/pointer-events.html and fast/events/pointer-events-2.html.
+
+ * css/StyleBuilder.cpp:
+ (WebCore::StyleBuilder::StyleBuilder):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
2012-10-17 Keishi Hattori <[email protected]>
Localized date should be based on LDML
Modified: trunk/Source/WebCore/css/StyleBuilder.cpp (131585 => 131586)
--- trunk/Source/WebCore/css/StyleBuilder.cpp 2012-10-17 11:28:39 UTC (rev 131585)
+++ trunk/Source/WebCore/css/StyleBuilder.cpp 2012-10-17 11:30:23 UTC (rev 131586)
@@ -1906,6 +1906,7 @@
setPropertyHandler(CSSPropertyPageBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakAfter, EPageBreak, &RenderStyle::setPageBreakAfter, EPageBreak, &RenderStyle::initialPageBreak>::createHandler());
setPropertyHandler(CSSPropertyPageBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakBefore, EPageBreak, &RenderStyle::setPageBreakBefore, EPageBreak, &RenderStyle::initialPageBreak>::createHandler());
setPropertyHandler(CSSPropertyPageBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakInside, EPageBreak, &RenderStyle::setPageBreakInside, EPageBreak, &RenderStyle::initialPageBreak>::createHandler());
+ setPropertyHandler(CSSPropertyPointerEvents, ApplyPropertyDefault<EPointerEvents, &RenderStyle::pointerEvents, EPointerEvents, &RenderStyle::setPointerEvents, EPointerEvents, &RenderStyle::initialPointerEvents>::createHandler());
setPropertyHandler(CSSPropertyPosition, ApplyPropertyDefault<EPosition, &RenderStyle::position, EPosition, &RenderStyle::setPosition, EPosition, &RenderStyle::initialPosition>::createHandler());
setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
setPropertyHandler(CSSPropertyRight, ApplyPropertyLength<&RenderStyle::right, &RenderStyle::setRight, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (131585 => 131586)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-10-17 11:28:39 UTC (rev 131585)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-10-17 11:30:23 UTC (rev 131586)
@@ -3459,11 +3459,6 @@
else if (isInherit)
m_style->inheritTransitions(m_parentStyle->transitions());
return;
- case CSSPropertyPointerEvents:
- {
- HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(pointerEvents, PointerEvents)
- return;
- }
#if ENABLE(TOUCH_EVENTS)
case CSSPropertyWebkitTapHighlightColor: {
HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
@@ -3747,6 +3742,7 @@
case CSSPropertyPageBreakAfter:
case CSSPropertyPageBreakBefore:
case CSSPropertyPageBreakInside:
+ case CSSPropertyPointerEvents:
case CSSPropertyPosition:
case CSSPropertyResize:
case CSSPropertyRight:
