diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/skia/ext | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/skia/ext')
| -rw-r--r-- | chromium/skia/ext/fontmgr_default_fuchsia.cc | 5 | ||||
| -rw-r--r-- | chromium/skia/ext/skia_commit_hash.h | 2 | ||||
| -rw-r--r-- | chromium/skia/ext/test_fonts_fuchsia.cc | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/chromium/skia/ext/fontmgr_default_fuchsia.cc b/chromium/skia/ext/fontmgr_default_fuchsia.cc index 6126c292e71..0a1030af44a 100644 --- a/chromium/skia/ext/fontmgr_default_fuchsia.cc +++ b/chromium/skia/ext/fontmgr_default_fuchsia.cc @@ -7,7 +7,7 @@ #include <fuchsia/fonts/cpp/fidl.h> #include <lib/sys/cpp/component_context.h> -#include "base/fuchsia/default_context.h" +#include "base/fuchsia/process_context.h" #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/ports/SkFontMgr_fuchsia.h" @@ -15,8 +15,7 @@ namespace skia { SK_API sk_sp<SkFontMgr> CreateDefaultSkFontMgr() { fuchsia::fonts::ProviderSyncPtr provider; - base::fuchsia::ComponentContextForCurrentProcess()->svc()->Connect( - provider.NewRequest()); + base::ComponentContextForProcess()->svc()->Connect(provider.NewRequest()); return SkFontMgr_New_Fuchsia(std::move(provider)); } diff --git a/chromium/skia/ext/skia_commit_hash.h b/chromium/skia/ext/skia_commit_hash.h index 650f12c59c1..d6de73a67e4 100644 --- a/chromium/skia/ext/skia_commit_hash.h +++ b/chromium/skia/ext/skia_commit_hash.h @@ -3,6 +3,6 @@ #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_ #define SKIA_EXT_SKIA_COMMIT_HASH_H_ -#define SKIA_COMMIT_HASH "e50772b2a25e98419dc884cc5cdd2138e1dfd43e" +#define SKIA_COMMIT_HASH "8ae885386e910cff8c543ae0d952a2c43f46e4ad" #endif // SKIA_EXT_SKIA_COMMIT_HASH_H_ diff --git a/chromium/skia/ext/test_fonts_fuchsia.cc b/chromium/skia/ext/test_fonts_fuchsia.cc index b9bb644c38c..509cfb43573 100644 --- a/chromium/skia/ext/test_fonts_fuchsia.cc +++ b/chromium/skia/ext/test_fonts_fuchsia.cc @@ -10,8 +10,8 @@ #include <lib/fidl/cpp/interface_handle.h> #include <lib/sys/cpp/component_context.h> -#include "base/fuchsia/default_context.h" #include "base/fuchsia/file_utils.h" +#include "base/fuchsia/process_context.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/path_service.h" @@ -46,8 +46,7 @@ fuchsia::fonts::ProviderSyncPtr RunTestProviderWithTestFonts( font_provider_services_dir.NewRequest().TakeChannel(); fuchsia::sys::LauncherSyncPtr launcher; - base::fuchsia::ComponentContextForCurrentProcess()->svc()->Connect( - launcher.NewRequest()); + base::ComponentContextForProcess()->svc()->Connect(launcher.NewRequest()); launcher->CreateComponent(std::move(launch_info), controller_out->NewRequest()); |