summaryrefslogtreecommitdiff
path: root/core/fxge/win32
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-04-25 17:35:21 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-04-25 17:35:21 +0000
commit7b01255ef62f8df5cdd3053fd42c5c501274186d (patch)
tree09ac126ca9ba7eae7e581f57be0f815b28a9e232 /core/fxge/win32
parentd9da586dd3dbaa35706ac274e2fef8b73b867b22 (diff)
downloadpdfium-7b01255ef62f8df5cdd3053fd42c5c501274186d.tar.xz
Remove CDWriteExt.
It is never used. Change-Id: I09220eb16a4679c8499079c3c1375574f6fc0450 Reviewed-on: https://pdfium-review.googlesource.com/31300 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/win32')
-rw-r--r--core/fxge/win32/dwrite_int.h71
-rw-r--r--core/fxge/win32/fx_win32_device.cpp1
-rw-r--r--core/fxge/win32/fx_win32_dwrite.cpp446
-rw-r--r--core/fxge/win32/win32_int.h2
4 files changed, 0 insertions, 520 deletions
diff --git a/core/fxge/win32/dwrite_int.h b/core/fxge/win32/dwrite_int.h
deleted file mode 100644
index 7fbb929c08..0000000000
--- a/core/fxge/win32/dwrite_int.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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
-
-#ifndef CORE_FXGE_WIN32_DWRITE_INT_H_
-#define CORE_FXGE_WIN32_DWRITE_INT_H_
-
-#include "core/fxcrt/fx_coordinates.h"
-#include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/fx_dib.h"
-
-#ifndef DECLSPEC_UUID
-#if defined(__cplusplus)
-#define DECLSPEC_UUID(x) __declspec(uuid(x))
-#else
-#define DECLSPEC_UUID(x)
-#endif
-#endif
-#ifndef DECLSPEC_NOVTABLE
-#if defined(__cplusplus)
-#define DECLSPEC_NOVTABLE __declspec(novtable)
-#else
-#define DECLSPEC_NOVTABLE
-#endif
-#endif
-#if (WINVER < 0x0500)
-#ifndef _MAC
-DECLARE_HANDLE(HMONITOR);
-#endif
-#endif
-class CDWriteExt {
- public:
- CDWriteExt();
- ~CDWriteExt();
-
- void Load();
- void Unload();
-
- bool IsAvailable() { return !!m_pDWriteFactory; }
-
- void* DwCreateFontFaceFromStream(uint8_t* pData,
- uint32_t size,
- int simulation_style);
- bool DwCreateRenderingTarget(const RetainPtr<CFX_DIBitmap>& pSrc,
- void** renderTarget);
- void DwDeleteRenderingTarget(void* renderTarget);
- bool DwRendingString(void* renderTarget,
- CFX_ClipRgn* pClipRgn,
- FX_RECT& stringRect,
- CFX_Matrix* pMatrix,
- void* font,
- float font_size,
- FX_ARGB text_color,
- int glyph_count,
- unsigned short* glyph_indices,
- float baselineOriginX,
- float baselineOriginY,
- void* glyph_offsets,
- float* glyph_advances);
- void DwDeleteFont(void* pFont);
-
- protected:
- void* m_hModule;
- void* m_pDWriteFactory;
- void* m_pDwFontContext;
- void* m_pDwTextRenderer;
-};
-
-#endif // CORE_FXGE_WIN32_DWRITE_INT_H_
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index 4047866412..f5b062ba61 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -25,7 +25,6 @@
#include "core/fxge/fx_freetype.h"
#include "core/fxge/systemfontinfo_iface.h"
#include "core/fxge/win32/cfx_windowsdib.h"
-#include "core/fxge/win32/dwrite_int.h"
#include "core/fxge/win32/win32_int.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
diff --git a/core/fxge/win32/fx_win32_dwrite.cpp b/core/fxge/win32/fx_win32_dwrite.cpp
deleted file mode 100644
index 4d4f45f947..0000000000
--- a/core/fxge/win32/fx_win32_dwrite.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// 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 <dwrite.h>
-
-#include "core/fxcrt/fx_system.h"
-#include "core/fxge/cfx_cliprgn.h"
-#include "core/fxge/win32/dwrite_int.h"
-
-typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
- __in DWRITE_FACTORY_TYPE,
- __in REFIID,
- __out IUnknown**);
-template <typename InterfaceType>
-inline void SafeRelease(InterfaceType** currentObject) {
- if (*currentObject) {
- (*currentObject)->Release();
- *currentObject = nullptr;
- }
-}
-template <typename InterfaceType>
-inline InterfaceType* SafeAcquire(InterfaceType* newObject) {
- if (newObject) {
- newObject->AddRef();
- }
- return newObject;
-}
-
-class CDwFontFileStream final : public IDWriteFontFileStream {
- public:
- explicit CDwFontFileStream(void const* fontFileReferenceKey,
- UINT32 fontFileReferenceKeySize);
-
- // IUnknown.
- HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
- void** ppvObject) override;
- ULONG STDMETHODCALLTYPE AddRef() override;
- ULONG STDMETHODCALLTYPE Release() override;
-
- // IDWriteFontFileStream.
- HRESULT STDMETHODCALLTYPE
- ReadFileFragment(void const** fragmentStart,
- UINT64 fileOffset,
- UINT64 fragmentSize,
- OUT void** fragmentContext) override;
- void STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext) override;
- HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize) override;
- HRESULT STDMETHODCALLTYPE
- GetLastWriteTime(OUT UINT64* lastWriteTime) override;
-
- bool IsInitialized() { return !!resourcePtr_; }
-
- private:
- ULONG refCount_;
- void const* resourcePtr_;
- DWORD resourceSize_;
-};
-
-class CDwFontFileLoader final : public IDWriteFontFileLoader {
- public:
- // IUnknown.
- HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
- void** ppvObject) override;
- ULONG STDMETHODCALLTYPE AddRef() override;
- ULONG STDMETHODCALLTYPE Release() override;
-
- // IDWriteFontFileLoader.
- HRESULT STDMETHODCALLTYPE
- CreateStreamFromKey(void const* fontFileReferenceKey,
- UINT32 fontFileReferenceKeySize,
- OUT IDWriteFontFileStream** fontFileStream) override;
-
- static IDWriteFontFileLoader* GetLoader() {
- if (!instance_) {
- instance_ = new CDwFontFileLoader();
- }
- return instance_;
- }
- static bool IsLoaderInitialized() { return !!instance_; }
-
- private:
- CDwFontFileLoader();
- ULONG refCount_;
- static IDWriteFontFileLoader* instance_;
-};
-
-class CDwFontContext {
- public:
- explicit CDwFontContext(IDWriteFactory* dwriteFactory);
- ~CDwFontContext();
-
- HRESULT Initialize();
-
- private:
- CDwFontContext(CDwFontContext const&);
- void operator=(CDwFontContext const&);
- HRESULT hr_;
- IDWriteFactory* dwriteFactory_;
-};
-
-class CDwGdiTextRenderer {
- public:
- CDwGdiTextRenderer(const RetainPtr<CFX_DIBitmap>& pBitmap,
- IDWriteBitmapRenderTarget* bitmapRenderTarget,
- IDWriteRenderingParams* renderingParams);
- ~CDwGdiTextRenderer();
-
- HRESULT STDMETHODCALLTYPE DrawGlyphRun(const FX_RECT& text_bbox,
- __in_opt CFX_ClipRgn* pClipRgn,
- __in_opt DWRITE_MATRIX const* pMatrix,
- FLOAT baselineOriginX,
- FLOAT baselineOriginY,
- DWRITE_MEASURING_MODE measuringMode,
- __in DWRITE_GLYPH_RUN const* glyphRun,
- const COLORREF& textColor);
-
- private:
- RetainPtr<CFX_DIBitmap> pBitmap_;
- IDWriteBitmapRenderTarget* pRenderTarget_;
- IDWriteRenderingParams* pRenderingParams_;
-};
-
-CDWriteExt::CDWriteExt()
- : m_hModule(nullptr),
- m_pDWriteFactory(nullptr),
- m_pDwFontContext(nullptr),
- m_pDwTextRenderer(nullptr) {}
-
-void CDWriteExt::Load() {}
-
-void CDWriteExt::Unload() {
- if (m_pDwFontContext) {
- delete (CDwFontContext*)m_pDwFontContext;
- m_pDwFontContext = nullptr;
- }
- SafeRelease((IDWriteFactory**)&m_pDWriteFactory);
-}
-
-CDWriteExt::~CDWriteExt() {
- Unload();
-}
-
-LPVOID CDWriteExt::DwCreateFontFaceFromStream(uint8_t* pData,
- uint32_t size,
- int simulation_style) {
- IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory;
- IDWriteFontFile* pDwFontFile = nullptr;
- IDWriteFontFace* pDwFontFace = nullptr;
- BOOL isSupportedFontType = false;
- DWRITE_FONT_FILE_TYPE fontFileType;
- DWRITE_FONT_FACE_TYPE fontFaceType;
- UINT32 numberOfFaces;
- DWRITE_FONT_SIMULATIONS fontStyle =
- (DWRITE_FONT_SIMULATIONS)(simulation_style & 3);
- HRESULT hr = S_OK;
- hr = pDwFactory->CreateCustomFontFileReference(
- (void const*)pData, (UINT32)size, CDwFontFileLoader::GetLoader(),
- &pDwFontFile);
- if (FAILED(hr)) {
- goto failed;
- }
- hr = pDwFontFile->Analyze(&isSupportedFontType, &fontFileType, &fontFaceType,
- &numberOfFaces);
- if (FAILED(hr) || !isSupportedFontType ||
- fontFaceType == DWRITE_FONT_FACE_TYPE_UNKNOWN) {
- goto failed;
- }
- hr = pDwFactory->CreateFontFace(fontFaceType, 1, &pDwFontFile, 0, fontStyle,
- &pDwFontFace);
- if (FAILED(hr)) {
- goto failed;
- }
- SafeRelease(&pDwFontFile);
- return pDwFontFace;
-failed:
- SafeRelease(&pDwFontFile);
- return nullptr;
-}
-
-bool CDWriteExt::DwCreateRenderingTarget(const RetainPtr<CFX_DIBitmap>& pBitmap,
- void** renderTarget) {
- if (pBitmap->GetFormat() > FXDIB_Argb) {
- return false;
- }
- IDWriteFactory* pDwFactory = (IDWriteFactory*)m_pDWriteFactory;
- IDWriteGdiInterop* pGdiInterop = nullptr;
- IDWriteBitmapRenderTarget* pBitmapRenderTarget = nullptr;
- IDWriteRenderingParams* pRenderingParams = nullptr;
- HRESULT hr = S_OK;
- hr = pDwFactory->GetGdiInterop(&pGdiInterop);
- if (FAILED(hr)) {
- goto failed;
- }
- hr = pGdiInterop->CreateBitmapRenderTarget(
- nullptr, pBitmap->GetWidth(), pBitmap->GetHeight(), &pBitmapRenderTarget);
- if (FAILED(hr)) {
- goto failed;
- }
- hr = pDwFactory->CreateCustomRenderingParams(
- 1.0f, 0.0f, 1.0f, DWRITE_PIXEL_GEOMETRY_RGB,
- DWRITE_RENDERING_MODE_DEFAULT, &pRenderingParams);
- if (FAILED(hr)) {
- goto failed;
- }
- hr = pBitmapRenderTarget->SetPixelsPerDip(1.0f);
- if (FAILED(hr)) {
- goto failed;
- }
- *(CDwGdiTextRenderer**)renderTarget =
- new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
- SafeRelease(&pGdiInterop);
- SafeRelease(&pBitmapRenderTarget);
- SafeRelease(&pRenderingParams);
- return true;
-failed:
- SafeRelease(&pGdiInterop);
- SafeRelease(&pBitmapRenderTarget);
- SafeRelease(&pRenderingParams);
- return false;
-}
-
-bool CDWriteExt::DwRendingString(void* renderTarget,
- CFX_ClipRgn* pClipRgn,
- FX_RECT& stringRect,
- CFX_Matrix* pMatrix,
- void* font,
- float font_size,
- FX_ARGB text_color,
- int glyph_count,
- unsigned short* glyph_indices,
- float baselineOriginX,
- float baselineOriginY,
- void* glyph_offsets,
- float* glyph_advances) {
- if (!renderTarget) {
- return true;
- }
- CDwGdiTextRenderer* pTextRenderer = (CDwGdiTextRenderer*)renderTarget;
- DWRITE_MATRIX transform;
- DWRITE_GLYPH_RUN glyphRun;
- HRESULT hr = S_OK;
- if (pMatrix) {
- transform.m11 = pMatrix->a;
- transform.m12 = pMatrix->b;
- transform.m21 = pMatrix->c;
- transform.m22 = pMatrix->d;
- transform.dx = pMatrix->e;
- transform.dy = pMatrix->f;
- }
- glyphRun.fontFace = (IDWriteFontFace*)font;
- glyphRun.fontEmSize = font_size;
- glyphRun.glyphCount = glyph_count;
- glyphRun.glyphIndices = glyph_indices;
- glyphRun.glyphAdvances = glyph_advances;
- glyphRun.glyphOffsets = (DWRITE_GLYPH_OFFSET*)glyph_offsets;
- glyphRun.isSideways = false;
- glyphRun.bidiLevel = 0;
- hr = pTextRenderer->DrawGlyphRun(
- stringRect, pClipRgn, pMatrix ? &transform : nullptr, baselineOriginX,
- baselineOriginY, DWRITE_MEASURING_MODE_NATURAL, &glyphRun,
- RGB(FXARGB_R(text_color), FXARGB_G(text_color), FXARGB_B(text_color)));
- return SUCCEEDED(hr);
-}
-
-void CDWriteExt::DwDeleteRenderingTarget(void* renderTarget) {
- delete (CDwGdiTextRenderer*)renderTarget;
-}
-
-void CDWriteExt::DwDeleteFont(void* pFont) {
- if (pFont) {
- SafeRelease((IDWriteFontFace**)&pFont);
- }
-}
-
-CDwFontFileStream::CDwFontFileStream(void const* fontFileReferenceKey,
- UINT32 fontFileReferenceKeySize) {
- refCount_ = 0;
- resourcePtr_ = fontFileReferenceKey;
- resourceSize_ = fontFileReferenceKeySize;
-}
-
-HRESULT STDMETHODCALLTYPE CDwFontFileStream::QueryInterface(REFIID iid,
- void** ppvObject) {
- if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileStream)) {
- *ppvObject = this;
- AddRef();
- return S_OK;
- }
- *ppvObject = nullptr;
- return E_NOINTERFACE;
-}
-
-ULONG STDMETHODCALLTYPE CDwFontFileStream::AddRef() {
- return InterlockedIncrement((long*)(&refCount_));
-}
-
-ULONG STDMETHODCALLTYPE CDwFontFileStream::Release() {
- ULONG newCount = InterlockedDecrement((long*)(&refCount_));
- if (newCount == 0) {
- delete this;
- }
- return newCount;
-}
-
-HRESULT STDMETHODCALLTYPE
-CDwFontFileStream::ReadFileFragment(void const** fragmentStart,
- UINT64 fileOffset,
- UINT64 fragmentSize,
- OUT void** fragmentContext) {
- if (fileOffset <= resourceSize_ &&
- fragmentSize <= resourceSize_ - fileOffset) {
- *fragmentStart = static_cast<uint8_t const*>(resourcePtr_) +
- static_cast<size_t>(fileOffset);
- *fragmentContext = nullptr;
- return S_OK;
- }
- *fragmentStart = nullptr;
- *fragmentContext = nullptr;
- return E_FAIL;
-}
-
-void STDMETHODCALLTYPE
-CDwFontFileStream::ReleaseFileFragment(void* fragmentContext) {}
-HRESULT STDMETHODCALLTYPE CDwFontFileStream::GetFileSize(OUT UINT64* fileSize) {
- *fileSize = resourceSize_;
- return S_OK;
-}
-
-HRESULT STDMETHODCALLTYPE
-CDwFontFileStream::GetLastWriteTime(OUT UINT64* lastWriteTime) {
- *lastWriteTime = 0;
- return E_NOTIMPL;
-}
-
-IDWriteFontFileLoader* CDwFontFileLoader::instance_ = nullptr;
-CDwFontFileLoader::CDwFontFileLoader() : refCount_(0) {}
-HRESULT STDMETHODCALLTYPE CDwFontFileLoader::QueryInterface(REFIID iid,
- void** ppvObject) {
- if (iid == IID_IUnknown || iid == __uuidof(IDWriteFontFileLoader)) {
- *ppvObject = this;
- AddRef();
- return S_OK;
- }
- *ppvObject = nullptr;
- return E_NOINTERFACE;
-}
-
-ULONG STDMETHODCALLTYPE CDwFontFileLoader::AddRef() {
- return InterlockedIncrement((long*)(&refCount_));
-}
-
-ULONG STDMETHODCALLTYPE CDwFontFileLoader::Release() {
- ULONG newCount = InterlockedDecrement((long*)(&refCount_));
- if (newCount == 0) {
- instance_ = nullptr;
- delete this;
- }
- return newCount;
-}
-
-HRESULT STDMETHODCALLTYPE CDwFontFileLoader::CreateStreamFromKey(
- void const* fontFileReferenceKey,
- UINT32 fontFileReferenceKeySize,
- OUT IDWriteFontFileStream** fontFileStream) {
- *fontFileStream = nullptr;
- CDwFontFileStream* stream =
- new CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize);
- if (!stream->IsInitialized()) {
- delete stream;
- return E_FAIL;
- }
- *fontFileStream = SafeAcquire(stream);
- return S_OK;
-}
-
-CDwFontContext::CDwFontContext(IDWriteFactory* dwriteFactory)
- : hr_(S_FALSE), dwriteFactory_(SafeAcquire(dwriteFactory)) {}
-
-CDwFontContext::~CDwFontContext() {
- if (dwriteFactory_ && hr_ == S_OK) {
- dwriteFactory_->UnregisterFontFileLoader(CDwFontFileLoader::GetLoader());
- }
- SafeRelease(&dwriteFactory_);
-}
-
-HRESULT CDwFontContext::Initialize() {
- if (hr_ == S_FALSE) {
- return hr_ = dwriteFactory_->RegisterFontFileLoader(
- CDwFontFileLoader::GetLoader());
- }
- return hr_;
-}
-
-CDwGdiTextRenderer::CDwGdiTextRenderer(
- const RetainPtr<CFX_DIBitmap>& pBitmap,
- IDWriteBitmapRenderTarget* bitmapRenderTarget,
- IDWriteRenderingParams* renderingParams)
- : pBitmap_(pBitmap),
- pRenderTarget_(SafeAcquire(bitmapRenderTarget)),
- pRenderingParams_(SafeAcquire(renderingParams)) {}
-CDwGdiTextRenderer::~CDwGdiTextRenderer() {
- SafeRelease(&pRenderTarget_);
- SafeRelease(&pRenderingParams_);
-}
-
-STDMETHODIMP CDwGdiTextRenderer::DrawGlyphRun(
- const FX_RECT& text_bbox,
- __in_opt CFX_ClipRgn* pClipRgn,
- __in_opt DWRITE_MATRIX const* pMatrix,
- FLOAT baselineOriginX,
- FLOAT baselineOriginY,
- DWRITE_MEASURING_MODE measuringMode,
- __in DWRITE_GLYPH_RUN const* glyphRun,
- const COLORREF& textColor) {
- HRESULT hr = S_OK;
- if (pMatrix) {
- hr = pRenderTarget_->SetCurrentTransform(pMatrix);
- if (FAILED(hr)) {
- return hr;
- }
- }
- HDC hDC = pRenderTarget_->GetMemoryDC();
- HBITMAP hBitmap = (HBITMAP)::GetCurrentObject(hDC, OBJ_BITMAP);
- BITMAP bitmap;
- GetObject(hBitmap, sizeof bitmap, &bitmap);
- auto dib = pdfium::MakeRetain<CFX_DIBitmap>();
- dib->Create(bitmap.bmWidth, bitmap.bmHeight,
- bitmap.bmBitsPixel == 24 ? FXDIB_Rgb : FXDIB_Rgb32,
- (uint8_t*)bitmap.bmBits);
- dib->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(),
- text_bbox.Height(), pBitmap_, text_bbox.left,
- text_bbox.top, FXDIB_BLEND_NORMAL, nullptr);
- hr = pRenderTarget_->DrawGlyphRun(baselineOriginX, baselineOriginY,
- measuringMode, glyphRun, pRenderingParams_,
- textColor);
- if (FAILED(hr)) {
- return hr;
- }
- pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(),
- text_bbox.Height(), dib, text_bbox.left,
- text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn);
- return hr;
-}
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index b248522f0a..7d4ec43cb9 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -17,7 +17,6 @@
#include "core/fxge/renderdevicedriver_iface.h"
#include "core/fxge/win32/cfx_psrenderer.h"
#include "core/fxge/win32/cpsoutput.h"
-#include "core/fxge/win32/dwrite_int.h"
class CFX_ImageRenderer;
class FXTEXT_CHARPOS;
@@ -126,7 +125,6 @@ class CWin32Platform {
public:
bool m_bHalfTone;
CGdiplusExt m_GdiplusExt;
- CDWriteExt m_DWriteExt;
};
class CGdiDeviceDriver : public RenderDeviceDriverIface {