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

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

Issue 2126323002: Add support for touch-action: pinch-zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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. (http://www.torchmo bile.com/) 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 4235 matching lines...) Expand 10 before | Expand all | Expand 10 after
4246 case CSSValuePanX: 4246 case CSSValuePanX:
4247 return TouchActionPanX; 4247 return TouchActionPanX;
4248 case CSSValuePanUp: 4248 case CSSValuePanUp:
4249 return TouchActionPanUp; 4249 return TouchActionPanUp;
4250 case CSSValuePanDown: 4250 case CSSValuePanDown:
4251 return TouchActionPanDown; 4251 return TouchActionPanDown;
4252 case CSSValuePanY: 4252 case CSSValuePanY:
4253 return TouchActionPanY; 4253 return TouchActionPanY;
4254 case CSSValueManipulation: 4254 case CSSValueManipulation:
4255 return TouchActionManipulation; 4255 return TouchActionManipulation;
4256 case CSSValuePinchZoom:
4257 return TouchActionPinchZoom;
4256 default: 4258 default:
4257 break; 4259 break;
4258 } 4260 }
4259 4261
4260 ASSERT_NOT_REACHED(); 4262 ASSERT_NOT_REACHED();
4261 return TouchActionNone; 4263 return TouchActionNone;
4262 } 4264 }
4263 4265
4264 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) 4266 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
4265 : CSSValue(PrimitiveClass) 4267 : CSSValue(PrimitiveClass)
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
4669 default: 4671 default:
4670 break; 4672 break;
4671 } 4673 }
4672 ASSERT_NOT_REACHED(); 4674 ASSERT_NOT_REACHED();
4673 return ContainsNone; 4675 return ContainsNone;
4674 } 4676 }
4675 4677
4676 } // namespace blink 4678 } // namespace blink
4677 4679
4678 #endif 4680 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698