Bug 234054 – Use thread safe initialization for statics in ComplexTextController::collectComplexTextRunsForCharacters

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[Cameron McCormack (:heycam)]

Use thread safe initialization for statics in ComplexTextController::collectComplexTextRunsForCharacters

[Cameron McCormack (:heycam)]

Created attachment 446474 [details]
Patch

[Darin Adler]

Comment on attachment 446474 [details]
Patch

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

> Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm:163
> +static CFDictionaryRef ltrTypesetterOptions()
> +{
> +    static LazyNeverDestroyed<RetainPtr<CFDictionaryRef>> options;
> +    static std::once_flag onceFlag;
> +    std::call_once(onceFlag, [&] {
> +        options.construct(makeTypesetterOptions(true));
> +    });
> +    return options.get().get();
> +}
> +
> +static CFDictionaryRef rtlTypesetterOptions()
> +{
> +    static LazyNeverDestroyed<RetainPtr<CFDictionaryRef>> options;
> +    static std::once_flag onceFlag;
> +    std::call_once(onceFlag, [&] {
> +        options.construct(makeTypesetterOptions(false));
> +    });
> +    return options.get().get();
> +}

Use a template function with an int or bool argument so we don’t have to repeat the code twice?

> Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm:205
> +        RetainPtr<CTTypesetterRef> typesetter = adoptCF(CTTypesetterCreateWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions() : rtlTypesetterOptions()));

auto is better here

[Cameron McCormack (:heycam)]

This patch too won't be needed if bug 234102 succeeds.

[Radar WebKit Bug Importer]

<rdar://problem/86553179>

[Matt Woodrow]

Created attachment 461057 [details]
Patch

[EWS]

Committed 252669@main (01711aa5bc47): <https://commits.webkit.org/252669@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 461057 [details].