diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:23:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-04-27 17:07:03 +0100 |
| commit | 692e5dbf12901edacf14812a6fae25462920af42 (patch) | |
| tree | d62802373a429e0a9dc093b6046c166b2c514285 /WebKitLibraries/win | |
| parent | e24bea4efef1c414137d36a9778aa4e142e10c7d (diff) | |
| download | external_webkit-692e5dbf12901edacf14812a6fae25462920af42.zip external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.gz external_webkit-692e5dbf12901edacf14812a6fae25462920af42.tar.bz2 | |
Merge webkit.org at r55033 : Initial merge by git
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
Diffstat (limited to 'WebKitLibraries/win')
| -rw-r--r-- | WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h | 3 | ||||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface.lib | bin | 176088 -> 88932 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib | bin | 78858 -> 89008 bytes | |||
| -rw-r--r-- | WebKitLibraries/win/tools/vsprops/common.vsprops | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h index 824b44d..4534d6f 100644 --- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h +++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h @@ -48,11 +48,14 @@ typedef const struct __CFNumber* CFNumberRef; typedef struct __CFReadStream* CFReadStreamRef; typedef const struct __CFURL* CFURLRef; typedef struct _CFURLProtectionSpace* CFURLProtectionSpaceRef; +typedef struct tagLOGFONTW LOGFONTW; +typedef LOGFONTW LOGFONT; void wkSetFontSmoothingLevel(int type); int wkGetFontSmoothingLevel(); void wkSetFontSmoothingContrast(CGFloat); CGFloat wkGetFontSmoothingContrast(); +void wkSystemFontSmoothingChanged(); uint32_t wkSetFontSmoothingStyle(CGContextRef cg, bool fontAllowsSmoothing); void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle); void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont, bool usePlatformNativeGlyphs); diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib Binary files differindex f1857e7..ddcb692 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib Binary files differindex 9722d97..965672f 100644 --- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib +++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops index 8976ceb..28dfb67 100644 --- a/WebKitLibraries/win/tools/vsprops/common.vsprops +++ b/WebKitLibraries/win/tools/vsprops/common.vsprops @@ -15,7 +15,7 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" - DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387" + DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387" /> <Tool Name="VCLibrarianTool" |