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

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

Issue 535913002: Add scrollbar logical width while computing intrinsic logical width (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix typo + Remove Scrollbar calculation from testcase Created 6 years, 3 months 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 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const; 464 virtual LayoutUnit availableLogicalHeight(AvailableLogicalHeightType) const;
465 LayoutUnit availableLogicalHeightUsing(const Length&, AvailableLogicalHeight Type) const; 465 LayoutUnit availableLogicalHeightUsing(const Length&, AvailableLogicalHeight Type) const;
466 466
467 // There are a few cases where we need to refer specifically to the availabl e physical width and available physical height. 467 // There are a few cases where we need to refer specifically to the availabl e physical width and available physical height.
468 // Relative positioning is one of those cases, since left/top offsets are ph ysical. 468 // Relative positioning is one of those cases, since left/top offsets are ph ysical.
469 LayoutUnit availableWidth() const { return style()->isHorizontalWritingMode( ) ? availableLogicalWidth() : availableLogicalHeight(IncludeMarginBorderPadding) ; } 469 LayoutUnit availableWidth() const { return style()->isHorizontalWritingMode( ) ? availableLogicalWidth() : availableLogicalHeight(IncludeMarginBorderPadding) ; }
470 LayoutUnit availableHeight() const { return style()->isHorizontalWritingMode () ? availableLogicalHeight(IncludeMarginBorderPadding) : availableLogicalWidth( ); } 470 LayoutUnit availableHeight() const { return style()->isHorizontalWritingMode () ? availableLogicalHeight(IncludeMarginBorderPadding) : availableLogicalWidth( ); }
471 471
472 virtual int verticalScrollbarWidth() const; 472 virtual int verticalScrollbarWidth() const;
473 int horizontalScrollbarHeight() const; 473 int horizontalScrollbarHeight() const;
474 int instrinsicScrollbarLogicalWidth() const; 474 int intrinsicScrollbarLogicalWidth() const;
475 int scrollbarLogicalHeight() const { return style()->isHorizontalWritingMode () ? horizontalScrollbarHeight() : verticalScrollbarWidth(); } 475 int scrollbarLogicalHeight() const { return style()->isHorizontalWritingMode () ? horizontalScrollbarHeight() : verticalScrollbarWidth(); }
476 virtual bool scroll(ScrollDirection, ScrollGranularity, float delta = 1); 476 virtual bool scroll(ScrollDirection, ScrollGranularity, float delta = 1);
477 bool canBeScrolledAndHasScrollableArea() const; 477 bool canBeScrolledAndHasScrollableArea() const;
478 virtual bool canBeProgramaticallyScrolled() const; 478 virtual bool canBeProgramaticallyScrolled() const;
479 virtual void autoscroll(const IntPoint&); 479 virtual void autoscroll(const IntPoint&);
480 bool autoscrollInProgress() const; 480 bool autoscrollInProgress() const;
481 bool canAutoscroll() const; 481 bool canAutoscroll() const;
482 IntSize calculateAutoscrollDirection(const IntPoint& windowPoint) const; 482 IntSize calculateAutoscrollDirection(const IntPoint& windowPoint) const;
483 static RenderBox* findAutoscrollable(RenderObject*); 483 static RenderBox* findAutoscrollable(RenderObject*);
484 virtual void stopAutoscroll() { } 484 virtual void stopAutoscroll() { }
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 if (UNLIKELY(inlineBoxWrapper() != 0)) 803 if (UNLIKELY(inlineBoxWrapper() != 0))
804 deleteLineBoxWrapper(); 804 deleteLineBoxWrapper();
805 } 805 }
806 806
807 ensureRareData().m_inlineBoxWrapper = boxWrapper; 807 ensureRareData().m_inlineBoxWrapper = boxWrapper;
808 } 808 }
809 809
810 } // namespace blink 810 } // namespace blink
811 811
812 #endif // RenderBox_h 812 #endif // RenderBox_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698