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

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

Issue 1422513006: Simplify TouchAction enum to be a simple bit flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix computed style / layout tests and CR feedback Created 5 years, 1 month 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 4236 matching lines...) Expand 10 before | Expand all | Expand 10 after
4247 return TouchActionPanRight; 4247 return TouchActionPanRight;
4248 case CSSValuePanX: 4248 case CSSValuePanX:
4249 return TouchActionPanX; 4249 return TouchActionPanX;
4250 case CSSValuePanUp: 4250 case CSSValuePanUp:
4251 return TouchActionPanUp; 4251 return TouchActionPanUp;
4252 case CSSValuePanDown: 4252 case CSSValuePanDown:
4253 return TouchActionPanDown; 4253 return TouchActionPanDown;
4254 case CSSValuePanY: 4254 case CSSValuePanY:
4255 return TouchActionPanY; 4255 return TouchActionPanY;
4256 case CSSValueManipulation: 4256 case CSSValueManipulation:
4257 return TouchActionPanX | TouchActionPanY | TouchActionPinchZoom; 4257 return TouchActionManipulation;
4258 default: 4258 default:
4259 break; 4259 break;
4260 } 4260 }
4261 4261
4262 ASSERT_NOT_REACHED(); 4262 ASSERT_NOT_REACHED();
4263 return TouchActionNone; 4263 return TouchActionNone;
4264 } 4264 }
4265 4265
4266 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) 4266 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
4267 : CSSValue(PrimitiveClass) 4267 : CSSValue(PrimitiveClass)
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
4618 default: 4618 default:
4619 break; 4619 break;
4620 } 4620 }
4621 ASSERT_NOT_REACHED(); 4621 ASSERT_NOT_REACHED();
4622 return ScrollSnapTypeNone; 4622 return ScrollSnapTypeNone;
4623 } 4623 }
4624 4624
4625 } // namespace blink 4625 } // namespace blink
4626 4626
4627 #endif 4627 #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