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

Unified Diff: Source/modules/canvas2d/CanvasRenderingContext2DState.h

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
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.
« no previous file with comments | « Source/modules/canvas2d/CanvasRenderingContext2D.cpp ('k') | Source/modules/canvas2d/CanvasRenderingContext2DState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698