Merge FontPlatformDataHarfBuzz and FontPlatformData headers

Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp

 /*
  * 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
@@ skipping 11 matching lines @@
  * 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/harfbuzz/FontPlatformDataHarfBuzz.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)
@@ skipping 98 matching lines @@
     , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
 #endif
 {
     querySystemForRenderStyle(FontDescription::subpixelPositioning());
 }
 
 FontPlatformData::~FontPlatformData()
 {
 }
 
-FontPlatformData& FontPlatformData::operator=(const FontPlatformData& src)
+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;
@@ skipping 49 matching lines @@
         && 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