commit 325cb9aa17b94258b362082eb3a799524f4345f3
author vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 30 18:36:29 2011 +0000
committer vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 30 18:36:29 2011 +0000
tree ba2f296cc1337cb858ee2ea1289e153dc512588a
parent e733071abeb9cce9f524f5a85851bc7fbb8d867b

Improve the SkAdvancedTypefaceMetrics interface w.r.t. vertical advances.

Add a template function to type safe-combine bits of a bit field.

Review URL: http://codereview.appspot.com/4313053

git-svn-id: http://skia.googlecode.com/svn/trunk@1020 2bbb7eff-a529-9590-31e7-b0007b416f81

src/pdf/SkPDFFont.cpp

diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 83caea5..9a2180d 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -28,6 +28,7 @@
 #include "SkScalar.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
+#include "SkTypes.h"
 #include "SkUtils.h"
 
 namespace {
@@ -411,7 +412,9 @@
         fontInfo = relatedFont->fFontInfo;
         fontDescriptor = relatedFont->fDescriptor.get();
     } else {
-        fontInfo = SkFontHost::GetAdvancedTypefaceMetrics(fontID, true);
+        fontInfo = SkFontHost::GetAdvancedTypefaceMetrics(fontID, SkTBitOr(
+                SkAdvancedTypefaceMetrics::kHAdvance_PerGlyphInfo,
+                SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo));
         SkSafeUnref(fontInfo.get());  // SkRefPtr and Get both took a reference.
     }