Bug 140390 – Devirtualize FontData

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[Antti Koivisto]

We have font ranges and simple fonts. Those don't need a common base.

[Antti Koivisto]

Created attachment 244515 [details]
patch

[Antti Koivisto]

Created attachment 244519 [details]
patch

[Andreas Kling]

Comment on attachment 244519 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=244519&action=review

r=me

> Source/WebCore/css/CSSSegmentedFontFace.cpp:126
> +        unsigned size = m_fontFaces.size();
> +        for (unsigned i = 0; i < size; i++) {

Range for?

> Source/WebCore/platform/graphics/FontRanges.h:47
> +    PassRefPtr<SimpleFontData> fontData() const { return m_fontData; }

This should return RefPtr (or Ref.)

> Source/WebCore/platform/graphics/FontRanges.h:57
> +    static PassRefPtr<SegmentedFontData> create() { return adoptRef(new SegmentedFontData); }

This should return Ref.

[Antti Koivisto]

> > Source/WebCore/platform/graphics/FontRanges.h:47
> > +    PassRefPtr<SimpleFontData> fontData() const { return m_fontData; }
> 
> This should return RefPtr (or Ref.)
> 
> > Source/WebCore/platform/graphics/FontRanges.h:57
> > +    static PassRefPtr<SegmentedFontData> create() { return adoptRef(new SegmentedFontData); }
> 
> This should return Ref.

This is just the move of a move-edit. The edit part fixed these.

[Antti Koivisto]

http://trac.webkit.org/changeset/178388

[Chris Dumez]

May have broken the build:
/Volumes/Data/EWS/WebKit/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp -o /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/Objects-normal/x86_64/FontComplexTextMac.o
/Volumes/Data/EWS/WebKit/Source/WebCore/platform/graphics/mac/FontComplexTextMac.cpp:141:47: error: no member named 'isEmpty' in 'WebCore::FontRanges'
    for (unsigned i = 0; !fallbackRangesAt(i).isEmpty(); ++i) {
                          ~~~~~~~~~~~~~~~~~~~ ^
1 error generated.

[Chris Dumez]

(In reply to comment #6)
> May have broken the build:
> /Volumes/Data/EWS/WebKit/Source/WebCore/platform/graphics/mac/
> FontComplexTextMac.cpp -o
> /Volumes/Data/EWS/WebKit/WebKitBuild/WebCore.build/Release/WebCore.build/
> Objects-normal/x86_64/FontComplexTextMac.o
> /Volumes/Data/EWS/WebKit/Source/WebCore/platform/graphics/mac/
> FontComplexTextMac.cpp:141:47: error: no member named 'isEmpty' in
> 'WebCore::FontRanges'
>     for (unsigned i = 0; !fallbackRangesAt(i).isEmpty(); ++i) {
>                           ~~~~~~~~~~~~~~~~~~~ ^
> 1 error generated.

Build fix landed in <http://trac.webkit.org/changeset/178389>.

[Chris Dumez]

Seems to have broken IOS build with errors like these:
Source/WebKit/ios/Misc/EmojiFallbackFontSelector.h:36:24: error: no member named 'FontData' in namespace 'WebCore'; did you mean 'WebCore::GlyphData::fontData'

[Chris Dumez]

Another iOS build fix was landed in <https://trac.webkit.org/r178389>.