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

Unified Diff: Source/core/css/resolver/CSSToStyleMap.h

Issue 772043003: Make CSSToStyleMap static. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/CSSToStyleMap.h
diff --git a/Source/core/css/resolver/CSSToStyleMap.h b/Source/core/css/resolver/CSSToStyleMap.h
index 4f7d8e07cc9c8218a0a707be04f2740a77910c3d..b366b9b7356ec7d34084a480d6334dedda1a8ec4 100644
--- a/Source/core/css/resolver/CSSToStyleMap.h
+++ b/Source/core/css/resolver/CSSToStyleMap.h
@@ -25,43 +25,31 @@
#include "core/CSSPropertyNames.h"
#include "core/animation/Timing.h"
#include "core/animation/css/CSSTransitionData.h"
-#include "core/css/resolver/ElementStyleResources.h"
#include "core/rendering/style/RenderStyleConstants.h"
#include "platform/animation/TimingFunction.h"
-#include "wtf/Noncopyable.h"
namespace blink {
class FillLayer;
-class CSSToLengthConversionData;
class CSSValue;
-class RenderStyle;
-class StyleImage;
class StyleResolverState;
class NinePieceImage;
class BorderImageLengthBox;
-// CSSToStyleMap is a short-lived helper object which
-// given the current StyleResolverState can map
-// CSSValue objects into their RenderStyle equivalents.
-
class CSSToStyleMap {
- STACK_ALLOCATED();
- WTF_MAKE_NONCOPYABLE(CSSToStyleMap);
public:
- CSSToStyleMap(const StyleResolverState& state, ElementStyleResources& elementStyleResources) : m_state(state), m_elementStyleResources(elementStyleResources) { }
- void mapFillAttachment(FillLayer*, CSSValue*) const;
- void mapFillClip(FillLayer*, CSSValue*) const;
- void mapFillComposite(FillLayer*, CSSValue*) const;
- void mapFillBlendMode(FillLayer*, CSSValue*) const;
- void mapFillOrigin(FillLayer*, CSSValue*) const;
- void mapFillImage(FillLayer*, CSSValue*);
- void mapFillRepeatX(FillLayer*, CSSValue*) const;
- void mapFillRepeatY(FillLayer*, CSSValue*) const;
- void mapFillSize(FillLayer*, CSSValue*) const;
- void mapFillXPosition(FillLayer*, CSSValue*) const;
- void mapFillYPosition(FillLayer*, CSSValue*) const;
- void mapFillMaskSourceType(FillLayer*, CSSValue*) const;
+ static void mapFillAttachment(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillClip(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillComposite(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillBlendMode(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillOrigin(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillImage(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillRepeatX(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillRepeatY(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillSize(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillXPosition(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillYPosition(StyleResolverState&, FillLayer*, CSSValue*);
+ static void mapFillMaskSourceType(StyleResolverState&, FillLayer*, CSSValue*);
static double mapAnimationDelay(CSSValue*);
static Timing::PlaybackDirection mapAnimationDirection(CSSValue*);
@@ -73,20 +61,10 @@ public:
static CSSTransitionData::TransitionProperty mapAnimationProperty(CSSValue*);
static PassRefPtr<TimingFunction> mapAnimationTimingFunction(CSSValue*, bool allowStepMiddle = false);
- void mapNinePieceImage(RenderStyle* mutableStyle, CSSPropertyID, CSSValue*, NinePieceImage&);
- void mapNinePieceImageSlice(CSSValue*, NinePieceImage&) const;
- BorderImageLengthBox mapNinePieceImageQuad(CSSValue*) const;
- void mapNinePieceImageRepeat(CSSValue*, NinePieceImage&) const;
-
-private:
- const CSSToLengthConversionData& cssToLengthConversionData() const;
-
- PassRefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue*);
-
- // FIXME: Consider passing a StyleResolverState (or ElementResolveState)
- // as an argument instead of caching it on this object.
- const StyleResolverState& m_state;
- ElementStyleResources& m_elementStyleResources;
+ static void mapNinePieceImage(StyleResolverState&, CSSPropertyID, CSSValue*, NinePieceImage&);
+ static void mapNinePieceImageSlice(StyleResolverState&, CSSValue*, NinePieceImage&);
+ static BorderImageLengthBox mapNinePieceImageQuad(StyleResolverState&, CSSValue*);
+ static void mapNinePieceImageRepeat(StyleResolverState&, CSSValue*, NinePieceImage&);
};
}
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | Source/core/css/resolver/CSSToStyleMap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698