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

Unified Diff: sky/engine/platform/fonts/FontPlatformData.h

Issue 717343002: Replace (unused) FontPlatformData.* with harfbuzz variants. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/platform/BUILD.gn ('k') | sky/engine/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/platform/fonts/FontPlatformData.h
diff --git a/sky/engine/platform/fonts/FontPlatformData.h b/sky/engine/platform/fonts/FontPlatformData.h
index 0f65e88253c21321d2c0d30c39b927bdc6246c96..a02c7287facdb0698288d70613dd177b61fa29d7 100644
--- a/sky/engine/platform/fonts/FontPlatformData.h
+++ b/sky/engine/platform/fonts/FontPlatformData.h
@@ -1,26 +1,123 @@
/*
- * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc.
- * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
- * Copyright (C) 2007 Holger Hans Peter Freyther
- * Copyright (C) 2007 Pioneer Research Center USA, Inc.
- * Copyright (C) 2010, 2011 Brent Fulgham <bfulgham@webkit.org>
+ * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// FIXME: This is temporary until mac switch to using FontPlatformDataHarfBuzz.h and we merge it with this file.
-#include "platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.h"
+#ifndef FontPlatformDataHarfBuzz_h
+#define FontPlatformDataHarfBuzz_h
+
+#include "SkPaint.h"
+#include "platform/SharedBuffer.h"
+#include "platform/fonts/FontDescription.h"
+#include "platform/fonts/FontOrientation.h"
+#include "platform/fonts/FontRenderStyle.h"
+#include "platform/fonts/opentype/OpenTypeVerticalData.h"
+#include "wtf/Forward.h"
+#include "wtf/HashTableDeletedValueType.h"
+#include "wtf/RefPtr.h"
+#include "wtf/text/CString.h"
+#include "wtf/text/StringImpl.h"
+
+class SkTypeface;
+typedef uint32_t SkFontID;
+
+namespace blink {
+
+class GraphicsContext;
+class HarfBuzzFace;
+
+class PLATFORM_EXPORT FontPlatformData {
+public:
+ // Used for deleted values in the font cache's hash tables. The hash table
+ // will create us with this structure, and it will compare other values
+ // to this "Deleted" one. It expects the Deleted one to be differentiable
+ // from the 0 one (created with the empty constructor), so we can't just
+ // set everything to 0.
+ FontPlatformData(WTF::HashTableDeletedValueType);
+ FontPlatformData();
+ FontPlatformData(float textSize, bool syntheticBold, bool syntheticItalic);
+ FontPlatformData(const FontPlatformData&);
+ FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());
+ FontPlatformData(const FontPlatformData& src, float textSize);
+ ~FontPlatformData();
+
+ String fontFamilyName() const;
+ float size() const { return m_textSize; }
+ bool isFixedPitch() const;
+
+ SkTypeface* typeface() const { return m_typeface.get(); }
+ HarfBuzzFace* harfBuzzFace() const;
+ SkFontID uniqueID() const;
+ unsigned hash() const;
+
+ FontOrientation orientation() const { return m_orientation; }
+ void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
+ void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }
+ void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheticItalic; }
+ bool operator==(const FontPlatformData&) const;
+ FontPlatformData& operator=(const FontPlatformData&);
+ bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
+ bool fontContainsCharacter(UChar32 character);
+
+#if ENABLE(OPENTYPE_VERTICAL)
+ PassRefPtr<OpenTypeVerticalData> verticalData() const;
+ PassRefPtr<SharedBuffer> openTypeTable(uint32_t table) const;
+#endif
+
+#ifndef NDEBUG
+ String description() const;
+#endif
+
+ // The returned styles are all actual styles without FontRenderStyle::NoPreference.
+ const FontRenderStyle& fontRenderStyle() const { return m_style; }
+ void setupPaint(SkPaint*, GraphicsContext* = 0) const;
+
+ static void setHinting(SkPaint::Hinting);
+ static void setAutoHint(bool);
+ static void setUseBitmaps(bool);
+ static void setAntiAlias(bool);
+ static void setSubpixelRendering(bool);
+
+private:
+ bool static defaultUseSubpixelPositioning();
+ void querySystemForRenderStyle(bool useSkiaSubpixelPositioning);
+
+ RefPtr<SkTypeface> m_typeface;
+ CString m_family;
+ float m_textSize;
+ bool m_syntheticBold;
+ bool m_syntheticItalic;
+ FontOrientation m_orientation;
+ FontRenderStyle m_style;
+ mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
+ bool m_isHashTableDeletedValue;
+};
+
+} // namespace blink
+
+#endif // ifdef FontPlatformDataHarfBuzz_h
« no previous file with comments | « sky/engine/platform/BUILD.gn ('k') | sky/engine/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698