From 75e1ab05e731d99b9acdc86de47640720e848415 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Thu, 6 Jul 2017 13:45:58 +0000 Subject: Revert "typeface double delete" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ddf2418ba8e5d925909d7955ac22b33f37ccce44. Reason for revert: not right Original change's description: > typeface double delete > > SkTypeface was doubly deleted at pdfium teardown > SkTypeface has two pointers but no owners. > Making the font cache an owner fixes the bug but > violates checkdeps rules. Let me know what to > do about that. > > R=​dsinclair@chromium.org,npm@chromium.org > Bug: 736133 > Change-Id: I756a41258a5ac86e70139d7a587c5da9bb7a707b > Reviewed-on: https://pdfium-review.googlesource.com/7270 > Reviewed-by: Nicolás Peña > Commit-Queue: Cary Clark TBR=dsinclair@chromium.org,caryclark@google.com,npm@chromium.org,caryclark@skia.org Change-Id: I255f50acf2cbaecc85b8e5ac3893c1fbc77b6492 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 736133 Reviewed-on: https://pdfium-review.googlesource.com/7310 Reviewed-by: Cary Clark Commit-Queue: Cary Clark --- core/fxge/cfx_facecache.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'core/fxge/cfx_facecache.h') diff --git a/core/fxge/cfx_facecache.h b/core/fxge/cfx_facecache.h index 076ba1f330..d6847debdb 100644 --- a/core/fxge/cfx_facecache.h +++ b/core/fxge/cfx_facecache.h @@ -14,10 +14,6 @@ #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" -#if defined _SKIA_SUPPORT_ || _SKIA_SUPPORT_PATHS_ -#include "third_party/skia/include/core/SkTypeface.h" -#endif - class CFX_FaceCache { public: explicit CFX_FaceCache(FXFT_Face face); @@ -64,7 +60,7 @@ class CFX_FaceCache { std::map> m_SizeMap; std::map> m_PathMap; #if defined _SKIA_SUPPORT_ || _SKIA_SUPPORT_PATHS_ - sk_sp m_pTypeface; + CFX_UnownedPtr m_pTypeface; #endif }; -- cgit v1.2.3