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

Unified Diff: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

Issue 557823003: Revert "Merge FontPlatformDataHarfBuzz into FontPlatformData" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp
diff --git a/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp b/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..25790d54fd027e20bf7daf2ef88349e14bded325
--- /dev/null
+++ b/Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * 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.
+ */
+
+#include "config.h"
+#include "platform/fonts/FontPlatformData.h"
+
+#include "SkTypeface.h"
+#include "platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "wtf/text/WTFString.h"
+
+namespace blink {
+
+FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
+ : m_textSize(0)
+ , m_syntheticBold(false)
+ , m_syntheticItalic(false)
+ , m_orientation(Horizontal)
+ , m_isHashTableDeletedValue(true)
+#if OS(WIN)
+ , m_paintTextFlags(0)
+ , m_minSizeForAntiAlias(0)
+ , m_minSizeForSubpixel(0)
+ , m_useSubpixelPositioning(false)
+#endif
+{
+}
+
+FontPlatformData::FontPlatformData()
+ : m_textSize(0)
+ , m_syntheticBold(false)
+ , m_syntheticItalic(false)
+ , m_orientation(Horizontal)
+ , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+ , m_paintTextFlags(0)
+ , m_minSizeForAntiAlias(0)
+ , m_minSizeForSubpixel(0)
+ , m_useSubpixelPositioning(false)
+#endif
+{
+}
+
+FontPlatformData::FontPlatformData(float textSize, bool syntheticBold, bool syntheticItalic)
+ : m_textSize(textSize)
+ , m_syntheticBold(syntheticBold)
+ , m_syntheticItalic(syntheticItalic)
+ , m_orientation(Horizontal)
+ , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+ , m_paintTextFlags(0)
+ , m_minSizeForAntiAlias(0)
+ , m_minSizeForSubpixel(0)
+ , m_useSubpixelPositioning(false)
+#endif
+{
+}
+
+FontPlatformData::FontPlatformData(const FontPlatformData& src)
+ : m_typeface(src.m_typeface)
+#if !OS(WIN)
+ , m_family(src.m_family)
+#endif
+ , m_textSize(src.m_textSize)
+ , m_syntheticBold(src.m_syntheticBold)
+ , m_syntheticItalic(src.m_syntheticItalic)
+ , m_orientation(src.m_orientation)
+ , m_style(src.m_style)
+ , m_harfBuzzFace(nullptr)
+ , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+ , m_paintTextFlags(src.m_paintTextFlags)
+ , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+ , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
+ , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
+#endif
+{
+}
+
+FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, bool subpixelTextPosition)
+ : m_typeface(tf)
+#if !OS(WIN)
+ , m_family(family)
+#endif
+ , m_textSize(textSize)
+ , m_syntheticBold(syntheticBold)
+ , m_syntheticItalic(syntheticItalic)
+ , m_orientation(orientation)
+ , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+ , m_paintTextFlags(0)
+ , m_minSizeForAntiAlias(0)
+ , m_minSizeForSubpixel(0)
+ , m_useSubpixelPositioning(subpixelTextPosition)
+#endif
+{
+ querySystemForRenderStyle(subpixelTextPosition);
+}
+
+FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
+ : m_typeface(src.m_typeface)
+#if !OS(WIN)
+ , m_family(src.m_family)
+#endif
+ , m_textSize(textSize)
+ , m_syntheticBold(src.m_syntheticBold)
+ , m_syntheticItalic(src.m_syntheticItalic)
+ , m_orientation(src.m_orientation)
+ , m_harfBuzzFace(nullptr)
+ , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+ , m_paintTextFlags(src.m_paintTextFlags)
+ , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+ , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
+ , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
+#endif
+{
+ querySystemForRenderStyle(FontDescription::subpixelPositioning());
+}
+
+FontPlatformData::~FontPlatformData()
+{
+}
+
+const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)
+{
+ m_typeface = src.m_typeface;
+#if !OS(WIN)
+ m_family = src.m_family;
+#endif
+ m_textSize = src.m_textSize;
+ m_syntheticBold = src.m_syntheticBold;
+ m_syntheticItalic = src.m_syntheticItalic;
+ m_harfBuzzFace = nullptr;
+ m_orientation = src.m_orientation;
+ m_style = src.m_style;
+#if OS(WIN)
+ m_paintTextFlags = 0;
+ m_minSizeForAntiAlias = src.m_minSizeForAntiAlias;
+ m_minSizeForSubpixel = src.m_minSizeForSubpixel;
+ m_useSubpixelPositioning = src.m_useSubpixelPositioning;
+#endif
+
+ return *this;
+}
+
+SkFontID FontPlatformData::uniqueID() const
+{
+ return m_typeface->uniqueID();
+}
+
+String FontPlatformData::fontFamilyName() const
+{
+ // FIXME(crbug.com/326582): come up with a proper way of handling SVG.
+ if (!this->typeface())
+ return "";
+ SkTypeface::LocalizedStrings* fontFamilyIterator = this->typeface()->createFamilyNameIterator();
+ SkTypeface::LocalizedString localizedString;
+ while (fontFamilyIterator->next(&localizedString) && !localizedString.fString.size()) { }
+ fontFamilyIterator->unref();
+ return String(localizedString.fString.c_str());
+}
+
+bool FontPlatformData::operator==(const FontPlatformData& a) const
+{
+ // If either of the typeface pointers are null then we test for pointer
+ // equality. Otherwise, we call SkTypeface::Equal on the valid pointers.
+ bool typefacesEqual;
+ if (!m_typeface || !a.m_typeface)
+ typefacesEqual = m_typeface == a.m_typeface;
+ else
+ typefacesEqual = SkTypeface::Equal(m_typeface.get(), a.m_typeface.get());
+
+ return typefacesEqual
+ && m_textSize == a.m_textSize
+ && m_syntheticBold == a.m_syntheticBold
+ && m_syntheticItalic == a.m_syntheticItalic
+ && m_orientation == a.m_orientation
+ && m_style == a.m_style
+ && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue;
+}
+
+bool FontPlatformData::isFixedPitch() const
+{
+ return typeface() && typeface()->isFixedPitch();
+}
+
+SkTypeface* FontPlatformData::typeface() const
+{
+ return m_typeface.get();
+}
+
+HarfBuzzFace* FontPlatformData::harfBuzzFace() const
+{
+ if (!m_harfBuzzFace)
+ m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
+
+ return m_harfBuzzFace.get();
+}
+
+} // namespace blink
« no previous file with comments | « Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698