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

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

Issue 1137483003: Implement direction-specific touch-action values (blink side) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix minor nit from patch set 1 Created 5 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. (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 4334 matching lines...) Expand 10 before | Expand all | Expand 10 after
4345 } 4345 }
4346 4346
4347 template<> inline CSSPrimitiveValue::operator TouchAction() const 4347 template<> inline CSSPrimitiveValue::operator TouchAction() const
4348 { 4348 {
4349 ASSERT(isValueID()); 4349 ASSERT(isValueID());
4350 switch (m_value.valueID) { 4350 switch (m_value.valueID) {
4351 case CSSValueNone: 4351 case CSSValueNone:
4352 return TouchActionNone; 4352 return TouchActionNone;
4353 case CSSValueAuto: 4353 case CSSValueAuto:
4354 return TouchActionAuto; 4354 return TouchActionAuto;
4355 case CSSValuePanLeft:
4356 return TouchActionPanLeft;
4357 case CSSValuePanRight:
4358 return TouchActionPanRight;
4355 case CSSValuePanX: 4359 case CSSValuePanX:
4356 return TouchActionPanX; 4360 return TouchActionPanX;
4361 case CSSValuePanUp:
4362 return TouchActionPanUp;
4363 case CSSValuePanDown:
4364 return TouchActionPanDown;
4357 case CSSValuePanY: 4365 case CSSValuePanY:
4358 return TouchActionPanY; 4366 return TouchActionPanY;
4359 case CSSValueManipulation: 4367 case CSSValueManipulation:
4360 return TouchActionPanX | TouchActionPanY | TouchActionPinchZoom; 4368 return TouchActionPanX | TouchActionPanY | TouchActionPinchZoom;
4361 default: 4369 default:
4362 break; 4370 break;
4363 } 4371 }
4364 4372
4365 ASSERT_NOT_REACHED(); 4373 ASSERT_NOT_REACHED();
4366 return TouchActionNone; 4374 return TouchActionNone;
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
4707 default: 4715 default:
4708 break; 4716 break;
4709 } 4717 }
4710 ASSERT_NOT_REACHED(); 4718 ASSERT_NOT_REACHED();
4711 return ScrollBehaviorAuto; 4719 return ScrollBehaviorAuto;
4712 } 4720 }
4713 4721
4714 } // namespace blink 4722 } // namespace blink
4715 4723
4716 #endif 4724 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/touch-action-parsing-expected.txt ('k') | Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698