Merge 134902

Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.h

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 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 17 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef FontPlatformDataChromiumWin_h
 #define FontPlatformDataChromiumWin_h
 
 #include "config.h"
 
 #include "FontOrientation.h"
+#include "OpenTypeVerticalData.h"
 #include "SharedBuffer.h"
 #include "SkTypeface.h"
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/StringImpl.h> 
 
 #include <usp10.h>
 
 typedef struct HFONT__ *HFONT;
 
 namespace WebCore {
 
 // Return a typeface associated with the hfont, and return its size and
 // lfQuality from the hfont's LOGFONT. The caller is now an owner of the
 // typeface.
 SkTypeface* CreateTypefaceFromHFont(HFONT, int* size, int* lfQuality);
 
 class FontDescription;
-#if ENABLE(OPENTYPE_VERTICAL)
-class OpenTypeVerticalData;
-#endif
 
 class 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 NULL one (created with the empty constructor), so we can't just
     // set everything to NULL.
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
@@ skipping 81 matching lines @@
     SkTypeface* m_typeface; // cached from m_font
     int m_lfQuality; // cached from m_font
 
     mutable SCRIPT_CACHE m_scriptCache;
     mutable SCRIPT_FONTPROPERTIES* m_scriptFontProperties;
 };
 
 } // WebCore
 
 #endif // FontPlatformDataChromiumWin_h