| Index: Source/core/layout/LayoutTextCombine.h
|
| diff --git a/Source/core/layout/LayoutTextCombine.h b/Source/core/layout/LayoutTextCombine.h
|
| index 115042c73b6c696e33f6dade5da870daacee87ba..ba7ba4a1a9cdd4976779a09720e5eb69ab31487b 100644
|
| --- a/Source/core/layout/LayoutTextCombine.h
|
| +++ b/Source/core/layout/LayoutTextCombine.h
|
| @@ -45,7 +45,7 @@ public:
|
|
|
| private:
|
| virtual bool isCombineText() const override { return true; }
|
| - virtual float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, GlyphOverflow* = nullptr) const override;
|
| + virtual float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, FloatRect* = nullptr) const override;
|
| virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
|
| virtual void setTextInternal(PassRefPtr<StringImpl>) override;
|
| void updateIsCombined();
|
|
|