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

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

Issue 1068683002: Delete RenderBlockFlow. (Closed) Base URL: https://github.com/domokit/mojo.git@block
Patch Set: Remove unused float-related code instead of moving it. Created 5 years, 8 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
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/dom/Position.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) 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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 if (const StylePropertySet* inlineStyle = element.inlineStyle()) { 165 if (const StylePropertySet* inlineStyle = element.inlineStyle()) {
166 // Inline style is immutable as long as there is no CSSOM wrapper. 166 // Inline style is immutable as long as there is no CSSOM wrapper.
167 bool isInlineStyleCacheable = !inlineStyle->isMutable(); 167 bool isInlineStyleCacheable = !inlineStyle->isMutable();
168 collector.addElementStyleProperties(inlineStyle, isInlineStyleCacheable) ; 168 collector.addElementStyleProperties(inlineStyle, isInlineStyleCacheable) ;
169 } 169 }
170 } 170 }
171 171
172 PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document& document) 172 PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document& document)
173 { 173 {
174 RefPtr<RenderStyle> documentStyle = RenderStyle::create(); 174 RefPtr<RenderStyle> documentStyle = RenderStyle::create();
175 documentStyle->setDisplay(FLEX);
176 documentStyle->setRTLOrdering(LogicalOrder); 175 documentStyle->setRTLOrdering(LogicalOrder);
177 documentStyle->setLocale(document.contentLanguage()); 176 documentStyle->setLocale(document.contentLanguage());
178 documentStyle->setZIndex(0); 177 documentStyle->setZIndex(0);
179 documentStyle->setUserModify(READ_ONLY); 178 documentStyle->setUserModify(READ_ONLY);
180 179
181 document.setupFontBuilder(documentStyle.get()); 180 document.setupFontBuilder(documentStyle.get());
182 181
183 return documentStyle.release(); 182 return documentStyle.release();
184 } 183 }
185 184
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 break; 592 break;
594 default: 593 default:
595 break; 594 break;
596 } 595 }
597 StyleBuilder::applyProperty(properties[i].property, state, propertie s[i].value); 596 StyleBuilder::applyProperty(properties[i].property, state, propertie s[i].value);
598 } 597 }
599 } 598 }
600 } 599 }
601 600
602 } // namespace blink 601 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/core.gni ('k') | sky/engine/core/dom/Position.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698