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

Side by Side Diff: core/fxge/win32/fx_win32_dwrite.cpp

Issue 1832173003: Remove FX_DWORD from core/ and delete definition (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « core/fxge/win32/fx_win32_dib.cpp ('k') | core/fxge/win32/fx_win32_gdipext.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/include/fxge/fx_ge.h" 7 #include "core/include/fxge/fx_ge.h"
8 8
9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ 9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
10 #include <dwrite.h> 10 #include <dwrite.h>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 if (m_pDwFontContext) { 120 if (m_pDwFontContext) {
121 delete (CDwFontContext*)m_pDwFontContext; 121 delete (CDwFontContext*)m_pDwFontContext;
122 m_pDwFontContext = NULL; 122 m_pDwFontContext = NULL;
123 } 123 }
124 SafeRelease((IDWriteFactory**)&m_pDWriteFactory); 124 SafeRelease((IDWriteFactory**)&m_pDWriteFactory);
125 } 125 }
126 CDWriteExt::~CDWriteExt() { 126 CDWriteExt::~CDWriteExt() {
127 Unload(); 127 Unload();
128 } 128 }
129 LPVOID CDWriteExt::DwCreateFontFaceFromStream(uint8_t* pData, 129 LPVOID CDWriteExt::DwCreateFontFaceFromStream(uint8_t* pData,
130 FX_DWORD size, 130 uint32_t size,
131 int simulation_style) { 131 int simulation_style) {
132 IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory; 132 IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory;
133 IDWriteFontFile* pDwFontFile = NULL; 133 IDWriteFontFile* pDwFontFile = NULL;
134 IDWriteFontFace* pDwFontFace = NULL; 134 IDWriteFontFace* pDwFontFace = NULL;
135 BOOL isSupportedFontType = FALSE; 135 BOOL isSupportedFontType = FALSE;
136 DWRITE_FONT_FILE_TYPE fontFileType; 136 DWRITE_FONT_FILE_TYPE fontFileType;
137 DWRITE_FONT_FACE_TYPE fontFaceType; 137 DWRITE_FONT_FACE_TYPE fontFaceType;
138 UINT32 numberOfFaces; 138 UINT32 numberOfFaces;
139 DWRITE_FONT_SIMULATIONS fontStyle = 139 DWRITE_FONT_SIMULATIONS fontStyle =
140 (DWRITE_FONT_SIMULATIONS)(simulation_style & 3); 140 (DWRITE_FONT_SIMULATIONS)(simulation_style & 3);
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 textColor); 401 textColor);
402 if (FAILED(hr)) { 402 if (FAILED(hr)) {
403 return hr; 403 return hr;
404 } 404 }
405 pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(), 405 pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(),
406 text_bbox.Height(), &dib, text_bbox.left, 406 text_bbox.Height(), &dib, text_bbox.left,
407 text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn); 407 text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn);
408 return hr; 408 return hr;
409 } 409 }
410 #endif 410 #endif
OLDNEW
« no previous file with comments | « core/fxge/win32/fx_win32_dib.cpp ('k') | core/fxge/win32/fx_win32_gdipext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698