[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[sfalken at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 57320069caa784c3db25b3d2a1ad12fe2d23764b
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 00:45:54 2010 +0000

    WebKit on Windows should pick up system setting changes without requiring explicit API calls
    https://bugs.webkit.org/show_bug.cgi?id=35269
    
    Reviewed by Darin Adler.
    
    * WebKit.vcproj/WebKit.def: Removed WebKitSystemParameterChanged.
    * WebKit.vcproj/WebKit_debug.def: Removed WebKitSystemParameterChanged.
    * WebKitGraphics.cpp: Removed WebKitSystemParameterChanged.
    * WebKitGraphics.h: Removed WebKitSystemParameterChanged.
    * WebView.cpp:
    (systemParameterChanged): Call through to wkSystemFontSmoothingChanged for font changes.
    (WebView::windowReceivedMessage): Pick up WM_SETTINGCHANGE from windowReceivedMessage.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 23d80e5..1e69178 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-22  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit on Windows should pick up system setting changes without requiring explicit API calls
+        https://bugs.webkit.org/show_bug.cgi?id=35269
+
+        * WebKit.vcproj/WebKit.def: Removed WebKitSystemParameterChanged.
+        * WebKit.vcproj/WebKit_debug.def: Removed WebKitSystemParameterChanged.
+        * WebKitGraphics.cpp: Removed WebKitSystemParameterChanged.
+        * WebKitGraphics.h: Removed WebKitSystemParameterChanged.
+        * WebView.cpp:
+        (systemParameterChanged): Call through to wkSystemFontSmoothingChanged for font changes.
+        (WebView::windowReceivedMessage): Pick up WM_SETTINGCHANGE from windowReceivedMessage.
+
 2010-02-22  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Tim Hatcher.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.def b/WebKit/win/WebKit.vcproj/WebKit.def
index 9e6e55f..8d091ec 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.def
+++ b/WebKit/win/WebKit.vcproj/WebKit.def
@@ -20,7 +20,6 @@ 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 fac9d6f..c15957a 100644
--- a/WebKit/win/WebKit.vcproj/WebKit_debug.def
+++ b/WebKit/win/WebKit.vcproj/WebKit_debug.def
@@ -20,7 +20,6 @@ EXPORTS
         WebKitSetShouldUseFontSmoothing
         WebKitShouldUseFontSmoothing
         WebKitCreateInstance
-        WebKitSystemParameterChanged
 		
         ; These functions are deprecated
         WebLocalizedString
diff --git a/WebKit/win/WebKitGraphics.cpp b/WebKit/win/WebKitGraphics.cpp
index 444c43c..03fe903 100644
--- a/WebKit/win/WebKitGraphics.cpp
+++ b/WebKit/win/WebKitGraphics.cpp
@@ -175,9 +175,3 @@ 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 75ab36c..59c874b 100644
--- a/WebKit/win/WebKitGraphics.h
+++ b/WebKit/win/WebKitGraphics.h
@@ -74,8 +74,6 @@ unsigned RightTruncateStringToWidth(LPCTSTR text, int length, const WebFontDescr
 void WebKitSetShouldUseFontSmoothing(bool);
 bool WebKitShouldUseFontSmoothing();
 
-void WebKitSystemParameterChanged(UINT parameter);
-
 }
 
 #endif // !defined(WebKitGraphics_h)
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 8636d15..7813811 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -3125,6 +3125,14 @@ HRESULT STDMETHODCALLTYPE WebView::preferencesIdentifier(
     return E_NOTIMPL;
 }
 
+static void systemParameterChanged(WPARAM parameter)
+{
+#if PLATFORM(CG)
+    if (parameter == SPI_SETFONTSMOOTHING || parameter == SPI_SETFONTSMOOTHINGTYPE || parameter == SPI_SETFONTSMOOTHINGCONTRAST || parameter == SPI_SETFONTSMOOTHINGORIENTATION)
+        wkSystemFontSmoothingChanged();
+#endif
+}
+
 void WebView::windowReceivedMessage(HWND, UINT message, WPARAM wParam, LPARAM)
 {
     switch (message) {
@@ -3133,6 +3141,9 @@ void WebView::windowReceivedMessage(HWND, UINT message, WPARAM wParam, LPARAM)
         if (!wParam)
             deleteBackingStoreSoon();
         break;
+    case WM_SETTINGCHANGE:
+        systemParameterChanged(wParam);
+        break;
     }
 }
 

-- 
WebKit Debian packaging