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

[luiz at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d6c71a5be459f543e20f94d3e0609575d8075d07
Author: luiz at webkit.org <luiz at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 31 23:43:23 2010 +0000

    2010-07-31  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Build fix: Windows.
    
            * platform/win/PopupMenuWin.h:
    2010-07-31  Luiz Agostini  <luiz.agostini at openbossa.org>
    
            Build fix: Windows.
    
            * WebView.cpp:
            (WebView::mouseWheel):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64429 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 370665e..a473321 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-31  Luiz Agostini  <luiz.agostini at openbossa.org>
 
+        Build fix: Windows.
+
+        * platform/win/PopupMenuWin.h:
+
+2010-07-31  Luiz Agostini  <luiz.agostini at openbossa.org>
+
         Windows build fix.
 
         * platform/win/PopupMenuWin.cpp:
diff --git a/WebCore/platform/win/PopupMenuWin.h b/WebCore/platform/win/PopupMenuWin.h
index e88bc7c..d4a4255 100644
--- a/WebCore/platform/win/PopupMenuWin.h
+++ b/WebCore/platform/win/PopupMenuWin.h
@@ -48,13 +48,13 @@ public:
     virtual void updateFromElement();
     virtual void disconnectClient();
 
+    static LPCTSTR popupClassName();
+
 private:
     PopupMenuClient* client() const { return m_popupClient; }
 
     Scrollbar* scrollbar() const { return m_scrollbar.get(); }
 
-    static LPCTSTR popupClassName();
-
     bool up(unsigned lines = 1);
     bool down(unsigned lines = 1);
 
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index e4097cb..d2bcc72 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-31  Luiz Agostini  <luiz.agostini at openbossa.org>
+
+        Build fix: Windows.
+
+        * WebView.cpp:
+        (WebView::mouseWheel):
+
 2010-07-27  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 41ae079..8dfb7e7 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -110,6 +110,7 @@
 #include <WebCore/PluginDatabase.h>
 #include <WebCore/PluginView.h>
 #include <WebCore/PopupMenu.h>
+#include <WebCore/PopupMenuWin.h>
 #include <WebCore/ProgressTracker.h>
 #include <WebCore/RenderLayer.h>
 #include <WebCore/RenderTheme.h>
@@ -1613,9 +1614,9 @@ bool WebView::mouseWheel(WPARAM wParam, LPARAM lParam, bool isMouseHWheel)
         TCHAR className[256];
 
         // Make sure truncation won't affect the comparison.
-        ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenu::popupClassName()));
+        ASSERT(ARRAYSIZE(className) > _tcslen(PopupMenuWin::popupClassName()));
 
-        if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenu::popupClassName())) {
+        if (GetClassName(focusedWindow, className, ARRAYSIZE(className)) && !_tcscmp(className, PopupMenuWin::popupClassName())) {
             // We don't let the WebView scroll here for two reasons - 1) To match Firefox behavior, 2) If we do scroll, we lose the
             // focus ring around the select menu.
             SetFocus(m_viewWindow);

-- 
WebKit Debian packaging