| 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 * Copyright (C) 2015 Google Inc. All rights reserved. | 7 * Copyright (C) 2015 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Lesser General Public | 10 * modify it under the terms of the GNU Lesser General Public |
| (...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 | 628 |
| 629 static LayoutRect sizingBox(const RenderObject* renderer) | 629 static LayoutRect sizingBox(const RenderObject* renderer) |
| 630 { | 630 { |
| 631 if (!renderer->isBox()) | 631 if (!renderer->isBox()) |
| 632 return LayoutRect(); | 632 return LayoutRect(); |
| 633 | 633 |
| 634 const RenderBox* box = toRenderBox(renderer); | 634 const RenderBox* box = toRenderBox(renderer); |
| 635 return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box-
>computedCSSContentBoxRect(); | 635 return box->style()->boxSizing() == BORDER_BOX ? box->borderBoxRect() : box-
>computedCSSContentBoxRect(); |
| 636 } | 636 } |
| 637 | 637 |
| 638 static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(ScrollBloc
ksOn scrollBlocksOn) | 638 static PassRefPtrWillBeRawPtr<CSSValue> scrollBlocksOnFlagsToCSSValue(WebScrollB
locksOn scrollBlocksOn) |
| 639 { | 639 { |
| 640 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 640 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 641 | 641 |
| 642 if (scrollBlocksOn == ScrollBlocksOnNone) | 642 if (scrollBlocksOn == WebScrollBlocksOnNone) |
| 643 return cssValuePool().createIdentifierValue(CSSValueNone); | 643 return cssValuePool().createIdentifierValue(CSSValueNone); |
| 644 | 644 |
| 645 if (scrollBlocksOn & ScrollBlocksOnStartTouch) | 645 if (scrollBlocksOn & WebScrollBlocksOnStartTouch) |
| 646 list->append(cssValuePool().createIdentifierValue(CSSValueStartTouch)); | 646 list->append(cssValuePool().createIdentifierValue(CSSValueStartTouch)); |
| 647 if (scrollBlocksOn & ScrollBlocksOnWheelEvent) | 647 if (scrollBlocksOn & WebScrollBlocksOnWheelEvent) |
| 648 list->append(cssValuePool().createIdentifierValue(CSSValueWheelEvent)); | 648 list->append(cssValuePool().createIdentifierValue(CSSValueWheelEvent)); |
| 649 if (scrollBlocksOn & ScrollBlocksOnScrollEvent) | 649 if (scrollBlocksOn & WebScrollBlocksOnScrollEvent) |
| 650 list->append(cssValuePool().createIdentifierValue(CSSValueScrollEvent)); | 650 list->append(cssValuePool().createIdentifierValue(CSSValueScrollEvent)); |
| 651 ASSERT(list->length()); | 651 ASSERT(list->length()); |
| 652 return list.release(); | 652 return list.release(); |
| 653 } | 653 } |
| 654 | 654 |
| 655 static PassRefPtrWillBeRawPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int
textDecoration) | 655 static PassRefPtrWillBeRawPtr<CSSValue> renderTextDecorationFlagsToCSSValue(int
textDecoration) |
| 656 { | 656 { |
| 657 // Blink value is ignored. | 657 // Blink value is ignored. |
| 658 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; | 658 RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated()
; |
| 659 if (textDecoration & TextDecorationUnderline) | 659 if (textDecoration & TextDecorationUnderline) |
| (...skipping 1897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2557 return nullptr; | 2557 return nullptr; |
| 2558 | 2558 |
| 2559 case CSSPropertyAll: | 2559 case CSSPropertyAll: |
| 2560 return nullptr; | 2560 return nullptr; |
| 2561 } | 2561 } |
| 2562 ASSERT_NOT_REACHED(); | 2562 ASSERT_NOT_REACHED(); |
| 2563 return nullptr; | 2563 return nullptr; |
| 2564 } | 2564 } |
| 2565 | 2565 |
| 2566 } | 2566 } |
| OLD | NEW |