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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. 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
« no previous file with comments | « Source/core/css/CSSPropertyNames.in ('k') | Source/core/dom/Document.h » ('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) 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 2568 matching lines...) Expand 10 before | Expand all | Expand 10 after
2579 else if (primitiveValue->isNumber()) { 2579 else if (primitiveValue->isNumber()) {
2580 // For backward compatibility, treat valueless numbers as px. 2580 // For backward compatibility, treat valueless numbers as px.
2581 perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoub leValue(), CSSPrimitiveValue::CSS_PX)->computeLength<float>(state.style(), state .rootElementStyle(), zoomFactor); 2581 perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoub leValue(), CSSPrimitiveValue::CSS_PX)->computeLength<float>(state.style(), state .rootElementStyle(), zoomFactor);
2582 } else 2582 } else
2583 return; 2583 return;
2584 2584
2585 if (perspectiveValue >= 0.0f) 2585 if (perspectiveValue >= 0.0f)
2586 state.style()->setPerspective(perspectiveValue); 2586 state.style()->setPerspective(perspectiveValue);
2587 return; 2587 return;
2588 } 2588 }
2589 #if ENABLE(TOUCH_EVENTS)
2590 case CSSPropertyWebkitTapHighlightColor: { 2589 case CSSPropertyWebkitTapHighlightColor: {
2591 HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor); 2590 HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
2592 if (!primitiveValue) 2591 if (!primitiveValue)
2593 break; 2592 break;
2594 2593
2595 Color col = colorFromPrimitiveValue(primitiveValue); 2594 Color col = colorFromPrimitiveValue(primitiveValue);
2596 state.style()->setTapHighlightColor(col); 2595 state.style()->setTapHighlightColor(col);
2597 return; 2596 return;
2598 } 2597 }
2599 #endif
2600 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 2598 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
2601 case CSSPropertyWebkitOverflowScrolling: { 2599 case CSSPropertyWebkitOverflowScrolling: {
2602 HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowSc rolling); 2600 HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowSc rolling);
2603 if (!primitiveValue) 2601 if (!primitiveValue)
2604 break; 2602 break;
2605 state.style()->setUseTouchOverflowScrolling(primitiveValue->getIdent() = = CSSValueTouch); 2603 state.style()->setUseTouchOverflowScrolling(primitiveValue->getIdent() = = CSSValueTouch);
2606 return; 2604 return;
2607 } 2605 }
2608 #endif 2606 #endif
2609 case CSSPropertyInvalid: 2607 case CSSPropertyInvalid:
(...skipping 1805 matching lines...) Expand 10 before | Expand all | Expand 10 after
4415 info.addMember(m_state, "state"); 4413 info.addMember(m_state, "state");
4416 4414
4417 // FIXME: move this to a place where it would be called only once? 4415 // FIXME: move this to a place where it would be called only once?
4418 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); 4416 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle");
4419 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e"); 4417 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl e");
4420 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle,"defaultPrintStyle") ; 4418 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle,"defaultPrintStyle") ;
4421 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle"); 4419 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo urceStyle");
4422 } 4420 }
4423 4421
4424 } // namespace WebCore 4422 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPropertyNames.in ('k') | Source/core/dom/Document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698