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

Side by Side Diff: Source/core/css/resolver/StyleResolver.cpp

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: 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 case CSSPropertyFontStyle: 1146 case CSSPropertyFontStyle:
1147 case CSSPropertyFontVariant: 1147 case CSSPropertyFontVariant:
1148 case CSSPropertyFontWeight: 1148 case CSSPropertyFontWeight:
1149 case CSSPropertyLineHeight: 1149 case CSSPropertyLineHeight:
1150 case CSSPropertyOpacity: 1150 case CSSPropertyOpacity:
1151 case CSSPropertyOutline: 1151 case CSSPropertyOutline:
1152 case CSSPropertyOutlineColor: 1152 case CSSPropertyOutlineColor:
1153 case CSSPropertyOutlineOffset: 1153 case CSSPropertyOutlineOffset:
1154 case CSSPropertyOutlineStyle: 1154 case CSSPropertyOutlineStyle:
1155 case CSSPropertyOutlineWidth: 1155 case CSSPropertyOutlineWidth:
1156 case CSSPropertyTouchAction:
Rick Byers 2013/12/06 21:44:04 Why is this here? What does touch-action have to
gnana 2013/12/10 18:24:37 Done. Removed.
1156 case CSSPropertyVisibility: 1157 case CSSPropertyVisibility:
1157 case CSSPropertyWhiteSpace: 1158 case CSSPropertyWhiteSpace:
1158 // FIXME: 'text-decoration' shorthand to be handled when available. 1159 // FIXME: 'text-decoration' shorthand to be handled when available.
1159 // See https://chromiumcodereview.appspot.com/19516002 for details. 1160 // See https://chromiumcodereview.appspot.com/19516002 for details.
1160 case CSSPropertyTextDecoration: 1161 case CSSPropertyTextDecoration:
1161 case CSSPropertyTextShadow: 1162 case CSSPropertyTextShadow:
1162 case CSSPropertyBorderStyle: 1163 case CSSPropertyBorderStyle:
1163 return true; 1164 return true;
1164 case CSSPropertyTextDecorationLine: 1165 case CSSPropertyTextDecorationLine:
1165 case CSSPropertyTextDecorationStyle: 1166 case CSSPropertyTextDecorationStyle:
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1442 bool StyleResolver::affectedByViewportChange() const 1443 bool StyleResolver::affectedByViewportChange() const
1443 { 1444 {
1444 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) { 1445 for (unsigned i = 0; i < m_viewportDependentMediaQueryResults.size(); ++i) {
1445 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result) 1446 if (m_medium->eval(&m_viewportDependentMediaQueryResults[i]->m_expressio n) != m_viewportDependentMediaQueryResults[i]->m_result)
1446 return true; 1447 return true;
1447 } 1448 }
1448 return false; 1449 return false;
1449 } 1450 }
1450 1451
1451 } // namespace WebCore 1452 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698