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

Side by Side Diff: Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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 | Annotate | Revision Log
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 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public 9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 CSSPropertyWebkitOverflowScrolling, 321 CSSPropertyWebkitOverflowScrolling,
322 #endif 322 #endif
323 CSSPropertyWebkitPerspective, 323 CSSPropertyWebkitPerspective,
324 CSSPropertyWebkitPerspectiveOrigin, 324 CSSPropertyWebkitPerspectiveOrigin,
325 CSSPropertyWebkitPrintColorAdjust, 325 CSSPropertyWebkitPrintColorAdjust,
326 CSSPropertyWebkitRtlOrdering, 326 CSSPropertyWebkitRtlOrdering,
327 #if ENABLE(CSS_EXCLUSIONS) 327 #if ENABLE(CSS_EXCLUSIONS)
328 CSSPropertyWebkitShapeInside, 328 CSSPropertyWebkitShapeInside,
329 CSSPropertyWebkitShapeOutside, 329 CSSPropertyWebkitShapeOutside,
330 #endif 330 #endif
331 #if ENABLE(TOUCH_EVENTS)
332 CSSPropertyWebkitTapHighlightColor, 331 CSSPropertyWebkitTapHighlightColor,
333 #endif
334 CSSPropertyWebkitTextCombine, 332 CSSPropertyWebkitTextCombine,
335 CSSPropertyWebkitTextDecorationsInEffect, 333 CSSPropertyWebkitTextDecorationsInEffect,
336 CSSPropertyWebkitTextEmphasisColor, 334 CSSPropertyWebkitTextEmphasisColor,
337 CSSPropertyWebkitTextEmphasisPosition, 335 CSSPropertyWebkitTextEmphasisPosition,
338 CSSPropertyWebkitTextEmphasisStyle, 336 CSSPropertyWebkitTextEmphasisStyle,
339 CSSPropertyWebkitTextFillColor, 337 CSSPropertyWebkitTextFillColor,
340 CSSPropertyWebkitTextOrientation, 338 CSSPropertyWebkitTextOrientation,
341 CSSPropertyWebkitTextSecurity, 339 CSSPropertyWebkitTextSecurity,
342 CSSPropertyWebkitTextStrokeColor, 340 CSSPropertyWebkitTextStrokeColor,
343 CSSPropertyWebkitTextStrokeWidth, 341 CSSPropertyWebkitTextStrokeWidth,
(...skipping 2090 matching lines...) Expand 10 before | Expand all | Expand 10 after
2434 } 2432 }
2435 else { 2433 else {
2436 list->append(zoomAdjustedPixelValueForLength(style->perspectiveO riginX(), style.get())); 2434 list->append(zoomAdjustedPixelValueForLength(style->perspectiveO riginX(), style.get()));
2437 list->append(zoomAdjustedPixelValueForLength(style->perspectiveO riginY(), style.get())); 2435 list->append(zoomAdjustedPixelValueForLength(style->perspectiveO riginY(), style.get()));
2438 2436
2439 } 2437 }
2440 return list.release(); 2438 return list.release();
2441 } 2439 }
2442 case CSSPropertyWebkitRtlOrdering: 2440 case CSSPropertyWebkitRtlOrdering:
2443 return cssValuePool().createIdentifierValue(style->rtlOrdering() ? C SSValueVisual : CSSValueLogical); 2441 return cssValuePool().createIdentifierValue(style->rtlOrdering() ? C SSValueVisual : CSSValueLogical);
2444 #if ENABLE(TOUCH_EVENTS)
2445 case CSSPropertyWebkitTapHighlightColor: 2442 case CSSPropertyWebkitTapHighlightColor:
2446 return currentColorOrValidColor(style.get(), style->tapHighlightColo r()); 2443 return currentColorOrValidColor(style.get(), style->tapHighlightColo r());
2447 #endif
2448 case CSSPropertyWebkitUserDrag: 2444 case CSSPropertyWebkitUserDrag:
2449 return cssValuePool().createValue(style->userDrag()); 2445 return cssValuePool().createValue(style->userDrag());
2450 case CSSPropertyWebkitUserSelect: 2446 case CSSPropertyWebkitUserSelect:
2451 return cssValuePool().createValue(style->userSelect()); 2447 return cssValuePool().createValue(style->userSelect());
2452 case CSSPropertyBorderBottomLeftRadius: 2448 case CSSPropertyBorderBottomLeftRadius:
2453 return getBorderRadiusCornerValue(style->borderBottomLeftRadius(), s tyle.get(), m_node->document()->renderView()); 2449 return getBorderRadiusCornerValue(style->borderBottomLeftRadius(), s tyle.get(), m_node->document()->renderView());
2454 case CSSPropertyBorderBottomRightRadius: 2450 case CSSPropertyBorderBottomRightRadius:
2455 return getBorderRadiusCornerValue(style->borderBottomRightRadius(), style.get(), m_node->document()->renderView()); 2451 return getBorderRadiusCornerValue(style->borderBottomRightRadius(), style.get(), m_node->document()->renderView());
2456 case CSSPropertyBorderTopLeftRadius: 2452 case CSSPropertyBorderTopLeftRadius:
2457 return getBorderRadiusCornerValue(style->borderTopLeftRadius(), styl e.get(), m_node->document()->renderView()); 2453 return getBorderRadiusCornerValue(style->borderTopLeftRadius(), styl e.get(), m_node->document()->renderView());
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
3007 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin, 3003 static const CSSPropertyID propertiesAfterSlashSeperator[3] = { CSSPropertyB ackgroundSize, CSSPropertyBackgroundOrigin,
3008 CSSPropertyB ackgroundClip }; 3004 CSSPropertyB ackgroundClip };
3009 3005
3010 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated(); 3006 RefPtr<CSSValueList> list = CSSValueList::createSlashSeparated();
3011 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or)))); 3007 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesBeforeSlashSeperator, WTF_ARRAY_LENGTH(propertiesBeforeSlashSeperat or))));
3012 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator )))); 3008 list->append(getCSSPropertyValuesForShorthandProperties(StylePropertyShortha nd(propertiesAfterSlashSeperator, WTF_ARRAY_LENGTH(propertiesAfterSlashSeperator ))));
3013 return list.release(); 3009 return list.release();
3014 } 3010 }
3015 3011
3016 } // namespace WebCore 3012 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698