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

Side by Side Diff: sky/engine/core/css/resolver/StyleAdjuster.cpp

Issue 700703002: Remove more float machinery. (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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 break; 101 break;
102 } 102 }
103 } 103 }
104 return false; 104 return false;
105 } 105 }
106 106
107 void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty le, Element& element) 107 void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty le, Element& element)
108 { 108 {
109 ASSERT(parentStyle); 109 ASSERT(parentStyle);
110 110
111 // FIXME(sky): Remove floats.
112 style->setFloating(NoFloat);
113
114 if (style->display() != NONE) { 111 if (style->display() != NONE) {
115 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display. 112 // Absolute/fixed positioned elements, floating elements and the documen t element need block-like outside display.
116 if (style->hasOutOfFlowPosition() || element.document().documentElement( ) == element) 113 if (style->hasOutOfFlowPosition() || element.document().documentElement( ) == element)
117 style->setDisplay(equivalentBlockDisplay(style->display())); 114 style->setDisplay(equivalentBlockDisplay(style->display()));
118 115
119 adjustStyleForDisplay(style, parentStyle); 116 adjustStyleForDisplay(style, parentStyle);
120 } 117 }
121 118
122 // Make sure our z-index value is only applied if the object is positioned. 119 // Make sure our z-index value is only applied if the object is positioned.
123 if (style->position() == StaticPosition && !parentStyleForcesZIndexToCreateS tackingContext(parentStyle)) 120 if (style->position() == StaticPosition && !parentStyleForcesZIndexToCreateS tackingContext(parentStyle))
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 } 234 }
238 235
239 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren tStyle) 236 void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* paren tStyle)
240 { 237 {
241 if (parentStyle->isDisplayFlexibleBox()) { 238 if (parentStyle->isDisplayFlexibleBox()) {
242 style->setDisplay(equivalentBlockDisplay(style->display())); 239 style->setDisplay(equivalentBlockDisplay(style->display()));
243 } 240 }
244 } 241 }
245 242
246 } 243 }
OLDNEW
« no previous file with comments | « sky/engine/core/css/parser/BisonCSSParser-in.cpp ('k') | sky/engine/core/editing/htmlediting.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698