[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 12:46:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c9fc6462239216d8022a4a933b82c60b6000a357
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 29 14:12:34 2010 +0000

    2010-08-29  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Roben.
    
            [WINCE] Port ScrollbarThemeWin to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=44818
    
            Add a #ifdef around usage of unsupported DFCS_FLAT.
    
            * platform/win/ScrollbarThemeWin.cpp:
            (WebCore::ScrollbarThemeWin::paintButton):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 51ab2ee..5ebeed5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Adam Roben.
 
+        [WINCE] Port ScrollbarThemeWin to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=44818
+
+        Add a #ifdef around usage of unsupported DFCS_FLAT.
+
+        * platform/win/ScrollbarThemeWin.cpp:
+        (WebCore::ScrollbarThemeWin::paintButton):
+
+2010-08-29  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Roben.
+
         [WINCE] Port SystemInfo to WinCE
         https://bugs.webkit.org/show_bug.cgi?id=44817
 
diff --git a/WebCore/platform/win/ScrollbarThemeWin.cpp b/WebCore/platform/win/ScrollbarThemeWin.cpp
index 2ee3512..a8d374a 100644
--- a/WebCore/platform/win/ScrollbarThemeWin.cpp
+++ b/WebCore/platform/win/ScrollbarThemeWin.cpp
@@ -288,7 +288,10 @@ void ScrollbarThemeWin::paintButton(GraphicsContext* context, Scrollbar* scrollb
                (scrollbar->hoveredPart() == ForwardButtonEndPart && !start)) {
         if (scrollbar->pressedPart() == scrollbar->hoveredPart()) {
             xpState += TS_ACTIVE;
-            classicState |= DFCS_PUSHED | DFCS_FLAT;
+            classicState |= DFCS_PUSHED;
+#if !OS(WINCE)
+            classicState |= DFCS_FLAT;
+#endif
         } else
             xpState += TS_HOVER;
     } else {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list