vcl/inc/fontinstance.hxx | 1
vcl/inc/impfontcache.hxx | 68 +++++++++++++++++++++++++++++++++++++++++++++++
vcl/inc/outdev.h | 35 ------------------------
vcl/inc/svdata.hxx | 2 +
vcl/inc/window.h | 2 +
5 files changed, 74 insertions(+), 34 deletions(-)
New commits:
commit 3a0d7c93f80a6adbbd7dce8b9eeb82270b2a89aa
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Thu Jan 14 09:43:10 2016 +1100
vcl: move ImplFontCache into own private header
Change-Id: Ic4444f54fabe03319de9add93653f6b7c91d6fce
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index 54a74d0..407892b 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -26,6 +26,7 @@
#include "fontselect.hxx"
#include "fontattributes.hxx"
#include "impfontmetricdata.hxx"
+#include "impfontcache.hxx"
#include <unordered_map>
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx
new file mode 100644
index 0000000..8dc10dd
--- /dev/null
+++ b/vcl/inc/impfontcache.hxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_INC_IMPFONTCACHE_HXX
+#define INCLUDED_VCL_INC_IMPFONTCACHE_HXX
+
+#include <unordered_map>
+
+#include "fontselect.hxx"
+
+class Size;
+namespace vcl { class Font; }
+class PhysicalFontCollection;
+
+
+// TODO: closely couple with PhysicalFontCollection
+
+class ImplFontCache
+{
+private:
+ LogicalFontInstance* mpFirstEntry;
+ int mnRef0Count; // number of unreferenced
LogicalFontInstances
+
+ // cache of recently used font instances
+ struct IFSD_Equal { bool operator()( const FontSelectPattern&, const
FontSelectPattern& ) const; };
+ struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; };
+ typedef
std::unordered_map<FontSelectPattern,LogicalFontInstance*,IFSD_Hash,IFSD_Equal
> FontInstanceList;
+ FontInstanceList maFontInstanceList;
+
+ int CountUnreferencedEntries() const;
+
+public:
+ ImplFontCache();
+ ~ImplFontCache();
+
+ LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
+ const vcl::Font&, const Size& rPixelSize, float
fExactHeight);
+ LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
FontSelectPattern& );
+ LogicalFontInstance* GetGlyphFallbackFont( PhysicalFontCollection*,
FontSelectPattern&,
+ int nFallbackLevel, OUString& rMissingCodes );
+
+ /// Increase the refcount of the given LogicalFontInstance.
+ void Acquire(LogicalFontInstance*);
+ /// Decrease the refcount and potentially cleanup the entries with zero
refcount from the cache.
+ void Release(LogicalFontInstance*);
+
+ void Invalidate();
+};
+
+#endif // INCLUDED_VCL_INC_IMPFONTCACHE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 9310cfe..fcca71e 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -29,6 +29,7 @@
#include "fontinstance.hxx"
#include "PhysicalFontFace.hxx"
+#include "impfontcache.hxx"
class Size;
namespace vcl { class Font; }
@@ -124,40 +125,6 @@ public:
virtual bool FindFontSubstitute( FontSelectPattern&, OUString&
rMissingCodes ) const = 0;
};
-// TODO: closely couple with PhysicalFontCollection
-
-class ImplFontCache
-{
-private:
- LogicalFontInstance* mpFirstEntry;
- int mnRef0Count; // number of unreferenced
LogicalFontInstances
-
- // cache of recently used font instances
- struct IFSD_Equal { bool operator()( const FontSelectPattern&, const
FontSelectPattern& ) const; };
- struct IFSD_Hash { size_t operator()( const FontSelectPattern& ) const; };
- typedef
std::unordered_map<FontSelectPattern,LogicalFontInstance*,IFSD_Hash,IFSD_Equal
> FontInstanceList;
- FontInstanceList maFontInstanceList;
-
- int CountUnreferencedEntries() const;
-
-public:
- ImplFontCache();
- ~ImplFontCache();
-
- LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
- const vcl::Font&, const Size& rPixelSize, float
fExactHeight);
- LogicalFontInstance* GetFontInstance( PhysicalFontCollection*,
FontSelectPattern& );
- LogicalFontInstance* GetGlyphFallbackFont( PhysicalFontCollection*,
FontSelectPattern&,
- int nFallbackLevel, OUString& rMissingCodes );
-
- /// Increase the refcount of the given LogicalFontInstance.
- void Acquire(LogicalFontInstance*);
- /// Decrease the refcount and potentially cleanup the entries with zero
refcount from the cache.
- void Release(LogicalFontInstance*);
-
- void Invalidate();
-};
-
namespace vcl { struct ControlLayoutData; }
// #i75163#
namespace basegfx { class B2DHomMatrix; }
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index b559cf3..7f6090b 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -38,6 +38,8 @@
#include "vcl/vclevent.hxx"
#include "vcleventlisteners.hxx"
+#include "impfontcache.hxx"
+
#include "unotools/options.hxx"
#include "xconnection.hxx"
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 64551af..25719ac 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -38,6 +38,8 @@
#include <vcl/vclptr.hxx>
#include <vcl/rendersettings.hxx>
#include "vcleventlisteners.hxx"
+#include "impfontcache.hxx"
+
#include <vector>
#include <set>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
