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

Side by Side Diff: sky/engine/core/rendering/line/BreakingContextInlineHeaders.h

Issue 938193004: Remove dead position:relative code. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ight reserved.
4 * Copyright (C) 2010 Google Inc. All rights reserved. 4 * Copyright (C) 2010 Google Inc. All rights reserved.
5 * Copyright (C) 2013 Adobe Systems Incorporated. 5 * Copyright (C) 2013 Adobe Systems Incorporated.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 // FIXME: The math here is actually not really right. It's a best-guess appr oximation that 191 // FIXME: The math here is actually not really right. It's a best-guess appr oximation that
192 // will work for the common cases 192 // will work for the common cases
193 RenderObject* containerBlock = child->container(); 193 RenderObject* containerBlock = child->container();
194 LayoutUnit blockHeight = block->logicalHeight(); 194 LayoutUnit blockHeight = block->logicalHeight();
195 if (containerBlock->isRenderInline()) { 195 if (containerBlock->isRenderInline()) {
196 // A relative positioned inline encloses us. In this case, we also have to determine our 196 // A relative positioned inline encloses us. In this case, we also have to determine our
197 // position as though we were an inline. Set |staticInlinePosition| and |staticBlockPosition| on the relative positioned 197 // position as though we were an inline. Set |staticInlinePosition| and |staticBlockPosition| on the relative positioned
198 // inline so that we can obtain the value later. 198 // inline so that we can obtain the value later.
199 toRenderInline(containerBlock)->layer()->setStaticInlinePosition(block-> startAlignedOffsetForLine(false)); 199 toRenderInline(containerBlock)->layer()->setStaticInlinePosition(block-> startAlignedOffsetForLine(false));
200 toRenderInline(containerBlock)->layer()->setStaticBlockPosition(blockHei ght); 200 toRenderInline(containerBlock)->layer()->setStaticBlockPosition(blockHei ght);
201
202 // If |child| is a leading or trailing positioned object this is its onl y opportunity to ensure it moves with an inline
203 // container changing width.
204 child->moveWithEdgeOfInlineContainerIfNecessary();
205 } 201 }
206 block->updateStaticInlinePositionForChild(child); 202 block->updateStaticInlinePositionForChild(child);
207 child->layer()->setStaticBlockPosition(blockHeight); 203 child->layer()->setStaticBlockPosition(blockHeight);
208 } 204 }
209 205
210 // FIXME: The entire concept of the skipTrailingWhitespace function is flawed, s ince we really need to be building 206 // FIXME: The entire concept of the skipTrailingWhitespace function is flawed, s ince we really need to be building
211 // line boxes even for containers that may ultimately collapse away. Otherwise w e'll never get positioned 207 // line boxes even for containers that may ultimately collapse away. Otherwise w e'll never get positioned
212 // elements quite right. In other words, we need to build this function's work i nto the normal line 208 // elements quite right. In other words, we need to build this function's work i nto the normal line
213 // object iteration process. 209 // object iteration process.
214 // NB. this function will insert any floating elements that would otherwise 210 // NB. this function will insert any floating elements that would otherwise
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 807
812 if (style->textIndentType() == TextIndentHanging) 808 if (style->textIndentType() == TextIndentHanging)
813 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In dentText; 809 shouldIndentText = shouldIndentText == IndentText ? DoNotIndentText : In dentText;
814 810
815 return shouldIndentText; 811 return shouldIndentText;
816 } 812 }
817 813
818 } 814 }
819 815
820 #endif // SKY_ENGINE_CORE_RENDERING_LINE_BREAKINGCONTEXTINLINEHEADERS_H_ 816 #endif // SKY_ENGINE_CORE_RENDERING_LINE_BREAKINGCONTEXTINLINEHEADERS_H_
OLDNEW
« sky/engine/core/rendering/LayoutState.cpp ('K') | « sky/engine/core/rendering/RenderObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698