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

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

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
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('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) 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 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ; 708 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated() ;
709 if (touchAction == TouchActionAuto) 709 if (touchAction == TouchActionAuto)
710 list->append(cssValuePool().createIdentifierValue(CSSValueAuto)); 710 list->append(cssValuePool().createIdentifierValue(CSSValueAuto));
711 if (touchAction & TouchActionNone) { 711 if (touchAction & TouchActionNone) {
712 ASSERT(touchAction == TouchActionNone); 712 ASSERT(touchAction == TouchActionNone);
713 list->append(cssValuePool().createIdentifierValue(CSSValueNone)); 713 list->append(cssValuePool().createIdentifierValue(CSSValueNone));
714 } 714 }
715 if (touchAction == (TouchActionPanX | TouchActionPanY | TouchActionPinchZoom )) { 715 if (touchAction == (TouchActionPanX | TouchActionPanY | TouchActionPinchZoom )) {
716 list->append(cssValuePool().createIdentifierValue(CSSValueManipulation)) ; 716 list->append(cssValuePool().createIdentifierValue(CSSValueManipulation)) ;
717 } else { 717 } else {
718 if (touchAction & TouchActionPanX) 718 if ((touchAction & TouchActionPanX) == TouchActionPanX)
719 list->append(cssValuePool().createIdentifierValue(CSSValuePanX)); 719 list->append(cssValuePool().createIdentifierValue(CSSValuePanX));
720 if (touchAction & TouchActionPanY) 720 else if (touchAction & TouchActionPanLeft)
721 list->append(cssValuePool().createIdentifierValue(CSSValuePanLeft));
722 else if (touchAction & TouchActionPanRight)
723 list->append(cssValuePool().createIdentifierValue(CSSValuePanRight)) ;
724
725 if ((touchAction & TouchActionPanY) == TouchActionPanY)
721 list->append(cssValuePool().createIdentifierValue(CSSValuePanY)); 726 list->append(cssValuePool().createIdentifierValue(CSSValuePanY));
727 else if (touchAction & TouchActionPanUp)
728 list->append(cssValuePool().createIdentifierValue(CSSValuePanUp));
729 else if (touchAction & TouchActionPanDown)
730 list->append(cssValuePool().createIdentifierValue(CSSValuePanDown));
722 } 731 }
723 ASSERT(list->length()); 732 ASSERT(list->length());
724 return list.release(); 733 return list.release();
725 } 734 }
726 735
727 static PassRefPtrWillBeRawPtr<CSSValue> valueForWillChange(const Vector<CSSPrope rtyID>& willChangeProperties, bool willChangeContents, bool willChangeScrollPosi tion) 736 static PassRefPtrWillBeRawPtr<CSSValue> valueForWillChange(const Vector<CSSPrope rtyID>& willChangeProperties, bool willChangeContents, bool willChangeScrollPosi tion)
728 { 737 {
729 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ; 738 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createCommaSeparated() ;
730 if (willChangeContents) 739 if (willChangeContents)
731 list->append(cssValuePool().createIdentifierValue(CSSValueContents)); 740 list->append(cssValuePool().createIdentifierValue(CSSValueContents));
(...skipping 1811 matching lines...) Expand 10 before | Expand all | Expand 10 after
2543 case CSSPropertyAll: 2552 case CSSPropertyAll:
2544 return nullptr; 2553 return nullptr;
2545 default: 2554 default:
2546 break; 2555 break;
2547 } 2556 }
2548 ASSERT_NOT_REACHED(); 2557 ASSERT_NOT_REACHED();
2549 return nullptr; 2558 return nullptr;
2550 } 2559 }
2551 2560
2552 } 2561 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698