8 files changed, 49 insertions, 10 deletions
diff --git a/Source/WebKit/wx/ChangeLog b/Source/WebKit/wx/ChangeLog
index 1952bbbf0..4f3bdab15 100644
--- a/Source/WebKit/wx/ChangeLog
+++ b/Source/WebKit/wx/ChangeLog
@@ -1,3 +1,44 @@
+2012-09-07  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        Simplify hitTestResultAtPoint and nodesFromRect APIs
+        https://bugs.webkit.org/show_bug.cgi?id=95720
+
+        Reviewed by Antonio Gomes.
+
+        Update calls to new API.
+
+        * WebFrame.cpp:
+        (WebKit::WebFrame::HitTest):
+
+2012-09-05  Sam Weinig  <sam@webkit.org>
+
+        Part 2 of removing PlatformString.h, remove PlatformString.h
+        https://bugs.webkit.org/show_bug.cgi?id=95931
+
+        Reviewed by Adam Barth.
+
+        Remove PlatformString.h
+
+        * WebFrame.cpp:
+        * WebKitSupport/ChromeClientWx.cpp:
+        * WebKitSupport/EditorClientWx.cpp:
+        * WebKitSupport/FrameLoaderClientWx.cpp:
+        * WebKitSupport/InspectorClientWx.cpp:
+        * WebSettings.cpp:
+        * WebView.cpp:
+
+2012-08-30  Benjamin Poulain  <bpoulain@apple.com>
+
+        Replace JSC::UString by WTF::String
+        https://bugs.webkit.org/show_bug.cgi?id=95271
+
+        Reviewed by Geoffrey Garen.
+
+        Update the #includes to use the correct types.
+
+        * WebFrame.cpp:
+        * WebView.cpp:
+
 2012-08-13  Tom Sepez  <tsepez@chromium.org>
 
         [chromium] release FrameLoaderClientImpl::m_pluginWidget refptr upon Plugin Document detach.
diff --git a/Source/WebKit/wx/WebFrame.cpp b/Source/WebKit/wx/WebFrame.cpp
index 942c4beaa..470165db4 100644
--- a/Source/WebKit/wx/WebFrame.cpp
+++ b/Source/WebKit/wx/WebFrame.cpp
@@ -42,7 +42,6 @@
 #include "HTMLFrameOwnerElement.h"
 #include "markup.h"
 #include "Page.h"
-#include "PlatformString.h"
 #include "PrintContext.h"
 #include "RenderTreeAsText.h"
 #include "RenderObject.h"
@@ -54,8 +53,8 @@
 
 #include "JSDOMBinding.h"
 #include <runtime/JSValue.h>
-#include <runtime/UString.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 #include "EditorClientWx.h"
 #include "FrameLoaderClientWx.h"
@@ -690,7 +689,7 @@ WebViewDOMElementInfo WebFrame::HitTest(const wxPoint& pos) const
     WebViewDOMElementInfo domInfo;
 
     if (m_impl->frame->view()) {
-        WebCore::HitTestResult result = m_impl->frame->eventHandler()->hitTestResultAtPoint(m_impl->frame->view()->windowToContents(pos), false);
+        WebCore::HitTestResult result = m_impl->frame->eventHandler()->hitTestResultAtPoint(m_impl->frame->view()->windowToContents(pos));
         if (result.innerNode()) {
             domInfo.SetLink(result.absoluteLinkURL().string());
             domInfo.SetText(result.textContent());
diff --git a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
index 757bb0682..5f1167b54 100644
--- a/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/ChromeClientWx.cpp
@@ -40,7 +40,6 @@
 #include "Icon.h"
 #include "NavigationAction.h"
 #include "NotImplemented.h"
-#include "PlatformString.h"
 #include "SecurityOrigin.h"
 #include "PopupMenuWx.h"
 #include "SearchPopupMenuWx.h"
@@ -58,6 +57,7 @@
 #include "WebBrowserShell.h"
 #include "WebView.h"
 #include "WebViewPrivate.h"
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
diff --git a/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
index 7ce6bd5ae..d700a967a 100644
--- a/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
@@ -38,12 +38,12 @@
 #include "NotImplemented.h"
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
-#include "PlatformString.h"
 #include "WebFrame.h"
 #include "WebFramePrivate.h"
 #include "WebView.h"
 #include "WebViewPrivate.h"
 #include "WindowsKeyboardCodes.h"
+#include <wtf/text/WTFString.h>
 
 #include <stdio.h>
 
diff --git a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
index 18b6730da..8ac269675 100644
--- a/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp
@@ -43,7 +43,6 @@
 #include "HTMLFrameOwnerElement.h"
 #include "NotImplemented.h"
 #include "Page.h"
-#include "PlatformString.h"
 #include "PluginView.h"
 #include "ProgressTracker.h"
 #include "RenderPart.h"
@@ -56,6 +55,7 @@
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
 
 #include <stdio.h>
 #if OS(UNIX)
diff --git a/Source/WebKit/wx/WebKitSupport/InspectorClientWx.cpp b/Source/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
index a7a5de7ca..276b13e06 100644
--- a/Source/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
+++ b/Source/WebKit/wx/WebKitSupport/InspectorClientWx.cpp
@@ -28,7 +28,7 @@
 
 #include "NotImplemented.h"
 #include "Page.h"
-#include "PlatformString.h"
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
diff --git a/Source/WebKit/wx/WebSettings.cpp b/Source/WebKit/wx/WebSettings.cpp
index 4f8a5bcb8..d89db3000 100644
--- a/Source/WebKit/wx/WebSettings.cpp
+++ b/Source/WebKit/wx/WebSettings.cpp
@@ -29,8 +29,8 @@
 #include "config.h"
 #include "WebSettings.h"
 
-#include "PlatformString.h"
 #include "Settings.h"
+#include <wtf/text/WTFString.h>
 
 namespace WebKit {
 
diff --git a/Source/WebKit/wx/WebView.cpp b/Source/WebKit/wx/WebView.cpp
index acb60f643..99f7b3939 100644
--- a/Source/WebKit/wx/WebView.cpp
+++ b/Source/WebKit/wx/WebView.cpp
@@ -47,7 +47,6 @@
 #include "Page.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformMouseEvent.h"
-#include "PlatformString.h"
 #include "PlatformWheelEvent.h"
 #include "RenderObject.h"
 #include "RenderView.h"
@@ -72,9 +71,9 @@
 #include "JSDOMBinding.h"
 #include <runtime/InitializeThreading.h>
 #include <runtime/JSValue.h>
-#include <runtime/UString.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 #if ENABLE(SQL_DATABASE)
 #include "AbstractDatabase.h"