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

Unified Diff: core/src/fxge/android/fx_android_font.cpp

Issue 453133004: clang-format all code (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 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
Index: core/src/fxge/android/fx_android_font.cpp
diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp
index 5f8aafc39395bd19554845cc6a3b0280a2189506..ad83ef42b1a9865bf47f1c0cd3718362969ce545 100644
--- a/core/src/fxge/android/fx_android_font.cpp
+++ b/core/src/fxge/android/fx_android_font.cpp
@@ -1,87 +1,85 @@
// Copyright 2014 PDFium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
+
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "fx_fpf.h"
#if _FX_OS_ == _FX_ANDROID_
-CFX_AndroidFontInfo::CFX_AndroidFontInfo()
- : m_pFontMgr(NULL)
-{
-}
-FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr *pFontMgr)
-{
- if (!pFontMgr) {
- return FALSE;
- }
- pFontMgr->LoadSystemFonts();
- m_pFontMgr = pFontMgr;
- return TRUE;
+CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {
}
-FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper)
-{
+FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) {
+ if (!pFontMgr) {
return FALSE;
+ }
+ pFontMgr->LoadSystemFonts();
+ m_pFontMgr = pFontMgr;
+ return TRUE;
}
-void* CFX_AndroidFontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact)
-{
- if (!m_pFontMgr) {
- return NULL;
- }
- FX_DWORD dwStyle = 0;
- if (weight >= 700) {
- dwStyle |= FXFONT_BOLD;
- }
- if (bItalic) {
- dwStyle |= FXFONT_ITALIC;
- }
- if (pitch_family & FXFONT_FF_FIXEDPITCH) {
- dwStyle |= FXFONT_FIXED_PITCH;
- }
- if (pitch_family & FXFONT_FF_SCRIPT) {
- dwStyle |= FXFONT_SCRIPT;
- }
- if (pitch_family & FXFONT_FF_ROMAN) {
- dwStyle |= FXFONT_SERIF;
- }
- return m_pFontMgr->CreateFont(face, charset, dwStyle, FPF_MATCHFONT_REPLACEANSI);
+FX_BOOL CFX_AndroidFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
+ return FALSE;
}
-void* CFX_AndroidFontInfo::GetFont(FX_LPCSTR face)
-{
+void* CFX_AndroidFontInfo::MapFont(int weight,
+ FX_BOOL bItalic,
+ int charset,
+ int pitch_family,
+ FX_LPCSTR face,
+ FX_BOOL& bExact) {
+ if (!m_pFontMgr) {
return NULL;
+ }
+ FX_DWORD dwStyle = 0;
+ if (weight >= 700) {
+ dwStyle |= FXFONT_BOLD;
+ }
+ if (bItalic) {
+ dwStyle |= FXFONT_ITALIC;
+ }
+ if (pitch_family & FXFONT_FF_FIXEDPITCH) {
+ dwStyle |= FXFONT_FIXED_PITCH;
+ }
+ if (pitch_family & FXFONT_FF_SCRIPT) {
+ dwStyle |= FXFONT_SCRIPT;
+ }
+ if (pitch_family & FXFONT_FF_ROMAN) {
+ dwStyle |= FXFONT_SERIF;
+ }
+ return m_pFontMgr->CreateFont(
+ face, charset, dwStyle, FPF_MATCHFONT_REPLACEANSI);
}
-FX_DWORD CFX_AndroidFontInfo::GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)
-{
- if (!hFont) {
- return 0;
- }
- return ((IFPF_Font*)hFont)->GetFontData(table, buffer, size);
+void* CFX_AndroidFontInfo::GetFont(FX_LPCSTR face) {
+ return NULL;
}
-FX_BOOL CFX_AndroidFontInfo::GetFaceName(void* hFont, CFX_ByteString& name)
-{
- if (!hFont) {
- return FALSE;
- }
- name = ((IFPF_Font*)hFont)->GetFamilyName();
- return TRUE;
+FX_DWORD CFX_AndroidFontInfo::GetFontData(void* hFont,
+ FX_DWORD table,
+ FX_LPBYTE buffer,
+ FX_DWORD size) {
+ if (!hFont) {
+ return 0;
+ }
+ return ((IFPF_Font*)hFont)->GetFontData(table, buffer, size);
}
-FX_BOOL CFX_AndroidFontInfo::GetFontCharset(void* hFont, int& charset)
-{
- if (!hFont) {
- return FALSE;
- }
- charset = ((IFPF_Font*)hFont)->GetCharset();
+FX_BOOL CFX_AndroidFontInfo::GetFaceName(void* hFont, CFX_ByteString& name) {
+ if (!hFont) {
return FALSE;
+ }
+ name = ((IFPF_Font*)hFont)->GetFamilyName();
+ return TRUE;
}
-void CFX_AndroidFontInfo::DeleteFont(void* hFont)
-{
- if (!hFont) {
- return;
- }
- ((IFPF_Font*)hFont)->Release();
+FX_BOOL CFX_AndroidFontInfo::GetFontCharset(void* hFont, int& charset) {
+ if (!hFont) {
+ return FALSE;
+ }
+ charset = ((IFPF_Font*)hFont)->GetCharset();
+ return FALSE;
}
-void* CFX_AndroidFontInfo::RetainFont(void* hFont)
-{
- return NULL;
+void CFX_AndroidFontInfo::DeleteFont(void* hFont) {
+ if (!hFont) {
+ return;
+ }
+ ((IFPF_Font*)hFont)->Release();
+}
+void* CFX_AndroidFontInfo::RetainFont(void* hFont) {
+ return NULL;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698