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

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

Issue 347053007: Ensure we compute the height of replaced elements to 'auto' when appropriate. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/css2.1/20110323/support/black96x96.png ('k') | no next file » | 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) 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 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010 Google Inc. All rights reserved. 7 * Copyright (C) 2010 Google Inc. 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // what the CSS spec says to do with heights. Basically we 183 // what the CSS spec says to do with heights. Basically we
184 // don't care if the cell specified a height or not. 184 // don't care if the cell specified a height or not.
185 if (cb->isTableCell()) 185 if (cb->isTableCell())
186 return false; 186 return false;
187 187
188 // Match RenderBox::availableLogicalHeightUsing by special casing 188 // Match RenderBox::availableLogicalHeightUsing by special casing
189 // the render view. The available height is taken from the frame. 189 // the render view. The available height is taken from the frame.
190 if (cb->isRenderView()) 190 if (cb->isRenderView())
191 return false; 191 return false;
192 192
193 if (!cb->style()->logicalHeight().isAuto() || (!cb->style()->logicalTop().is Auto() && !cb->style()->logicalBottom().isAuto())) 193 if (!cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isA uto())
davve 2014/06/30 08:52:37 This line still looks suspect. I filed https://cod
194 return false;
195
196 // If the height of the containing block computes to 'auto', then it hasn't been 'specified explictly'.
197 if (!cb->hasAutoHeightOrContainingBlockWithAutoHeight())
194 return false; 198 return false;
195 199
196 return true; 200 return true;
197 } 201 }
198 202
199 LayoutSize RenderBoxModelObject::relativePositionOffset() const 203 LayoutSize RenderBoxModelObject::relativePositionOffset() const
200 { 204 {
201 LayoutSize offset = accumulateInFlowPositionOffsets(this); 205 LayoutSize offset = accumulateInFlowPositionOffsets(this);
202 206
203 RenderBlock* containingBlock = this->containingBlock(); 207 RenderBlock* containingBlock = this->containingBlock();
(...skipping 2636 matching lines...) Expand 10 before | Expand all | Expand 10 after
2840 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); 2844 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
2841 for (RenderObject* child = startChild; child && child != endChild; ) { 2845 for (RenderObject* child = startChild; child && child != endChild; ) {
2842 // Save our next sibling as moveChildTo will clear it. 2846 // Save our next sibling as moveChildTo will clear it.
2843 RenderObject* nextSibling = child->nextSibling(); 2847 RenderObject* nextSibling = child->nextSibling();
2844 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); 2848 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
2845 child = nextSibling; 2849 child = nextSibling;
2846 } 2850 }
2847 } 2851 }
2848 2852
2849 } // namespace WebCore 2853 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/css2.1/20110323/support/black96x96.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698