| OLD | NEW |
| 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 2599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2610 else if (primitiveValue->isNumber()) { | 2610 else if (primitiveValue->isNumber()) { |
| 2611 // For backward compatibility, treat valueless numbers as px. | 2611 // For backward compatibility, treat valueless numbers as px. |
| 2612 perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoub
leValue(), CSSPrimitiveValue::CSS_PX)->computeLength<float>(state.style(), state
.rootElementStyle(), zoomFactor); | 2612 perspectiveValue = CSSPrimitiveValue::create(primitiveValue->getDoub
leValue(), CSSPrimitiveValue::CSS_PX)->computeLength<float>(state.style(), state
.rootElementStyle(), zoomFactor); |
| 2613 } else | 2613 } else |
| 2614 return; | 2614 return; |
| 2615 | 2615 |
| 2616 if (perspectiveValue >= 0.0f) | 2616 if (perspectiveValue >= 0.0f) |
| 2617 state.style()->setPerspective(perspectiveValue); | 2617 state.style()->setPerspective(perspectiveValue); |
| 2618 return; | 2618 return; |
| 2619 } | 2619 } |
| 2620 #if ENABLE(TOUCH_EVENTS) |
| 2620 case CSSPropertyWebkitTapHighlightColor: { | 2621 case CSSPropertyWebkitTapHighlightColor: { |
| 2621 HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor); | 2622 HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor); |
| 2622 if (!primitiveValue) | 2623 if (!primitiveValue) |
| 2623 break; | 2624 break; |
| 2624 | 2625 |
| 2625 Color col = colorFromPrimitiveValue(primitiveValue); | 2626 Color col = colorFromPrimitiveValue(primitiveValue); |
| 2626 state.style()->setTapHighlightColor(col); | 2627 state.style()->setTapHighlightColor(col); |
| 2627 return; | 2628 return; |
| 2628 } | 2629 } |
| 2630 #endif |
| 2629 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) | 2631 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) |
| 2630 case CSSPropertyWebkitOverflowScrolling: { | 2632 case CSSPropertyWebkitOverflowScrolling: { |
| 2631 HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowSc
rolling); | 2633 HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowSc
rolling); |
| 2632 if (!primitiveValue) | 2634 if (!primitiveValue) |
| 2633 break; | 2635 break; |
| 2634 state.style()->setUseTouchOverflowScrolling(primitiveValue->getIdent() =
= CSSValueTouch); | 2636 state.style()->setUseTouchOverflowScrolling(primitiveValue->getIdent() =
= CSSValueTouch); |
| 2635 return; | 2637 return; |
| 2636 } | 2638 } |
| 2637 #endif | 2639 #endif |
| 2638 case CSSPropertyInvalid: | 2640 case CSSPropertyInvalid: |
| (...skipping 1801 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4440 info.addMember(m_state, "state"); | 4442 info.addMember(m_state, "state"); |
| 4441 | 4443 |
| 4442 // FIXME: move this to a place where it would be called only once? | 4444 // FIXME: move this to a place where it would be called only once? |
| 4443 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); | 4445 info.addMember(CSSDefaultStyleSheets::defaultStyle, "defaultStyle"); |
| 4444 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl
e"); | 4446 info.addMember(CSSDefaultStyleSheets::defaultQuirksStyle, "defaultQuirksStyl
e"); |
| 4445 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle,"defaultPrintStyle")
; | 4447 info.addMember(CSSDefaultStyleSheets::defaultPrintStyle,"defaultPrintStyle")
; |
| 4446 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo
urceStyle"); | 4448 info.addMember(CSSDefaultStyleSheets::defaultViewSourceStyle, "defaultViewSo
urceStyle"); |
| 4447 } | 4449 } |
| 4448 | 4450 |
| 4449 } // namespace WebCore | 4451 } // namespace WebCore |
| OLD | NEW |