[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

sfalken at apple.com sfalken at apple.com
Fri Feb 26 22:24:03 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 3327929034f50139913d36055f9e35ca3955257e
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 18 08:36:39 2010 +0000

    WebKit on Windows needs a mechanism to listen for WM_SETTINGCHANGED messages
    https://bugs.webkit.org/show_bug.cgi?id=35076
    
    Reviewed by Dan Bernstein.
    
    WebKit/win:
    
    * WebKit.vcproj/WebKit.def: Added WebKitSystemParameterChanged.
    * WebKit.vcproj/WebKit_debug.def: Added WebKitSystemParameterChanged.
    * WebKitGraphics.cpp:
    (WebKitSystemParameterChanged): Call through to wkSystemFontSmoothingChanged for font smoothing changes.
    * WebKitGraphics.h: Added WebKitSystemParameterChanged.
    
    WebKitLibraries:
    
    * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
    * win/lib/WebKitSystemInterface.lib: Updated to add wkSystemFontSmoothingChanged.
    * win/lib/WebKitSystemInterface_debug.lib: Updated to add wkSystemFontSmoothingChanged.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54943 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 140592e..8dd19ad 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-17  Steve Falkenburg  <sfalken at apple.com>
+
+        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
+
+        * WebKit.vcproj/WebKit.def: Added WebKitSystemParameterChanged.
+        * WebKit.vcproj/WebKit_debug.def: Added WebKitSystemParameterChanged.
+        * WebKitGraphics.cpp:
+        (WebKitSystemParameterChanged): Call through to wkSystemFontSmoothingChanged for font smoothing changes.
+        * WebKitGraphics.h: Added WebKitSystemParameterChanged.
+
 2010-02-17  Dmitry Titov  <dimich at chromium.org>
 
         Reviewed by David Levin, Darin Fisher, Simon Hausmann.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.def b/WebKit/win/WebKit.vcproj/WebKit.def
index 8d091ec..9e6e55f 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.def
+++ b/WebKit/win/WebKit.vcproj/WebKit.def
@@ -20,6 +20,7 @@ EXPORTS
         WebKitSetShouldUseFontSmoothing
         WebKitShouldUseFontSmoothing
         WebKitCreateInstance
+        WebKitSystemParameterChanged
 		
         ; These functions are deprecated
         WebLocalizedString
diff --git a/WebKit/win/WebKit.vcproj/WebKit_debug.def b/WebKit/win/WebKit.vcproj/WebKit_debug.def
index c15957a..fac9d6f 100644
--- a/WebKit/win/WebKit.vcproj/WebKit_debug.def
+++ b/WebKit/win/WebKit.vcproj/WebKit_debug.def
@@ -20,6 +20,7 @@ EXPORTS
         WebKitSetShouldUseFontSmoothing
         WebKitShouldUseFontSmoothing
         WebKitCreateInstance
+        WebKitSystemParameterChanged
 		
         ; These functions are deprecated
         WebLocalizedString
diff --git a/WebKit/win/WebKitGraphics.cpp b/WebKit/win/WebKitGraphics.cpp
index 03fe903..444c43c 100644
--- a/WebKit/win/WebKitGraphics.cpp
+++ b/WebKit/win/WebKitGraphics.cpp
@@ -175,3 +175,9 @@ bool WebKitShouldUseFontSmoothing()
 {
     return WebCoreShouldUseFontSmoothing();
 }
+
+void WebKitSystemParameterChanged(UINT parameter)
+{
+    if (parameter == SPI_SETFONTSMOOTHING || parameter == SPI_SETFONTSMOOTHINGTYPE || parameter == SPI_SETFONTSMOOTHINGCONTRAST || parameter == SPI_SETFONTSMOOTHINGORIENTATION)
+        wkSystemFontSmoothingChanged();
+}
diff --git a/WebKit/win/WebKitGraphics.h b/WebKit/win/WebKitGraphics.h
index 59c874b..75ab36c 100644
--- a/WebKit/win/WebKitGraphics.h
+++ b/WebKit/win/WebKitGraphics.h
@@ -74,6 +74,8 @@ unsigned RightTruncateStringToWidth(LPCTSTR text, int length, const WebFontDescr
 void WebKitSetShouldUseFontSmoothing(bool);
 bool WebKitShouldUseFontSmoothing();
 
+void WebKitSystemParameterChanged(UINT parameter);
+
 }
 
 #endif // !defined(WebKitGraphics_h)
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 5afa222..0bc9e66 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-18  Steve Falkenburg  <sfalken at apple.com>
+
+        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  <barraclough at apple.com>
 
         Reviewed by NOBODY (Build fix).
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..87fbbc4 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list