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

Side by Side Diff: Source/core/rendering/RenderBlock.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: 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 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 3587 matching lines...) Expand 10 before | Expand all | Expand 10 after
3598 // A horizontal marquee with inline children has no minimum width. 3598 // A horizontal marquee with inline children has no minimum width.
3599 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal() ) 3599 if (childrenInline() && isMarquee() && toRenderMarquee(this)->isHorizontal() )
3600 minLogicalWidth = 0; 3600 minLogicalWidth = 0;
3601 3601
3602 if (isTableCell()) { 3602 if (isTableCell()) {
3603 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( ); 3603 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( );
3604 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) 3604 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
3605 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value())); 3605 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value()));
3606 } 3606 }
3607 3607
3608 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); 3608 int scrollbarWidth = intrinsicScrollbarLogicalWidth();
3609 maxLogicalWidth += scrollbarWidth; 3609 maxLogicalWidth += scrollbarWidth;
3610 minLogicalWidth += scrollbarWidth; 3610 minLogicalWidth += scrollbarWidth;
3611 } 3611 }
3612 3612
3613 void RenderBlock::computePreferredLogicalWidths() 3613 void RenderBlock::computePreferredLogicalWidths()
3614 { 3614 {
3615 ASSERT(preferredLogicalWidthsDirty()); 3615 ASSERT(preferredLogicalWidthsDirty());
3616 3616
3617 updateFirstLetter(); 3617 updateFirstLetter();
3618 3618
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
4809 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4809 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4810 { 4810 {
4811 showRenderObject(); 4811 showRenderObject();
4812 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4812 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4813 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4813 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4814 } 4814 }
4815 4815
4816 #endif 4816 #endif
4817 4817
4818 } // namespace blink 4818 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698