| Index: third_party/WebKit/Source/platform/fonts/Font.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/Font.cpp b/third_party/WebKit/Source/platform/fonts/Font.cpp
|
| index 82c94d4078c150db7f07f31708cf95890abe05e7..1a0c8df3fb8909689aa4d72ab0d55164069cc8a8 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/Font.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/Font.cpp
|
| @@ -409,10 +409,14 @@
|
|
|
| CodePath Font::codePath(const TextRunPaintInfo& runInfo) const
|
| {
|
| +// TODO(eae): Disable the always use complex text feature on Android for now as
|
| +// it caused a memory regression for webview. crbug.com/577306
|
| +#if !OS(ANDROID)
|
| if (RuntimeEnabledFeatures::alwaysUseComplexTextEnabled()
|
| || LayoutTestSupport::alwaysUseComplexTextForTest()) {
|
| return ComplexPath;
|
| }
|
| +#endif
|
|
|
| const TextRun& run = runInfo.run;
|
|
|
|
|