3287588a46
SkPDFFont:
* inline some one-line methdods.
- SkPDFFont::typeface()
- SkPDFFont::fontInfo()
- SkPDFFont::firstGlyphID()
- SkPDFFont::lastGlyphID()
- SkPDFFont::getFontDescriptor()
* de-virtualize some methods:
- SkPDFFont::getType()
- SkPDFFont::multiByteGlyphs()
* Constructor takes more arguments:
fontType, multiByteGlyphs
* re-order fields (pointers before shorts)
* use sk_sp<T> more, T* less
SkAdvancedTypefaceMetrics:
* SkAdvancedTypefaceMetrics::fFont now a uint8_t
* other enumes are sized.
* SkAdvancedTypefaceMetrics::fStyle now big enough.
* remove use of SkTBitOr, replaced with fancy templates
No public API changes.
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2246903002
Review-Url: https://codereview.chromium.org/2246903002
35 lines
991 B
C++
35 lines
991 B
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#ifndef SkEnumOperators_DEFINED
|
|
#define SkEnumOperators_DEFINED
|
|
|
|
#include "SkTLogic.h"
|
|
|
|
namespace skstd {
|
|
template <typename T> struct is_bitmask_enum : std::false_type {};
|
|
}
|
|
|
|
template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) operator|(E l, E r) {
|
|
using U = skstd::underlying_type_t<E>;
|
|
return static_cast<E>(static_cast<U>(l) | static_cast<U>(r));
|
|
}
|
|
|
|
template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) operator|=(E& l, E r) {
|
|
return l = l | r;
|
|
}
|
|
|
|
template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E) operator&(E l, E r) {
|
|
using U = skstd::underlying_type_t<E>;
|
|
return static_cast<E>(static_cast<U>(l) & static_cast<U>(r));
|
|
}
|
|
|
|
template <typename E> SK_WHEN(skstd::is_bitmask_enum<E>::value, E&) operator&=(E& l, E r) {
|
|
return l = l & r;
|
|
}
|
|
|
|
#endif // SkEnumOperators_DEFINED
|