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

Side by Side Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 1077473002: Stop rendering text inside flex boxes. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: make p default to display: paragraph 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 277
278 enum DefaultStyleTag { 278 enum DefaultStyleTag {
279 DefaultStyle 279 DefaultStyle
280 }; 280 };
281 ALWAYS_INLINE explicit RenderStyle(DefaultStyleTag); 281 ALWAYS_INLINE explicit RenderStyle(DefaultStyleTag);
282 ALWAYS_INLINE RenderStyle(const RenderStyle&); 282 ALWAYS_INLINE RenderStyle(const RenderStyle&);
283 283
284 public: 284 public:
285 static PassRefPtr<RenderStyle> create(); 285 static PassRefPtr<RenderStyle> create();
286 static PassRefPtr<RenderStyle> createDefaultStyle(); 286 static PassRefPtr<RenderStyle> createDefaultStyle();
287 static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderS tyle* parentStyle, EDisplay);
288 static PassRefPtr<RenderStyle> clone(const RenderStyle*); 287 static PassRefPtr<RenderStyle> clone(const RenderStyle*);
289 288
290 // Computes how the style change should be propagated down the tree. 289 // Computes how the style change should be propagated down the tree.
291 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle); 290 static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, c onst RenderStyle* newStyle);
292 291
293 StyleDifference visualInvalidationDiff(const RenderStyle&) const; 292 StyleDifference visualInvalidationDiff(const RenderStyle&) const;
294 293
295 enum IsAtShadowBoundary { 294 enum IsAtShadowBoundary {
296 AtShadowBoundary, 295 AtShadowBoundary,
297 NotAtShadowBoundary, 296 NotAtShadowBoundary,
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const; 1062 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
1064 1063
1065 QuotesData* quotes() const { return rareInheritedData->quotes.get(); } 1064 QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
1066 void setQuotes(PassRefPtr<QuotesData>); 1065 void setQuotes(PassRefPtr<QuotesData>);
1067 1066
1068 const AtomicString& hyphenString() const; 1067 const AtomicString& hyphenString() const;
1069 1068
1070 bool inheritedNotEqual(const RenderStyle*) const; 1069 bool inheritedNotEqual(const RenderStyle*) const;
1071 bool inheritedDataShared(const RenderStyle*) const; 1070 bool inheritedDataShared(const RenderStyle*) const;
1072 1071
1073 bool requiresOnlyBlockChildren(); 1072 bool requiresOnlyBlockChildren() const;
1074 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; } 1073 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; }
1075 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1074 bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
1076 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); } 1075 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); }
1077 bool isDisplayFlexibleBox() const { return isDisplayFlexibleBox(display()); } 1076 bool isDisplayFlexibleBox() const { return isDisplayFlexibleBox(display()); }
1078 1077
1079 // A unique style is one that has matches something that makes it impossible to share. 1078 // A unique style is one that has matches something that makes it impossible to share.
1080 bool unique() const { return noninherited_flags.unique; } 1079 bool unique() const { return noninherited_flags.unique; }
1081 void setUnique() { noninherited_flags.unique = true; } 1080 void setUnique() { noninherited_flags.unique = true; }
1082 1081
1083 bool isSharable() const; 1082 bool isSharable() const;
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 1301
1303 rareInheritedData.access()->m_textOrientation = textOrientation; 1302 rareInheritedData.access()->m_textOrientation = textOrientation;
1304 return true; 1303 return true;
1305 } 1304 }
1306 1305
1307 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1306 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1308 1307
1309 } // namespace blink 1308 } // namespace blink
1310 1309
1311 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_ 1310 #endif // SKY_ENGINE_CORE_RENDERING_STYLE_RENDERSTYLE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderParagraph.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698