| OLD | NEW |
| 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 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1462 } else { | 1462 } else { |
| 1463 if (touchAction & TouchActionPanX) | 1463 if (touchAction & TouchActionPanX) |
| 1464 list->append(cssValuePool().createIdentifierValue(CSSValuePanX)); | 1464 list->append(cssValuePool().createIdentifierValue(CSSValuePanX)); |
| 1465 if (touchAction & TouchActionPanY) | 1465 if (touchAction & TouchActionPanY) |
| 1466 list->append(cssValuePool().createIdentifierValue(CSSValuePanY)); | 1466 list->append(cssValuePool().createIdentifierValue(CSSValuePanY)); |
| 1467 } | 1467 } |
| 1468 ASSERT(list->length()); | 1468 ASSERT(list->length()); |
| 1469 return list.release(); | 1469 return list.release(); |
| 1470 } | 1470 } |
| 1471 | 1471 |
| 1472 static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(ScrollBloc
ksOn scrollBlocksOn) | 1472 static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(WebScrollB
locksOn scrollBlocksOn) |
| 1473 { | 1473 { |
| 1474 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 1474 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 1475 | 1475 |
| 1476 if (scrollBlocksOn == ScrollBlocksOnNone) | 1476 if (scrollBlocksOn == WebScrollBlocksOnNone) |
| 1477 return cssValuePool().createIdentifierValue(CSSValueNone); | 1477 return cssValuePool().createIdentifierValue(CSSValueNone); |
| 1478 | 1478 |
| 1479 if (scrollBlocksOn & ScrollBlocksOnStartTouch) | 1479 if (scrollBlocksOn & WebScrollBlocksOnStartTouch) |
| 1480 list->append(cssValuePool().createIdentifierValue(CSSValueStartTouch)); | 1480 list->append(cssValuePool().createIdentifierValue(CSSValueStartTouch)); |
| 1481 if (scrollBlocksOn & ScrollBlocksOnWheelEvent) | 1481 if (scrollBlocksOn & WebScrollBlocksOnWheelEvent) |
| 1482 list->append(cssValuePool().createIdentifierValue(CSSValueWheelEvent)); | 1482 list->append(cssValuePool().createIdentifierValue(CSSValueWheelEvent)); |
| 1483 if (scrollBlocksOn & ScrollBlocksOnScrollEvent) | 1483 if (scrollBlocksOn & WebScrollBlocksOnScrollEvent) |
| 1484 list->append(cssValuePool().createIdentifierValue(CSSValueScrollEvent)); | 1484 list->append(cssValuePool().createIdentifierValue(CSSValueScrollEvent)); |
| 1485 ASSERT(list->length()); | 1485 ASSERT(list->length()); |
| 1486 return list.release(); | 1486 return list.release(); |
| 1487 } | 1487 } |
| 1488 | 1488 |
| 1489 static bool isLayoutDependent(CSSPropertyID propertyID, PassRefPtr<RenderStyle>
style, RenderObject* renderer) | 1489 static bool isLayoutDependent(CSSPropertyID propertyID, PassRefPtr<RenderStyle>
style, RenderObject* renderer) |
| 1490 { | 1490 { |
| 1491 // Some properties only depend on layout in certain conditions which | 1491 // Some properties only depend on layout in certain conditions which |
| 1492 // are specified in the main switch statement below. So we can avoid | 1492 // are specified in the main switch statement below. So we can avoid |
| 1493 // forcing layout in those conditions. The conditions in this switch | 1493 // forcing layout in those conditions. The conditions in this switch |
| (...skipping 1552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3046 return list.release(); | 3046 return list.release(); |
| 3047 } | 3047 } |
| 3048 | 3048 |
| 3049 void CSSComputedStyleDeclaration::trace(Visitor* visitor) | 3049 void CSSComputedStyleDeclaration::trace(Visitor* visitor) |
| 3050 { | 3050 { |
| 3051 visitor->trace(m_node); | 3051 visitor->trace(m_node); |
| 3052 CSSStyleDeclaration::trace(visitor); | 3052 CSSStyleDeclaration::trace(visitor); |
| 3053 } | 3053 } |
| 3054 | 3054 |
| 3055 } // namespace blink | 3055 } // namespace blink |
| OLD | NEW |