From 6be1213040b52465909afc1591ec49aad3435b1b Mon Sep 17 00:00:00 2001 From: "mkwst@chromium.org" <mkwst@chromium.org> Date: Wed, 10 Sep 2014 14:14:21 +0000 Subject: [PATCH] Revert of Remove some CSS properties from UseCounters (patchset #1 id:1 of https://codereview.chromium.org/558473002/) Reason for revert: We don't want to remove properties that we still support. Original issue's description: > Remove some CSS properties from UseCounters > > All of these measure stable features except CSSPropertyWebkitCursorVisibility which > is actually removed. > > Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=181680 TBR=rob.buis@samsung.com NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/559073002 git-svn-id: svn://svn.chromium.org/blink/trunk@181731 bbb929c8-8fbe-4397-9dbb-9b2b20218538 --- Source/core/frame/UseCounter.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/core/frame/UseCounter.cpp b/Source/core/frame/UseCounter.cpp index e65f2062da6..f41b562253b 100644 --- a/Source/core/frame/UseCounter.cpp +++ b/Source/core/frame/UseCounter.cpp @@ -269,8 +269,12 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id) case CSSPropertyWebkitColumnSpan: return 225; case CSSPropertyWebkitColumnWidth: return 226; case CSSPropertyWebkitColumns: return 227; - // case CSSPropertyWebkitBoxDecorationBreak: return 228; - // case CSSPropertyWebkitFilter: return 229; +#if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK + case CSSPropertyWebkitBoxDecorationBreak: return 228; +#endif +#if defined(ENABLE_CSS_FILTERS) && ENABLE_CSS_FILTERS + case CSSPropertyWebkitFilter: return 229; +#endif case CSSPropertyAlignContent: return 230; case CSSPropertyAlignItems: return 231; case CSSPropertyAlignSelf: return 232; @@ -386,8 +390,12 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id) // case CSSPropertyWebkitWrapFlow: return 350; // case CSSPropertyWebkitWrapThrough: return 351; // CSSPropertyWebkitWrap was 352. - // case CSSPropertyWebkitTapHighlightColor: return 353; - // case CSSPropertyWebkitAppRegion: return 354; +#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS + case CSSPropertyWebkitTapHighlightColor: return 353; +#endif +#if defined(ENABLE_DRAGGABLE_REGION) && ENABLE_DRAGGABLE_REGION + case CSSPropertyWebkitAppRegion: return 354; +#endif case CSSPropertyClipPath: return 355; case CSSPropertyClipRule: return 356; case CSSPropertyMask: return 357; @@ -429,7 +437,9 @@ int UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(int id) case CSSPropertyVectorEffect: return 393; case CSSPropertyWritingMode: return 394; // CSSPropertyWebkitSvgShadow has been removed, was return 395; - // CSSPropertyWebkitCursorVisibility has been removed, was return 396; +#if defined(ENABLE_CURSOR_VISIBILITY) && ENABLE_CURSOR_VISIBILITY + case CSSPropertyWebkitCursorVisibility: return 396; +#endif // CSSPropertyImageOrientation has been removed, was return 397; // CSSPropertyImageResolution has been removed, was return 398; #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING