Modified: trunk/Source/WebCore/ChangeLog (209301 => 209302)
--- trunk/Source/WebCore/ChangeLog 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/ChangeLog 2016-12-03 19:56:49 UTC (rev 209302)
@@ -1,3 +1,15 @@
+2016-12-03 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Support Dashboard Regions
+ https://bugs.webkit.org/show_bug.cgi?id=165357
+
+ Reviewed by Daniel Bates.
+
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeWebkitDashboardRegion):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+
2016-12-02 Simon Fraser <[email protected]>
Improve the behavior of scroll-into-view when the target is inside position:fixed
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (209301 => 209302)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-12-03 19:56:49 UTC (rev 209302)
@@ -1168,6 +1168,7 @@
-webkit-named-image
filter
-webkit-filter
+dashboard-region
// deprecated gradients
from
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209301 => 209302)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-03 19:05:22 UTC (rev 209301)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-03 19:56:49 UTC (rev 209302)
@@ -66,6 +66,9 @@
#include "CSSVariableParser.h"
#include "CSSVariableReferenceValue.h"
#include "Counter.h"
+#if ENABLE(DASHBOARD_SUPPORT)
+#include "DashboardRegion.h"
+#endif
#include "FontFace.h"
#include "HashTools.h"
// FIXME-NEWPARSER: Replace Pair and Rect with actual CSSValue subclasses (CSSValuePair and CSSQuadValue).
@@ -1466,7 +1469,7 @@
return consumeIdent<CSSValueNormal, CSSValueAlternate, CSSValueReverse, CSSValueAlternateReverse>(range);
case CSSPropertyAnimationDuration:
case CSSPropertyTransitionDuration:
- return consumeTime(range, context.mode, ValueRangeNonNegative, UnitlessQuirk::Forbid);
+ return consumeTime(range, context.mode, ValueRangeNonNegative, UnitlessQuirk::Allow);
case CSSPropertyAnimationFillMode:
return consumeIdent<CSSValueNone, CSSValueForwards, CSSValueBackwards, CSSValueBoth>(range);
case CSSPropertyAnimationIterationCount:
@@ -3592,6 +3595,98 @@
return list;
}
+#if ENABLE(DASHBOARD_SUPPORT)
+
+static RefPtr<CSSValue> consumeWebkitDashboardRegion(CSSParserTokenRange& range, CSSParserMode mode)
+{
+ if (range.peek().id() == CSSValueNone)
+ return consumeIdent(range);
+
+ auto firstRegion = DashboardRegion::create();
+ DashboardRegion* region = nullptr;
+
+ bool requireCommas = false;
+
+ while (!range.atEnd()) {
+ if (!region)
+ region = firstRegion.ptr();
+ else {
+ auto nextRegion = DashboardRegion::create();
+ region->m_next = nextRegion.copyRef();
+ region = nextRegion.ptr();
+ }
+
+ if (range.peek().functionId() != CSSValueDashboardRegion)
+ return nullptr;
+
+ CSSParserTokenRange rangeCopy = range;
+ CSSParserTokenRange args = consumeFunction(rangeCopy);
+
+ // First arg is a label.
+ if (args.peek().type() != IdentToken)
+ return nullptr;
+ region->m_label = args.consumeIncludingWhitespace().value().toString();
+
+ // Comma is optional, so don't fail if we can't consume one.
+ requireCommas = consumeCommaIncludingWhitespace(args);
+
+ // Second arg is a type.
+ if (args.peek().type() != IdentToken)
+ return nullptr;
+ region->m_geometryType = args.consumeIncludingWhitespace().value().toString();
+ if (equalLettersIgnoringASCIICase(region->m_geometryType, "circle"))
+ region->m_isCircle = true;
+ else if (equalLettersIgnoringASCIICase(region->m_geometryType, "rectangle"))
+ region->m_isRectangle = true;
+ else
+ return nullptr;
+
+ if (args.atEnd()) {
+ // This originally used CSSValueInvalid by accident. It might be more logical to use something else.
+ RefPtr<CSSPrimitiveValue> amount = CSSValuePool::singleton().createIdentifierValue(CSSValueInvalid);
+ region->setTop(amount.copyRef());
+ region->setRight(amount.copyRef());
+ region->setBottom(amount.copyRef());
+ region->setLeft(WTFMove(amount));
+ range = rangeCopy;
+ continue;
+ }
+
+ // Next four arguments must be offset numbers or auto.
+ for (int i = 0; i < 4; ++i) {
+ if (args.atEnd() || (requireCommas && !consumeCommaIncludingWhitespace(args)))
+ return nullptr;
+
+ if (args.atEnd())
+ return nullptr;
+
+ RefPtr<CSSPrimitiveValue> amount;
+ if (args.peek().id() == CSSValueAuto)
+ amount = consumeIdent(args);
+ else
+ amount = consumeLength(args, mode, ValueRangeAll);
+
+ if (!i)
+ region->setTop(WTFMove(amount));
+ else if (i == 1)
+ region->setRight(WTFMove(amount));
+ else if (i == 2)
+ region->setBottom(WTFMove(amount));
+ else
+ region->setLeft(WTFMove(amount));
+ }
+
+ if (!args.atEnd())
+ return nullptr;
+
+ range = rangeCopy;
+ }
+
+ return CSSValuePool::singleton().createValue(RefPtr<DashboardRegion>(WTFMove(firstRegion)));
+}
+
+#endif
+
RefPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID property, CSSPropertyID currentShorthand)
{
if (CSSParserFastPaths::isKeywordPropertyID(property)) {
@@ -4033,6 +4128,10 @@
return consumeWebkitAspectRatio(m_range);
case CSSPropertyWebkitTextEmphasisPosition:
return consumeTextEmphasisPosition(m_range);
+#if ENABLE(DASHBOARD_SUPPORT)
+ case CSSPropertyWebkitDashboardRegion:
+ return consumeWebkitDashboardRegion(m_range, m_context.mode);
+#endif
default:
return nullptr;
}