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

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: Add exception for mac Created 4 years, 2 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 4276 matching lines...) Expand 10 before | Expand all | Expand 10 after
4287 case CSSValuePanX: 4287 case CSSValuePanX:
4288 return TouchActionPanX; 4288 return TouchActionPanX;
4289 case CSSValuePanUp: 4289 case CSSValuePanUp:
4290 return TouchActionPanUp; 4290 return TouchActionPanUp;
4291 case CSSValuePanDown: 4291 case CSSValuePanDown:
4292 return TouchActionPanDown; 4292 return TouchActionPanDown;
4293 case CSSValuePanY: 4293 case CSSValuePanY:
4294 return TouchActionPanY; 4294 return TouchActionPanY;
4295 case CSSValueManipulation: 4295 case CSSValueManipulation:
4296 return TouchActionManipulation; 4296 return TouchActionManipulation;
4297 case CSSValuePinchZoom:
4298 return TouchActionPinchZoom;
4297 default: 4299 default:
4298 break; 4300 break;
4299 } 4301 }
4300 4302
4301 ASSERT_NOT_REACHED(); 4303 ASSERT_NOT_REACHED();
4302 return TouchActionNone; 4304 return TouchActionNone;
4303 } 4305 }
4304 4306
4305 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) 4307 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
4306 : CSSValue(PrimitiveClass) 4308 : CSSValue(PrimitiveClass)
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
4717 default: 4719 default:
4718 break; 4720 break;
4719 } 4721 }
4720 ASSERT_NOT_REACHED(); 4722 ASSERT_NOT_REACHED();
4721 return ContainsNone; 4723 return ContainsNone;
4722 } 4724 }
4723 4725
4724 } // namespace blink 4726 } // namespace blink
4725 4727
4726 #endif 4728 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698