| 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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 } | 635 } |
| 636 | 636 |
| 637 int RenderBox::horizontalScrollbarHeight() const | 637 int RenderBox::horizontalScrollbarHeight() const |
| 638 { | 638 { |
| 639 if (!hasOverflowClip() || style()->overflowX() == OOVERLAY) | 639 if (!hasOverflowClip() || style()->overflowX() == OOVERLAY) |
| 640 return 0; | 640 return 0; |
| 641 | 641 |
| 642 return layer()->scrollableArea()->horizontalScrollbarHeight(); | 642 return layer()->scrollableArea()->horizontalScrollbarHeight(); |
| 643 } | 643 } |
| 644 | 644 |
| 645 int RenderBox::instrinsicScrollbarLogicalWidth() const | 645 int RenderBox::intrinsicScrollbarLogicalWidth() const |
| 646 { | 646 { |
| 647 if (!hasOverflowClip()) | 647 if (!hasOverflowClip()) |
| 648 return 0; | 648 return 0; |
| 649 | 649 |
| 650 if (isHorizontalWritingMode() && style()->overflowY() == OSCROLL) { | 650 if (isHorizontalWritingMode() && style()->overflowY() == OSCROLL) { |
| 651 ASSERT(layer()->scrollableArea() && layer()->scrollableArea()->hasVertic
alScrollbar()); | 651 ASSERT(layer()->scrollableArea() && layer()->scrollableArea()->hasVertic
alScrollbar()); |
| 652 return verticalScrollbarWidth(); | 652 return verticalScrollbarWidth(); |
| 653 } | 653 } |
| 654 | 654 |
| 655 if (!isHorizontalWritingMode() && style()->overflowX() == OSCROLL) { | 655 if (!isHorizontalWritingMode() && style()->overflowX() == OSCROLL) { |
| (...skipping 3795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4451 | 4451 |
| 4452 setLogicalTop(oldLogicalTop); | 4452 setLogicalTop(oldLogicalTop); |
| 4453 setLogicalWidth(oldLogicalWidth); | 4453 setLogicalWidth(oldLogicalWidth); |
| 4454 setMarginLeft(oldMarginLeft); | 4454 setMarginLeft(oldMarginLeft); |
| 4455 setMarginRight(oldMarginRight); | 4455 setMarginRight(oldMarginRight); |
| 4456 | 4456 |
| 4457 return borderBox; | 4457 return borderBox; |
| 4458 } | 4458 } |
| 4459 | 4459 |
| 4460 } // namespace blink | 4460 } // namespace blink |
| OLD | NEW |