Make canvas filters use the font size in effect when the filter is set

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DState.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CanvasRenderingContext2DState_h
 #define CanvasRenderingContext2DState_h
 
 #include "core/css/CSSFontSelectorClient.h"
 #include "modules/canvas2d/ClipList.h"
 #include "platform/fonts/Font.h"
@@ skipping 64 matching lines @@
     bool hasComplexClip() const { return m_hasComplexClip; }
     void playbackClips(SkCanvas* canvas) const { m_clipList.playback(canvas); }
     const SkPath& getCurrentClipPath() const { return m_clipList.getCurrentClipPath(); }
 
     void setFont(const Font&, CSSFontSelector*);
     const Font& font() const;
     bool hasRealizedFont() const { return m_realizedFont; }
     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*);
     CanvasStyle* strokeStyle() const { return m_strokeStyle.get(); }
 
     void setFillStyle(CanvasStyle*);
     CanvasStyle* fillStyle() const { return m_fillStyle.get(); }
 
     CanvasStyle* style(PaintType) const;
 
@@ skipping 98 matching lines @@
     mutable sk_sp<SkImageFilter> m_shadowOnlyImageFilter;
     mutable sk_sp<SkImageFilter> m_shadowAndForegroundImageFilter;
 
     double m_globalAlpha;
     AffineTransform m_transform;
     Vector<double> m_lineDash;
     double m_lineDashOffset;
 
     String m_unparsedFont;
     Font m_font;
+    Font m_fontForFilter;
 
     String m_unparsedFilter;
     Member<CSSValue> m_filterValue;
     mutable sk_sp<SkImageFilter> m_resolvedFilter;
 
     // Text state.
     TextAlign m_textAlign;
     TextBaseline m_textBaseline;
     Direction m_direction;
 
     bool m_realizedFont : 1;
     bool m_isTransformInvertible : 1;
     bool m_hasClip : 1;
     bool m_hasComplexClip : 1;
     mutable bool m_fillStyleDirty : 1;
     mutable bool m_strokeStyleDirty : 1;
     mutable bool m_lineDashDirty : 1;
 
     bool m_imageSmoothingEnabled;
     SkFilterQuality m_imageSmoothingQuality;
 
     ClipList m_clipList;
 };
 
 } // namespace blink
 
 #endif