| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 | 692 |
| 693 return layer()->scrollableArea()->horizontalScrollbarHeight(); | 693 return layer()->scrollableArea()->horizontalScrollbarHeight(); |
| 694 } | 694 } |
| 695 | 695 |
| 696 int LayoutBox::intrinsicScrollbarLogicalWidth() const | 696 int LayoutBox::intrinsicScrollbarLogicalWidth() const |
| 697 { | 697 { |
| 698 if (!hasOverflowClip()) | 698 if (!hasOverflowClip()) |
| 699 return 0; | 699 return 0; |
| 700 | 700 |
| 701 if (isHorizontalWritingMode() && style()->overflowY() == OSCROLL) { | 701 if (isHorizontalWritingMode() && style()->overflowY() == OSCROLL) { |
| 702 ASSERT(layer()->scrollableArea() && layer()->scrollableArea()->hasVertic
alScrollbar()); | 702 ASSERT(layer()->scrollableArea()); |
| 703 return verticalScrollbarWidth(); | 703 // Even with OSCROLL, the scrollbar may not exist (crbug.com/415031). |
| 704 return layer()->scrollableArea()->hasVerticalScrollbar() ? verticalScrol
lbarWidth() : 0; |
| 704 } | 705 } |
| 705 | 706 |
| 706 if (!isHorizontalWritingMode() && style()->overflowX() == OSCROLL) { | 707 if (!isHorizontalWritingMode() && style()->overflowX() == OSCROLL) { |
| 707 ASSERT(layer()->scrollableArea() && layer()->scrollableArea()->hasHorizo
ntalScrollbar()); | 708 ASSERT(layer()->scrollableArea()); |
| 708 return horizontalScrollbarHeight(); | 709 // Even with OSCROLL, the scrollbar may not exist (crbug.com/415031). |
| 710 return layer()->scrollableArea()->hasHorizontalScrollbar() ? horizontalS
crollbarHeight() : 0; |
| 709 } | 711 } |
| 710 | 712 |
| 711 return 0; | 713 return 0; |
| 712 } | 714 } |
| 713 | 715 |
| 714 ScrollResultOneDimensional LayoutBox::scroll(ScrollDirectionPhysical direction,
ScrollGranularity granularity, float delta) | 716 ScrollResultOneDimensional LayoutBox::scroll(ScrollDirectionPhysical direction,
ScrollGranularity granularity, float delta) |
| 715 { | 717 { |
| 716 // Presumably the same issue as in setScrollTop. See crbug.com/343132. | 718 // Presumably the same issue as in setScrollTop. See crbug.com/343132. |
| 717 DisableCompositingQueryAsserts disabler; | 719 DisableCompositingQueryAsserts disabler; |
| 718 | 720 |
| (...skipping 4015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4734 StyleImage* borderImage = style()->borderImage().image(); | 4736 StyleImage* borderImage = style()->borderImage().image(); |
| 4735 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); | 4737 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); |
| 4736 } | 4738 } |
| 4737 | 4739 |
| 4738 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const | 4740 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const |
| 4739 { | 4741 { |
| 4740 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; | 4742 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; |
| 4741 } | 4743 } |
| 4742 | 4744 |
| 4743 } // namespace blink | 4745 } // namespace blink |
| OLD | NEW |