diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
| commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
| tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/skia/ext | |
| parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
| download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz | |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/skia/ext')
| -rw-r--r-- | chromium/skia/ext/fontmgr_default_fuchsia.cc | 23 | ||||
| -rw-r--r-- | chromium/skia/ext/fontmgr_default_fuchsia.h | 16 | ||||
| -rw-r--r-- | chromium/skia/ext/skia_commit_hash.h | 2 |
3 files changed, 1 insertions, 40 deletions
diff --git a/chromium/skia/ext/fontmgr_default_fuchsia.cc b/chromium/skia/ext/fontmgr_default_fuchsia.cc deleted file mode 100644 index 06c583efe42..00000000000 --- a/chromium/skia/ext/fontmgr_default_fuchsia.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "skia/ext/fontmgr_default_fuchsia.h" - -#include "third_party/skia/include/ports/SkFontMgr.h" -#include "third_party/skia/include/ports/SkFontMgr_android.h" - -namespace { -// An owning leaky bare pointer. -SkFontMgr* g_default_fontmgr = nullptr; -} // namespace - -SK_API void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr) { - SkASSERT(g_default_fontmgr == nullptr); - g_default_fontmgr = fontmgr.release(); -} - -SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() { - // TODO(fuchsia): Implement SkFontMgr. - return g_default_fontmgr ? sk_ref_sp(g_default_fontmgr) : nullptr; -} diff --git a/chromium/skia/ext/fontmgr_default_fuchsia.h b/chromium/skia/ext/fontmgr_default_fuchsia.h deleted file mode 100644 index a7a8e3a4dd0..00000000000 --- a/chromium/skia/ext/fontmgr_default_fuchsia.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef SKIA_EXT_FONTMGR_DEFAULT_FUCHSIA_H_ -#define SKIA_EXT_FONTMGR_DEFAULT_FUCHSIA_H_ - -#include "third_party/skia/include/core/SkTypes.h" - -class SkFontMgr; -template <typename T> -class sk_sp; - -SK_API void SetDefaultSkiaFactory(sk_sp<SkFontMgr> fontmgr); - -#endif // SKIA_EXT_FONTMGR_DEFAULT_FUCHSIA_H_ diff --git a/chromium/skia/ext/skia_commit_hash.h b/chromium/skia/ext/skia_commit_hash.h index a1e3ee91248..c75f082800b 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 "9b2caa32d28d80789df32838c8da1dd3164b1036-" +#define SKIA_COMMIT_HASH "263671d207f86f782d1172743dfcacf156b43ac7-" #endif // SKIA_EXT_SKIA_COMMIT_HASH_H_ |