| Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h
|
| index 75def6c4626085e051dfd1f69ffd3e669e2ff2a1..fbb05bc0d71954b80c8a6c7ca17c2df7a5a5eb37 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h
|
| @@ -82,11 +82,13 @@ public:
|
| void setUnparsedFont(const String& font) { m_unparsedFont = font; }
|
| const String& unparsedFont() const { return m_unparsedFont; }
|
|
|
| + void setFontForFilter(const Font& font) { m_fontForFilter = font; }
|
| +
|
| void setFilter(CSSValue*);
|
| void setUnparsedFilter(const String& filterString) { m_unparsedFilter = filterString; }
|
| const String& unparsedFilter() const { return m_unparsedFilter; }
|
| - SkImageFilter* getFilter(Element*, const Font&, IntSize canvasSize, CanvasRenderingContext2D*) const;
|
| - bool hasFilter(Element*, const Font&, IntSize canvasSize, CanvasRenderingContext2D*) const;
|
| + SkImageFilter* getFilter(Element*, IntSize canvasSize, CanvasRenderingContext2D*) const;
|
| + bool hasFilter(Element*, IntSize canvasSize, CanvasRenderingContext2D*) const;
|
| void clearResolvedFilter() const;
|
|
|
| void setStrokeStyle(CanvasStyle*);
|
| @@ -205,6 +207,7 @@ private:
|
|
|
| String m_unparsedFont;
|
| Font m_font;
|
| + Font m_fontForFilter;
|
|
|
| String m_unparsedFilter;
|
| Member<CSSValue> m_filterValue;
|
|
|