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

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 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
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 4859 matching lines...) Expand 10 before | Expand all | Expand 10 after
4870 : CSSValue(PrimitiveClass) 4870 : CSSValue(PrimitiveClass)
4871 { 4871 {
4872 m_primitiveUnitType = CSS_VALUE_ID; 4872 m_primitiveUnitType = CSS_VALUE_ID;
4873 switch (t) { 4873 switch (t) {
4874 case TouchActionNone: 4874 case TouchActionNone:
4875 m_value.valueID = CSSValueNone; 4875 m_value.valueID = CSSValueNone;
4876 break; 4876 break;
4877 case TouchActionAuto: 4877 case TouchActionAuto:
4878 m_value.valueID = CSSValueAuto; 4878 m_value.valueID = CSSValueAuto;
4879 break; 4879 break;
4880 case TouchActionPanX:
4881 m_value.valueID = CSSValuePanX;
4882 break;
4883 case TouchActionPanY:
4884 m_value.valueID = CSSValuePanY;
4885 break;
4880 } 4886 }
4881 } 4887 }
4882 4888
4883 template<> inline CSSPrimitiveValue::operator TouchAction() const 4889 template<> inline CSSPrimitiveValue::operator TouchAction() const
4884 { 4890 {
4885 ASSERT(isValueID()); 4891 ASSERT(isValueID());
4886 switch (m_value.valueID) { 4892 switch (m_value.valueID) {
4887 case CSSValueNone: 4893 case CSSValueNone:
4888 return TouchActionNone; 4894 return TouchActionNone;
4889 case CSSValueAuto: 4895 case CSSValueAuto:
4890 return TouchActionAuto; 4896 return TouchActionAuto;
4897 case CSSValuePanX:
4898 return TouchActionPanX;
4899 case CSSValuePanY:
4900 return TouchActionPanY;
4891 default: 4901 default:
4892 break; 4902 break;
4893 } 4903 }
4894 4904
4895 ASSERT_NOT_REACHED(); 4905 ASSERT_NOT_REACHED();
4896 return TouchActionNone; 4906 return TouchActionNone;
4897 } 4907 }
4898 4908
4899 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) 4909 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
4900 : CSSValue(PrimitiveClass) 4910 : CSSValue(PrimitiveClass)
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
4989 default: 4999 default:
4990 break; 5000 break;
4991 } 5001 }
4992 ASSERT_NOT_REACHED(); 5002 ASSERT_NOT_REACHED();
4993 return ContentBox; 5003 return ContentBox;
4994 } 5004 }
4995 5005
4996 } 5006 }
4997 5007
4998 #endif 5008 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698