Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: Source/core/rendering/RenderBox.cpp

Issue 535913002: Add scrollbar logical width while computing intrinsic logical width (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove opera prefix from test Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 3775 matching lines...) Expand 10 before | Expand all | Expand 10 after
4431 4431
4432 setLogicalTop(oldLogicalTop); 4432 setLogicalTop(oldLogicalTop);
4433 setLogicalWidth(oldLogicalWidth); 4433 setLogicalWidth(oldLogicalWidth);
4434 setMarginLeft(oldMarginLeft); 4434 setMarginLeft(oldMarginLeft);
4435 setMarginRight(oldMarginRight); 4435 setMarginRight(oldMarginRight);
4436 4436
4437 return borderBox; 4437 return borderBox;
4438 } 4438 }
4439 4439
4440 } // namespace blink 4440 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.h ('k') | Source/core/rendering/RenderDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698