Index: Source/modules/canvas2d/CanvasRenderingContext2DState.h |
diff --git a/Source/modules/canvas2d/CanvasRenderingContext2DState.h b/Source/modules/canvas2d/CanvasRenderingContext2DState.h |
index 2195fc08098b0de3b6f4b9b019b9dcbf0d4d7ad6..75401f42c01c9f180642c0f9d6771a57b02e68d6 100644 |
--- a/Source/modules/canvas2d/CanvasRenderingContext2DState.h |
+++ b/Source/modules/canvas2d/CanvasRenderingContext2DState.h |
@@ -6,6 +6,7 @@ |
#define CanvasRenderingContext2DState_h |
#include "core/css/CSSFontSelectorClient.h" |
+#include "core/css/CSSValue.h" |
#include "modules/canvas2d/ClipList.h" |
#include "platform/fonts/Font.h" |
#include "platform/transforms/AffineTransform.h" |
@@ -14,7 +15,6 @@ |
namespace blink { |
class CanvasStyle; |
-class CSSValue; |
class Element; |
class CanvasRenderingContext2DState final : public NoBaseWillBeGarbageCollectedFinalized<CanvasRenderingContext2DState>, public CSSFontSelectorClient { |
@@ -80,7 +80,7 @@ public: |
void setUnparsedFont(const String& font) { m_unparsedFont = font; } |
const String& unparsedFont() const { return m_unparsedFont; } |
- void setFilter(PassRefPtrWillBeRawPtr<CSSValue>); |
+ void setFilter(CSSValue); |
void setUnparsedFilter(const String& filterString) { m_unparsedFilter = filterString; } |
const String& unparsedFilter() const { return m_unparsedFilter; } |
SkImageFilter* getFilter(Element*, const Font&) const; |
@@ -200,7 +200,7 @@ private: |
Font m_font; |
String m_unparsedFilter; |
- RefPtrWillBeMember<CSSValue> m_filterValue; |
+ NullableCSSValue m_filterValue; |
mutable RefPtr<SkImageFilter> m_resolvedFilter; |
// Text state. |