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

Side by Side Diff: sky/engine/core/rendering/RenderBlock.cpp

Issue 707233006: Remove scrollbar width/height computations from layout. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2295 void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const 2295 void RenderBlock::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Lay outUnit& maxLogicalWidth) const
2296 { 2296 {
2297 if (childrenInline()) { 2297 if (childrenInline()) {
2298 // FIXME: Remove this const_cast. 2298 // FIXME: Remove this const_cast.
2299 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth); 2299 toRenderBlockFlow(const_cast<RenderBlock*>(this))->computeInlinePreferre dLogicalWidths(minLogicalWidth, maxLogicalWidth);
2300 } else { 2300 } else {
2301 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth); 2301 computeBlockPreferredLogicalWidths(minLogicalWidth, maxLogicalWidth);
2302 } 2302 }
2303 2303
2304 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth); 2304 maxLogicalWidth = std::max(minLogicalWidth, maxLogicalWidth);
2305
2306 int scrollbarWidth = instrinsicScrollbarLogicalWidth();
2307 maxLogicalWidth += scrollbarWidth;
2308 minLogicalWidth += scrollbarWidth;
2309 } 2305 }
2310 2306
2311 void RenderBlock::computePreferredLogicalWidths() 2307 void RenderBlock::computePreferredLogicalWidths()
2312 { 2308 {
2313 ASSERT(preferredLogicalWidthsDirty()); 2309 ASSERT(preferredLogicalWidthsDirty());
2314 2310
2315 m_minPreferredLogicalWidth = 0; 2311 m_minPreferredLogicalWidth = 0;
2316 m_maxPreferredLogicalWidth = 0; 2312 m_maxPreferredLogicalWidth = 0;
2317 2313
2318 // FIXME: The isFixed() calls here should probably be checking for isSpecifi ed since you 2314 // FIXME: The isFixed() calls here should probably be checking for isSpecifi ed since you
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
2943 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 2939 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
2944 { 2940 {
2945 showRenderObject(); 2941 showRenderObject();
2946 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2942 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2947 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2943 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2948 } 2944 }
2949 2945
2950 #endif 2946 #endif
2951 2947
2952 } // namespace blink 2948 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | sky/engine/core/rendering/RenderBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698