Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Unified Diff: include/core/SkFontStyle.h

Issue 667023002: Revert of Replace SkTypeface::Style with SkFontStyle. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/ports.gyp ('k') | include/core/SkTypeface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkFontStyle.h
diff --git a/include/core/SkFontStyle.h b/include/core/SkFontStyle.h
deleted file mode 100644
index f42d7dd4701824b6f15666bf875c839b41216092..0000000000000000000000000000000000000000
--- a/include/core/SkFontStyle.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkFontStyle_DEFINED
-#define SkFontStyle_DEFINED
-
-#include "SkTypes.h"
-
-class SK_API SkFontStyle {
-public:
- enum Weight {
- kThin_Weight = 100,
- kExtraLight_Weight = 200,
- kLight_Weight = 300,
- kNormal_Weight = 400,
- kMedium_Weight = 500,
- kSemiBold_Weight = 600,
- kBold_Weight = 700,
- kExtraBold_Weight = 800,
- kBlack_Weight = 900
- };
-
- enum Width {
- kUltraCondensed_Width = 1,
- kExtraCondensed_Width = 2,
- kCondensed_Width = 3,
- kSemiCondensed_Width = 4,
- kNormal_Width = 5,
- kSemiExpanded_Width = 6,
- kExpanded_Width = 7,
- kExtraExpanded_Width = 8,
- kUltaExpanded_Width = 9
- };
-
- enum Slant {
- kUpright_Slant,
- kItalic_Slant,
- };
-
- SkFontStyle();
- SkFontStyle(int weight, int width, Slant);
- /** oldStyle means the style-bits in SkTypeface::Style: bold=1, italic=2 */
- explicit SkFontStyle(unsigned oldStyle);
-
- bool operator==(const SkFontStyle& rhs) const {
- return fUnion.fU32 == rhs.fUnion.fU32;
- }
-
- int weight() const { return fUnion.fR.fWeight; }
- int width() const { return fUnion.fR.fWidth; }
- Slant slant() const { return (Slant)fUnion.fR.fSlant; }
-
- bool isItalic() const {
- return kItalic_Slant == fUnion.fR.fSlant;
- }
-
-private:
- union {
- struct {
- uint16_t fWeight; // 100 .. 900
- uint8_t fWidth; // 1 .. 9
- uint8_t fSlant; // 0 .. 2
- } fR;
- uint32_t fU32;
- } fUnion;
-};
-
-#endif
« no previous file with comments | « gyp/ports.gyp ('k') | include/core/SkTypeface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698