Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: add cstdlib Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 28 matching lines...) Expand all
39 #include "core/css/CSSToLengthConversionData.h" 39 #include "core/css/CSSToLengthConversionData.h"
40 #include "core/style/ComputedStyleConstants.h" 40 #include "core/style/ComputedStyleConstants.h"
41 #include "core/style/LineClampValue.h" 41 #include "core/style/LineClampValue.h"
42 #include "core/style/SVGComputedStyleDefs.h" 42 #include "core/style/SVGComputedStyleDefs.h"
43 #include "platform/Length.h" 43 #include "platform/Length.h"
44 #include "platform/ThemeTypes.h" 44 #include "platform/ThemeTypes.h"
45 #include "platform/fonts/FontDescription.h" 45 #include "platform/fonts/FontDescription.h"
46 #include "platform/fonts/FontSmoothingMode.h" 46 #include "platform/fonts/FontSmoothingMode.h"
47 #include "platform/fonts/TextRenderingMode.h" 47 #include "platform/fonts/TextRenderingMode.h"
48 #include "platform/graphics/GraphicsTypes.h" 48 #include "platform/graphics/GraphicsTypes.h"
49 #include "platform/graphics/TouchAction.h"
49 #include "platform/scroll/ScrollableArea.h" 50 #include "platform/scroll/ScrollableArea.h"
50 #include "platform/text/TextRun.h" 51 #include "platform/text/TextRun.h"
51 #include "platform/text/WritingMode.h" 52 #include "platform/text/WritingMode.h"
52 #include "platform/wtf/MathExtras.h" 53 #include "platform/wtf/MathExtras.h"
53 #include "public/platform/WebBlendMode.h" 54 #include "public/platform/WebBlendMode.h"
54 55
55 namespace blink { 56 namespace blink {
56 57
57 // TODO(sashab): Move these to CSSPrimitiveValue.h. 58 // TODO(sashab): Move these to CSSPrimitiveValue.h.
58 template <> 59 template <>
(...skipping 2908 matching lines...) Expand 10 before | Expand all | Expand 10 after
2967 } 2968 }
2968 2969
2969 NOTREACHED(); 2970 NOTREACHED();
2970 return MT_LUMINANCE; 2971 return MT_LUMINANCE;
2971 } 2972 }
2972 2973
2973 template <> 2974 template <>
2974 inline TouchAction CSSIdentifierValue::ConvertTo() const { 2975 inline TouchAction CSSIdentifierValue::ConvertTo() const {
2975 switch (value_id_) { 2976 switch (value_id_) {
2976 case CSSValueNone: 2977 case CSSValueNone:
2977 return kTouchActionNone; 2978 return TouchAction::kTouchActionNone;
2978 case CSSValueAuto: 2979 case CSSValueAuto:
2979 return kTouchActionAuto; 2980 return TouchAction::kTouchActionAuto;
2980 case CSSValuePanLeft: 2981 case CSSValuePanLeft:
2981 return kTouchActionPanLeft; 2982 return TouchAction::kTouchActionPanLeft;
2982 case CSSValuePanRight: 2983 case CSSValuePanRight:
2983 return kTouchActionPanRight; 2984 return TouchAction::kTouchActionPanRight;
2984 case CSSValuePanX: 2985 case CSSValuePanX:
2985 return kTouchActionPanX; 2986 return TouchAction::kTouchActionPanX;
2986 case CSSValuePanUp: 2987 case CSSValuePanUp:
2987 return kTouchActionPanUp; 2988 return TouchAction::kTouchActionPanUp;
2988 case CSSValuePanDown: 2989 case CSSValuePanDown:
2989 return kTouchActionPanDown; 2990 return TouchAction::kTouchActionPanDown;
2990 case CSSValuePanY: 2991 case CSSValuePanY:
2991 return kTouchActionPanY; 2992 return TouchAction::kTouchActionPanY;
2992 case CSSValueManipulation: 2993 case CSSValueManipulation:
2993 return kTouchActionManipulation; 2994 return TouchAction::kTouchActionManipulation;
2994 case CSSValuePinchZoom: 2995 case CSSValuePinchZoom:
2995 return kTouchActionPinchZoom; 2996 return TouchAction::kTouchActionPinchZoom;
2996 default: 2997 default:
2997 break; 2998 break;
2998 } 2999 }
2999 3000
3000 NOTREACHED(); 3001 NOTREACHED();
3001 return kTouchActionNone; 3002 return TouchAction::kTouchActionNone;
3002 } 3003 }
3003 3004
3004 template <> 3005 template <>
3005 inline CSSIdentifierValue::CSSIdentifierValue(EIsolation i) 3006 inline CSSIdentifierValue::CSSIdentifierValue(EIsolation i)
3006 : CSSValue(kIdentifierClass) { 3007 : CSSValue(kIdentifierClass) {
3007 switch (i) { 3008 switch (i) {
3008 case kIsolationAuto: 3009 case kIsolationAuto:
3009 value_id_ = CSSValueAuto; 3010 value_id_ = CSSValueAuto;
3010 break; 3011 break;
3011 case kIsolationIsolate: 3012 case kIsolationIsolate:
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
3412 default: 3413 default:
3413 break; 3414 break;
3414 } 3415 }
3415 NOTREACHED(); 3416 NOTREACHED();
3416 return kContainsNone; 3417 return kContainsNone;
3417 } 3418 }
3418 3419
3419 } // namespace blink 3420 } // namespace blink
3420 3421
3421 #endif 3422 #endif
OLDNEW
« no previous file with comments | « content/renderer/render_widget.cc ('k') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698