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

Side by Side Diff: Source/core/style/ComputedStyle.h

Issue 1308953009: Move Image ownership out of CSSValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/style/ComputedStyle.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) 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "core/style/ShapeValue.h" 42 #include "core/style/ShapeValue.h"
43 #include "core/style/StyleBackgroundData.h" 43 #include "core/style/StyleBackgroundData.h"
44 #include "core/style/StyleBoxData.h" 44 #include "core/style/StyleBoxData.h"
45 #include "core/style/StyleContentAlignmentData.h" 45 #include "core/style/StyleContentAlignmentData.h"
46 #include "core/style/StyleDeprecatedFlexibleBoxData.h" 46 #include "core/style/StyleDeprecatedFlexibleBoxData.h"
47 #include "core/style/StyleDifference.h" 47 #include "core/style/StyleDifference.h"
48 #include "core/style/StyleFilterData.h" 48 #include "core/style/StyleFilterData.h"
49 #include "core/style/StyleFlexibleBoxData.h" 49 #include "core/style/StyleFlexibleBoxData.h"
50 #include "core/style/StyleGridData.h" 50 #include "core/style/StyleGridData.h"
51 #include "core/style/StyleGridItemData.h" 51 #include "core/style/StyleGridItemData.h"
52 #include "core/style/StyleImage.h"
52 #include "core/style/StyleInheritedData.h" 53 #include "core/style/StyleInheritedData.h"
53 #include "core/style/StyleMotionPath.h" 54 #include "core/style/StyleMotionPath.h"
54 #include "core/style/StyleMultiColData.h" 55 #include "core/style/StyleMultiColData.h"
55 #include "core/style/StyleRareInheritedData.h" 56 #include "core/style/StyleRareInheritedData.h"
56 #include "core/style/StyleRareNonInheritedData.h" 57 #include "core/style/StyleRareNonInheritedData.h"
57 #include "core/style/StyleReflection.h" 58 #include "core/style/StyleReflection.h"
58 #include "core/style/StyleScrollSnapData.h" 59 #include "core/style/StyleScrollSnapData.h"
59 #include "core/style/StyleSelfAlignmentData.h" 60 #include "core/style/StyleSelfAlignmentData.h"
60 #include "core/style/StyleSurroundData.h" 61 #include "core/style/StyleSurroundData.h"
61 #include "core/style/StyleTransformData.h" 62 #include "core/style/StyleTransformData.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 friend class StyleResolverState; 142 friend class StyleResolverState;
142 friend class StyleResolver; 143 friend class StyleResolver;
143 protected: 144 protected:
144 145
145 // non-inherited attributes 146 // non-inherited attributes
146 DataRef<StyleBoxData> m_box; 147 DataRef<StyleBoxData> m_box;
147 DataRef<StyleVisualData> visual; 148 DataRef<StyleVisualData> visual;
148 DataRef<StyleBackgroundData> m_background; 149 DataRef<StyleBackgroundData> m_background;
149 DataRef<StyleSurroundData> surround; 150 DataRef<StyleSurroundData> surround;
150 DataRef<StyleRareNonInheritedData> rareNonInheritedData; 151 DataRef<StyleRareNonInheritedData> rareNonInheritedData;
152 CSSStyleImageMap m_cssImages;
151 153
152 // inherited attributes 154 // inherited attributes
153 DataRef<StyleRareInheritedData> rareInheritedData; 155 DataRef<StyleRareInheritedData> rareInheritedData;
154 DataRef<StyleInheritedData> inherited; 156 DataRef<StyleInheritedData> inherited;
155 157
156 // list of associated pseudo styles 158 // list of associated pseudo styles
157 OwnPtr<PseudoStyleCache> m_cachedPseudoStyles; 159 OwnPtr<PseudoStyleCache> m_cachedPseudoStyles;
158 160
159 DataRef<SVGComputedStyle> m_svgStyle; 161 DataRef<SVGComputedStyle> m_svgStyle;
160 162
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 376
375 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags .styleType); } 377 PseudoId styleType() const { return static_cast<PseudoId>(noninherited_flags .styleType); }
376 void setStyleType(PseudoId styleType) { noninherited_flags.styleType = style Type; } 378 void setStyleType(PseudoId styleType) { noninherited_flags.styleType = style Type; }
377 379
378 ComputedStyle* getCachedPseudoStyle(PseudoId) const; 380 ComputedStyle* getCachedPseudoStyle(PseudoId) const;
379 ComputedStyle* addCachedPseudoStyle(PassRefPtr<ComputedStyle>); 381 ComputedStyle* addCachedPseudoStyle(PassRefPtr<ComputedStyle>);
380 void removeCachedPseudoStyle(PseudoId); 382 void removeCachedPseudoStyle(PseudoId);
381 383
382 const PseudoStyleCache* cachedPseudoStyles() const { return m_cachedPseudoSt yles.get(); } 384 const PseudoStyleCache* cachedPseudoStyles() const { return m_cachedPseudoSt yles.get(); }
383 385
386 CSSStyleImageMap& mutableCssImages() { return m_cssImages; }
387 const CSSStyleImageMap& cssImages() const { return m_cssImages; }
388
384 void setHasViewportUnits(bool hasViewportUnits = true) const { noninherited_ flags.hasViewportUnits = hasViewportUnits; } 389 void setHasViewportUnits(bool hasViewportUnits = true) const { noninherited_ flags.hasViewportUnits = hasViewportUnits; }
385 bool hasViewportUnits() const { return noninherited_flags.hasViewportUnits; } 390 bool hasViewportUnits() const { return noninherited_flags.hasViewportUnits; }
386 391
387 void setHasRemUnits() const { noninherited_flags.hasRemUnits = true; } 392 void setHasRemUnits() const { noninherited_flags.hasRemUnits = true; }
388 bool hasRemUnits() const { return noninherited_flags.hasRemUnits; } 393 bool hasRemUnits() const { return noninherited_flags.hasRemUnits; }
389 394
390 bool affectedByFocus() const { return noninherited_flags.affectedByFocus; } 395 bool affectedByFocus() const { return noninherited_flags.affectedByFocus; }
391 bool affectedByHover() const { return noninherited_flags.affectedByHover; } 396 bool affectedByHover() const { return noninherited_flags.affectedByHover; }
392 bool affectedByActive() const { return noninherited_flags.affectedByActive; } 397 bool affectedByActive() const { return noninherited_flags.affectedByActive; }
393 bool affectedByDrag() const { return noninherited_flags.affectedByDrag; } 398 bool affectedByDrag() const { return noninherited_flags.affectedByDrag; }
(...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after
1962 } 1967 }
1963 1968
1964 inline bool ComputedStyle::hasPseudoElementStyle() const 1969 inline bool ComputedStyle::hasPseudoElementStyle() const
1965 { 1970 {
1966 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1971 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1967 } 1972 }
1968 1973
1969 } // namespace blink 1974 } // namespace blink
1970 1975
1971 #endif // ComputedStyle_h 1976 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « Source/core/dom/Element.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698