Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82

5 files changed, 25 insertions, 9 deletions

diff --git a/WebCore/platform/wx/ContextMenuWx.cpp b/WebCore/platform/wx/ContextMenuWx.cpp
index 6f1bc9c..b20d29e 100644
--- a/WebCore/platform/wx/ContextMenuWx.cpp
+++ b/WebCore/platform/wx/ContextMenuWx.cpp
@@ -30,6 +30,8 @@
 #include "PlatformMenuDescription.h"
 #include "wx/menu.h"
 
+#include <wtf/HashMap.h>
+
 using namespace WebCore;
 
 typedef WTF::HashMap<int, ContextMenuAction> ItemActionMap;
diff --git a/WebCore/platform/wx/FileSystemWx.cpp b/WebCore/platform/wx/FileSystemWx.cpp
index 1ee87ae..50ac2ec 100644
--- a/WebCore/platform/wx/FileSystemWx.cpp
+++ b/WebCore/platform/wx/FileSystemWx.cpp
@@ -42,7 +42,7 @@
 #include <wx/filefn.h>
 #include <wx/filename.h>
 
-#if PLATFORM(DARWIN)
+#if OS(DARWIN)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -127,9 +127,9 @@ int writeToFile(PlatformFileHandle, const char* data, int length)
 
 bool unloadModule(PlatformModule mod)
 {
-#if PLATFORM(WIN_OS)
+#if OS(WINDOWS)
     return ::FreeLibrary(mod);
-#elif PLATFORM(DARWIN)
+#elif OS(DARWIN)
     CFRelease(mod);
     return true;
 #else
diff --git a/WebCore/platform/wx/LocalizedStringsWx.cpp b/WebCore/platform/wx/LocalizedStringsWx.cpp
index 6a389f2..8573482 100644
--- a/WebCore/platform/wx/LocalizedStringsWx.cpp
+++ b/WebCore/platform/wx/LocalizedStringsWx.cpp
@@ -324,6 +324,16 @@ String AXDefinitionListDefinitionText()
     return String();
 }
 
+String AXMenuListPopupActionVerb()
+{
+    return String();
+}
+
+String AXMenuListActionVerb()
+{
+    return String();
+}
+
 String validationMessageValueMissingText()
 {
     notImplemented();
diff --git a/WebCore/platform/wx/RenderThemeWx.cpp b/WebCore/platform/wx/RenderThemeWx.cpp
index c66ff87..c4d8c35 100644
--- a/WebCore/platform/wx/RenderThemeWx.cpp
+++ b/WebCore/platform/wx/RenderThemeWx.cpp
@@ -267,7 +267,11 @@ bool RenderThemeWx::paintButton(RenderObject* o, const RenderObject::PaintInfo&
     
     IntRect rect = r; 
 
-#if USE(WXGC)
+// On Mac, wxGraphicsContext and wxDC share the same native implementation,
+// and so transformations are available.
+// On Win and Linux, however, this is not true and transforms are lost,
+// so we need to restore them here.
+#if USE(WXGC) && !defined(__WXMAC__)
     double xtrans = 0;
     double ytrans = 0;
     
@@ -294,7 +298,7 @@ bool RenderThemeWx::paintButton(RenderObject* o, const RenderObject::PaintInfo&
         if (isChecked(o))
             flags |= wxCONTROL_CHECKED;
 #if wxCHECK_VERSION(2,9,1)
-        wxRendererNative::Get().DrawRadioBitmap(window, *dc, r, flags);
+        wxRendererNative::Get().DrawRadioBitmap(window, *dc, rect, flags);
 #elif wxCHECK_VERSION(2,9,0)
         wxRendererNative::Get().DrawRadioButton(window, *dc, rect, flags);
 #else
diff --git a/WebCore/platform/wx/ScrollViewWx.cpp b/WebCore/platform/wx/ScrollViewWx.cpp
index f556894..35acf68 100644
--- a/WebCore/platform/wx/ScrollViewWx.cpp
+++ b/WebCore/platform/wx/ScrollViewWx.cpp
@@ -96,15 +96,15 @@ public:
         }
         else if (scrollType == wxEVT_SCROLLWIN_PAGEUP) {
             if (horiz) 
-                pos.x -= m_scrollView->visibleWidth() - cAmountToKeepWhenPaging;
+                pos.x -= m_scrollView->visibleWidth() * cFractionToStepWhenPaging;
             else       
-                pos.y -= m_scrollView->visibleHeight() - cAmountToKeepWhenPaging;
+                pos.y -= m_scrollView->visibleHeight() * cFractionToStepWhenPaging;
         }
         else if (scrollType == wxEVT_SCROLLWIN_PAGEDOWN) {
             if (horiz) 
-                pos.x += m_scrollView->visibleWidth() - cAmountToKeepWhenPaging;
+                pos.x += m_scrollView->visibleWidth() * cFractionToStepWhenPaging;
             else       
-                pos.y += m_scrollView->visibleHeight() - cAmountToKeepWhenPaging;
+                pos.y += m_scrollView->visibleHeight() * cFractionToStepWhenPaging;
         }
         else
             return e.Skip();