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

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

Issue 709213002: Remove ContentData. (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) 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 class AppliedTextDecoration; 93 class AppliedTextDecoration;
94 class BorderData; 94 class BorderData;
95 class Font; 95 class Font;
96 class FontMetrics; 96 class FontMetrics;
97 class ShadowList; 97 class ShadowList;
98 class StyleImage; 98 class StyleImage;
99 class StyleInheritedData; 99 class StyleInheritedData;
100 class StyleResolver; 100 class StyleResolver;
101 class TransformationMatrix; 101 class TransformationMatrix;
102 102
103 class ContentData;
104
105 class RenderStyle: public RefCounted<RenderStyle> { 103 class RenderStyle: public RefCounted<RenderStyle> {
106 friend class AnimatedStyleBuilder; // Used by Web Animations CSS. Sets the c olor styles 104 friend class AnimatedStyleBuilder; // Used by Web Animations CSS. Sets the c olor styles
107 friend class CSSAnimatableValueFactory; // Used by Web Animations CSS. Gets visited and unvisited colors separately. 105 friend class CSSAnimatableValueFactory; // Used by Web Animations CSS. Gets visited and unvisited colors separately.
108 friend class CSSPropertyEquality; // Used by CSS animations. We can't allow them to animate based off visited colors. 106 friend class CSSPropertyEquality; // Used by CSS animations. We can't allow them to animate based off visited colors.
109 friend class EditingStyle; // Editing has to only reveal unvisited info. 107 friend class EditingStyle; // Editing has to only reveal unvisited info.
110 friend class CSSComputedStyleDeclaration; // Ignores visited styles, so need s to be able to see unvisited info. 108 friend class CSSComputedStyleDeclaration; // Ignores visited styles, so need s to be able to see unvisited info.
111 friend class StyleBuilderFunctions; // Sets color styles 109 friend class StyleBuilderFunctions; // Sets color styles
112 110
113 // FIXME: When we stop resolving currentColor at style time, these can be re moved. 111 // FIXME: When we stop resolving currentColor at style time, these can be re moved.
114 friend class CSSToStyleMap; 112 friend class CSSToStyleMap;
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 1193
1196 void setClipPath(PassRefPtr<ClipPathOperation> operation) 1194 void setClipPath(PassRefPtr<ClipPathOperation> operation)
1197 { 1195 {
1198 if (rareNonInheritedData->m_clipPath != operation) 1196 if (rareNonInheritedData->m_clipPath != operation)
1199 rareNonInheritedData.access()->m_clipPath = operation; 1197 rareNonInheritedData.access()->m_clipPath = operation;
1200 } 1198 }
1201 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); } 1199 ClipPathOperation* clipPath() const { return rareNonInheritedData->m_clipPat h.get(); }
1202 1200
1203 static ClipPathOperation* initialClipPath() { return 0; } 1201 static ClipPathOperation* initialClipPath() { return 0; }
1204 1202
1205 bool hasContent() const { return contentData(); }
1206 const ContentData* contentData() const { return rareNonInheritedData->m_cont ent.get(); }
1207 bool contentDataEquivalent(const RenderStyle* otherStyle) const { return con st_cast<RenderStyle*>(this)->rareNonInheritedData->contentDataEquivalent(*const_ cast<RenderStyle*>(otherStyle)->rareNonInheritedData); }
1208 void clearContent();
1209 void setContent(const String&, bool add = false);
1210 void setContent(PassRefPtr<StyleImage>, bool add = false);
1211
1212 const CounterDirectiveMap* counterDirectives() const; 1203 const CounterDirectiveMap* counterDirectives() const;
1213 CounterDirectiveMap& accessCounterDirectives(); 1204 CounterDirectiveMap& accessCounterDirectives();
1214 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const; 1205 const CounterDirectives getCounterDirectives(const AtomicString& identifier) const;
1215 1206
1216 QuotesData* quotes() const { return rareInheritedData->quotes.get(); } 1207 QuotesData* quotes() const { return rareInheritedData->quotes.get(); }
1217 void setQuotes(PassRefPtr<QuotesData>); 1208 void setQuotes(PassRefPtr<QuotesData>);
1218 1209
1219 const AtomicString& hyphenString() const; 1210 const AtomicString& hyphenString() const;
1220 1211
1221 bool inheritedNotEqual(const RenderStyle*) const; 1212 bool inheritedNotEqual(const RenderStyle*) const;
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 StyleColor borderBottomColor() const { return surround->border.bottom().colo r(); } 1427 StyleColor borderBottomColor() const { return surround->border.bottom().colo r(); }
1437 StyleColor backgroundColor() const { return m_background->color(); } 1428 StyleColor backgroundColor() const { return m_background->color(); }
1438 Color color() const; 1429 Color color() const;
1439 StyleColor outlineColor() const { return m_background->outline().color(); } 1430 StyleColor outlineColor() const { return m_background->outline().color(); }
1440 StyleColor textEmphasisColor() const { return rareInheritedData->textEmphasi sColor(); } 1431 StyleColor textEmphasisColor() const { return rareInheritedData->textEmphasi sColor(); }
1441 StyleColor textFillColor() const { return rareInheritedData->textFillColor() ; } 1432 StyleColor textFillColor() const { return rareInheritedData->textFillColor() ; }
1442 StyleColor textStrokeColor() const { return rareInheritedData->textStrokeCol or(); } 1433 StyleColor textStrokeColor() const { return rareInheritedData->textStrokeCol or(); }
1443 1434
1444 StyleColor textDecorationColor() const { return rareNonInheritedData->m_text DecorationColor; } 1435 StyleColor textDecorationColor() const { return rareNonInheritedData->m_text DecorationColor; }
1445 1436
1446 void appendContent(PassOwnPtr<ContentData>);
1447 void addAppliedTextDecoration(const AppliedTextDecoration&); 1437 void addAppliedTextDecoration(const AppliedTextDecoration&);
1448 1438
1449 bool diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const ; 1439 bool diffNeedsFullLayoutAndPaintInvalidation(const RenderStyle& other) const ;
1450 bool diffNeedsFullLayout(const RenderStyle& other) const; 1440 bool diffNeedsFullLayout(const RenderStyle& other) const;
1451 bool diffNeedsPaintInvalidationLayer(const RenderStyle& other) const; 1441 bool diffNeedsPaintInvalidationLayer(const RenderStyle& other) const;
1452 bool diffNeedsPaintInvalidationObject(const RenderStyle& other) const; 1442 bool diffNeedsPaintInvalidationObject(const RenderStyle& other) const;
1453 bool diffNeedsRecompositeLayer(const RenderStyle& other) const; 1443 bool diffNeedsRecompositeLayer(const RenderStyle& other) const;
1454 void updatePropertySpecificDifferences(const RenderStyle& other, StyleDiffer ence&) const; 1444 void updatePropertySpecificDifferences(const RenderStyle& other, StyleDiffer ence&) const;
1455 }; 1445 };
1456 1446
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
1521 1511
1522 rareInheritedData.access()->m_textOrientation = textOrientation; 1512 rareInheritedData.access()->m_textOrientation = textOrientation;
1523 return true; 1513 return true;
1524 } 1514 }
1525 1515
1526 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1516 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1527 1517
1528 } // namespace blink 1518 } // namespace blink
1529 1519
1530 #endif // RenderStyle_h 1520 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/ContentData.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698