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

Side by Side Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

Issue 2126323002: Add support for touch-action: pinch-zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check in scroll begin for pointer count and add test Created 4 years, 3 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) 2004 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2004 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 4 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2011 Sencha, Inc. All rights reserved. 6 * Copyright (C) 2011 Sencha, Inc. All rights reserved.
7 * Copyright (C) 2015 Google Inc. All rights reserved. 7 * Copyright (C) 2015 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueNone)); 950 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueNone));
951 } else if (touchAction == TouchActionManipulation) { 951 } else if (touchAction == TouchActionManipulation) {
952 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueManipulation)) ; 952 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueManipulation)) ;
953 } else { 953 } else {
954 if ((touchAction & TouchActionPanX) == TouchActionPanX) 954 if ((touchAction & TouchActionPanX) == TouchActionPanX)
955 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanX)); 955 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanX));
956 else if (touchAction & TouchActionPanLeft) 956 else if (touchAction & TouchActionPanLeft)
957 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanLeft)); 957 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanLeft));
958 else if (touchAction & TouchActionPanRight) 958 else if (touchAction & TouchActionPanRight)
959 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanRight)) ; 959 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanRight)) ;
960
961 if ((touchAction & TouchActionPanY) == TouchActionPanY) 960 if ((touchAction & TouchActionPanY) == TouchActionPanY)
962 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanY)); 961 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanY));
963 else if (touchAction & TouchActionPanUp) 962 else if (touchAction & TouchActionPanUp)
964 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanUp)); 963 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanUp));
965 else if (touchAction & TouchActionPanDown) 964 else if (touchAction & TouchActionPanDown)
966 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanDown)); 965 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePanDown));
966
967 if ((touchAction & TouchActionPinchZoom) == TouchActionPinchZoom)
968 list->append(*CSSPrimitiveValue::createIdentifier(CSSValuePinchZoom) );
967 } 969 }
970
968 ASSERT(list->length()); 971 ASSERT(list->length());
969 return list; 972 return list;
970 } 973 }
971 974
972 static CSSValue* valueForWillChange(const Vector<CSSPropertyID>& willChangePrope rties, bool willChangeContents, bool willChangeScrollPosition) 975 static CSSValue* valueForWillChange(const Vector<CSSPropertyID>& willChangePrope rties, bool willChangeContents, bool willChangeScrollPosition)
973 { 976 {
974 CSSValueList* list = CSSValueList::createCommaSeparated(); 977 CSSValueList* list = CSSValueList::createCommaSeparated();
975 if (willChangeContents) 978 if (willChangeContents)
976 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueContents)); 979 list->append(*CSSPrimitiveValue::createIdentifier(CSSValueContents));
977 if (willChangeScrollPosition) 980 if (willChangeScrollPosition)
(...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after
3020 case CSSPropertyAll: 3023 case CSSPropertyAll:
3021 return nullptr; 3024 return nullptr;
3022 default: 3025 default:
3023 break; 3026 break;
3024 } 3027 }
3025 ASSERT_NOT_REACHED(); 3028 ASSERT_NOT_REACHED();
3026 return nullptr; 3029 return nullptr;
3027 } 3030 }
3028 3031
3029 } // namespace blink 3032 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698