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

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

Issue 87973002: add pan-x and pan-y support to CSS touch-action parsing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments and merge to trunk Created 7 years 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
« no previous file with comments | « Source/core/css/CSSParser-in.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4848 matching lines...) Expand 10 before | Expand all | Expand 10 after
4859 case CSSValueAlpha: 4859 case CSSValueAlpha:
4860 return MT_ALPHA; 4860 return MT_ALPHA;
4861 default: 4861 default:
4862 break; 4862 break;
4863 } 4863 }
4864 4864
4865 ASSERT_NOT_REACHED(); 4865 ASSERT_NOT_REACHED();
4866 return MT_LUMINANCE; 4866 return MT_LUMINANCE;
4867 } 4867 }
4868 4868
4869 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchAction t)
4870 : CSSValue(PrimitiveClass)
4871 {
4872 m_primitiveUnitType = CSS_VALUE_ID;
4873 switch (t) {
4874 case TouchActionNone:
4875 m_value.valueID = CSSValueNone;
4876 break;
4877 case TouchActionAuto:
4878 m_value.valueID = CSSValueAuto;
4879 break;
4880 }
4881 }
4882
4883 template<> inline CSSPrimitiveValue::operator TouchAction() const 4869 template<> inline CSSPrimitiveValue::operator TouchAction() const
4884 { 4870 {
4885 ASSERT(isValueID()); 4871 ASSERT(isValueID());
4886 switch (m_value.valueID) { 4872 switch (m_value.valueID) {
4887 case CSSValueNone: 4873 case CSSValueNone:
4888 return TouchActionNone; 4874 return TouchActionNone;
4889 case CSSValueAuto: 4875 case CSSValueAuto:
4890 return TouchActionAuto; 4876 return TouchActionAuto;
4877 case CSSValuePanX:
4878 return TouchActionPanX;
4879 case CSSValuePanY:
4880 return TouchActionPanY;
4891 default: 4881 default:
4892 break; 4882 break;
4893 } 4883 }
4894 4884
4895 ASSERT_NOT_REACHED(); 4885 ASSERT_NOT_REACHED();
4896 return TouchActionNone; 4886 return TouchActionNone;
4897 } 4887 }
4898 4888
4899 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) 4889 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
4900 : CSSValue(PrimitiveClass) 4890 : CSSValue(PrimitiveClass)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
4989 default: 4979 default:
4990 break; 4980 break;
4991 } 4981 }
4992 ASSERT_NOT_REACHED(); 4982 ASSERT_NOT_REACHED();
4993 return ContentBox; 4983 return ContentBox;
4994 } 4984 }
4995 4985
4996 } 4986 }
4997 4987
4998 #endif 4988 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSParser-in.cpp ('k') | Source/core/css/CSSProperties.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698