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

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: 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) 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 2944 matching lines...) Expand 10 before | Expand all | Expand 10 after
2955 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); 2955 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
2956 2956
2957 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth); 2957 adjustIntrinsicLogicalWidthsForColumns(minLogicalWidth, maxLogicalWidth);
2958 2958
2959 if (isTableCell()) { 2959 if (isTableCell()) {
2960 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( ); 2960 Length tableCellWidth = toRenderTableCell(this)->styleOrColLogicalWidth( );
2961 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0) 2961 if (tableCellWidth.isFixed() && tableCellWidth.value() > 0)
2962 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value())); 2962 maxLogicalWidth = std::max(minLogicalWidth, adjustContentBoxLogicalW idthForBoxSizing(tableCellWidth.value()));
2963 } 2963 }
2964 2964
2965 int scrollbarWidth = instrinsicScrollbarLogicalWidth(); 2965 int scrollbarWidth = intrinsicScrollbarLogicalWidth();
2966 maxLogicalWidth += scrollbarWidth; 2966 maxLogicalWidth += scrollbarWidth;
2967 minLogicalWidth += scrollbarWidth; 2967 minLogicalWidth += scrollbarWidth;
2968 } 2968 }
2969 2969
2970 void RenderBlock::computePreferredLogicalWidths() 2970 void RenderBlock::computePreferredLogicalWidths()
2971 { 2971 {
2972 ASSERT(preferredLogicalWidthsDirty()); 2972 ASSERT(preferredLogicalWidthsDirty());
2973 2973
2974 m_minPreferredLogicalWidth = 0; 2974 m_minPreferredLogicalWidth = 0;
2975 m_maxPreferredLogicalWidth = 0; 2975 m_maxPreferredLogicalWidth = 0;
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
3917 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3917 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3918 { 3918 {
3919 showRenderObject(); 3919 showRenderObject();
3920 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3920 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3921 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3921 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3922 } 3922 }
3923 3923
3924 #endif 3924 #endif
3925 3925
3926 } // namespace blink 3926 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698