From 692e5dbf12901edacf14812a6fae25462920af42 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:23:55 +0100 Subject: Merge webkit.org at r55033 : Initial merge by git Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5 --- WebKitLibraries/ChangeLog | 20 ++++++++++++++++++++ .../WebKitSystemInterface/WebKitSystemInterface.h | 3 +++ WebKitLibraries/win/lib/WebKitSystemInterface.lib | Bin 176088 -> 88932 bytes .../win/lib/WebKitSystemInterface_debug.lib | Bin 78858 -> 89008 bytes WebKitLibraries/win/tools/vsprops/common.vsprops | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) (limited to 'WebKitLibraries') diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog index 8eccc7d..0bc9e66 100644 --- a/WebKitLibraries/ChangeLog +++ b/WebKitLibraries/ChangeLog @@ -1,3 +1,23 @@ +2010-02-18 Steve Falkenburg + + Reviewed by Dan Bernstein. + + WebKit on Windows needs a mechanism to listen for WM_SETTINGCHANGED messages + https://bugs.webkit.org/show_bug.cgi?id=35076 + + * win/include/WebKitSystemInterface/WebKitSystemInterface.h: + * win/lib/WebKitSystemInterface.lib: Updated to add wkSystemFontSmoothingChanged. + * win/lib/WebKitSystemInterface_debug.lib: Updated to add wkSystemFontSmoothingChanged. + +2010-02-16 Gavin Barraclough + + Reviewed by NOBODY (Build fix). + + Disable warnings preventing use of anonymous structs/onions - + don't take all my fun toys away, these are useful & awesome! + + * win/tools/vsprops/common.vsprops: + 2010-02-11 Brian Weinstein Rubber-stamped by Eric Seidel. 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 index f1857e7..ddcb692 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib index 9722d97..965672f 100644 Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ 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" />