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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a13e58da59726e93b336493742b85c8728df3394
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 26 03:33:33 2010 +0000

    2010-07-25  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Kent Tamura.
    
            [WINCE] Buildfix for PopupMenuWin.cpp
            https://bugs.webkit.org/show_bug.cgi?id=42932
    
            Add #if !OS(WINCE) around unsupported window messages.
    
            * platform/win/PopupMenuWin.cpp:
            (WebCore::PopupMenu::show):
            (WebCore::PopupMenu::wndProc):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 532d8d0..60ba526 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-25  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Kent Tamura.
+
+        [WINCE] Buildfix for PopupMenuWin.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=42932
+
+        Add #if !OS(WINCE) around unsupported window messages.
+
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::wndProc):
+
 2010-07-25  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/win/PopupMenuWin.cpp b/WebCore/platform/win/PopupMenuWin.cpp
index 8e4320e..4bc6dc7 100644
--- a/WebCore/platform/win/PopupMenuWin.cpp
+++ b/WebCore/platform/win/PopupMenuWin.cpp
@@ -199,6 +199,7 @@ void PopupMenu::show(const IntRect& r, FrameView* view, int index)
                 break;
 
             // Steal mouse messages.
+#if !OS(WINCE)
             case WM_NCMOUSEMOVE:
             case WM_NCLBUTTONDOWN:
             case WM_NCLBUTTONUP:
@@ -209,6 +210,7 @@ void PopupMenu::show(const IntRect& r, FrameView* view, int index)
             case WM_NCMBUTTONDOWN:
             case WM_NCMBUTTONUP:
             case WM_NCMBUTTONDBLCLK:
+#endif
             case WM_MOUSEWHEEL:
                 msg.hwnd = m_popup;
                 break;
@@ -774,9 +776,10 @@ LRESULT PopupMenu::wndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
     LRESULT lResult = 0;
 
     switch (message) {
+#if !OS(WINCE)
         case WM_MOUSEACTIVATE:
             return MA_NOACTIVATE;
-
+#endif
         case WM_SIZE: {
             if (!scrollbar())
                 break;

-- 
WebKit Debian packaging