summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rwxr-xr-xwebkit/tools/test_shell/test_shell.cc4
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.cc7
-rw-r--r--webkit/tools/test_shell/test_webview_delegate.h2
3 files changed, 8 insertions, 5 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index c1ae406..ceeb6e6 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -595,8 +595,8 @@ bool SpellCheckWord(const wchar_t* word, int word_len,
return true;
}
-ScreenInfo GetScreenInfo(gfx::NativeView window) {
- return GetScreenInfoHelper(window);
+ScreenInfo GetScreenInfo(gfx::NativeViewId window) {
+ return GetScreenInfoHelper(gfx::NativeViewFromId(window));
}
bool IsPluginRunningInRendererProcess() {
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 631d48e..684b22a 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -10,6 +10,7 @@
#include "base/file_util.h"
#include "base/gfx/point.h"
+#include "base/gfx/native_widget_types.h"
#include "base/message_loop.h"
#include "base/string_util.h"
#include "base/trace_event.h"
@@ -664,9 +665,11 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
// WebWidgetDelegate ---------------------------------------------------------
-gfx::NativeView TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
+gfx::NativeViewId TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
+ // For test shell, we pack a NativeView pointer into the NativeViewId since
+ // everything is single process.
if (WebWidgetHost* host = GetHostForWidget(webwidget))
- return host->view_handle();
+ return gfx::IdFromNativeView(host->view_handle());
return NULL;
}
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index d934bcc..65d0723 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -205,7 +205,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
virtual int GetHistoryForwardListCount();
// WebWidgetDelegate
- virtual gfx::NativeView GetContainingView(WebWidget* webwidget);
+ virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
virtual void DidInvalidateRect(WebWidget* webwidget, const gfx::Rect& rect);
virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
const gfx::Rect& clip_rect);