Use FontPlatformDataHarfBuzz.h on Windows

Source/platform/fonts/win/FontPlatformDataWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 14 matching lines @@
  * 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/LayoutTestSupport.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/harfbuzz/HarfBuzzFace.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "public/platform/Platform.h"
 #include "public/platform/win/WebSandboxSupport.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StdLibExtras.h"
 #include <windows.h>
 
@@ skipping 144 matching lines @@
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_typeface(tf)
     , m_isHashTableDeletedValue(false)
     , m_useSubpixelPositioning(useSubpixelPositioning)
 {
     m_paintTextFlags = computePaintTextFlags(fontFamilyName());
 }
 
+FontPlatformData::~FontPlatformData()
+{
+}
+
 FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
 {
     if (this != &data) {
         m_textSize = data.m_textSize;
         m_syntheticBold = data.m_syntheticBold;
         m_syntheticItalic = data.m_syntheticItalic;
         m_orientation = data.m_orientation;
         m_typeface = data.m_typeface;
         m_paintTextFlags = data.m_paintTextFlags;
     }
     return *this;
 }
 
-FontPlatformData::~FontPlatformData()
-{
-}
-
 String FontPlatformData::fontFamilyName() const
 {
     // FIXME: This returns the requested name, perhaps a better solution would be to
     // return the list of names provided by SkTypeface::createFamilyNameIterator.
     ASSERT(typeface());
     SkString familyName;
     typeface()->getFamilyName(&familyName);
     return String::fromUTF8(familyName.c_str());
 }
 
@@ skipping 13 matching lines @@
 }
 
 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
 {
     if (!m_harfBuzzFace)
         m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
 
     return m_harfBuzzFace.get();
 }
 
+SkFontID FontPlatformData::uniqueID() const
+{
+    return m_typeface->uniqueID();
+}
+
 bool FontPlatformData::defaultUseSubpixelPositioning()
 {
     return FontCache::fontCache()->useSubpixelPositioning();
 }
 
 #ifndef NDEBUG
 String FontPlatformData::description() const
 {
     return String();
 }
 #endif
 
 } // namespace WebCore