| Index: third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.h
 | 
| ===================================================================
 | 
| --- third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.h	(revision 0)
 | 
| +++ third_party/WebKit/WebCore/platform/graphics/opentype/OpenTypeUtilities.h	(working copy)
 | 
| @@ -30,6 +30,9 @@
 | 
|  #include <wtf/Forward.h>
 | 
|  
 | 
|  namespace WebCore {
 | 
| +#if !PLATFORM(CG)
 | 
| +typedef unsigned char UInt8;
 | 
| +#endif
 | 
|  
 | 
|  class SharedBuffer;
 | 
|  
 | 
| 
 | 
| Property changes on: third_party\WebKit\WebCore\platform\graphics\opentype\OpenTypeUtilities.h
 | 
| ___________________________________________________________________
 | 
| Added: svn:mergeinfo
 | 
|    Merged /branches/chrome_webkit_merge_branch/deps/third_party/WebKit/WebCore/platform/graphics/win/OpenTypeUtilities.h:r3734-4214,4606-5108,5177-5263
 | 
| 
 | 
| 
 |