Index: third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp |
=================================================================== |
--- third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp (revision 0) |
+++ third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.cpp (working copy) |
@@ -69,6 +69,15 @@ |
BigEndianULong length; |
}; |
+#if !PLATFORM(CG) |
+// Fixed type is not defined on non-CG platforms. |version| in sfntHeader |
+// and headTable and |fontRevision| in headTable are of Fixed, but they're |
+// not actually refered to anywhere. Therefore, we just have to match |
+// the size (4 bytes). For the definition of Fixed type, see |
+// http://developer.apple.com/documentation/mac/Legacy/GXEnvironment/GXEnvironment-356.html#HEADING356-6. |
+typedef int32_t Fixed; |
+#endif |
+ |
struct sfntHeader { |
Fixed version; |
BigEndianUShort numTables; |
Property changes on: third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.cpp |
___________________________________________________________________ |
Added: svn:mergeinfo |
Merged /branches/chrome_webkit_merge_branch/deps/third_party/WebKit/WebCore/platform/graphics/win/OpenTypeUtilities.cpp:r3734-4214,4606-5108,5177-5263 |