summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/mac/webwidget_host.mm8
-rw-r--r--webkit/tools/test_shell/webwidget_host.h1
-rw-r--r--webkit/tools/test_shell/webwidget_host_gtk.cc5
-rw-r--r--webkit/tools/test_shell/webwidget_host_win.cc3
4 files changed, 3 insertions, 14 deletions
diff --git a/webkit/tools/test_shell/mac/webwidget_host.mm b/webkit/tools/test_shell/mac/webwidget_host.mm
index 802634a..bedb9a2 100644
--- a/webkit/tools/test_shell/mac/webwidget_host.mm
+++ b/webkit/tools/test_shell/mac/webwidget_host.mm
@@ -33,13 +33,9 @@ WebWidgetHost* WebWidgetHost::Create(NSView* parent_view,
}
/*static*/
-WebWidgetHost* WebWidgetHost::FromWindow(NSView* view) {
- return NULL;
-}
-
-/*static*/
void WebWidgetHost::HandleEvent(NSView* view, NSEvent* event) {
- WebWidgetHost* host = FromWindow(view);
+ /* TODO(port): rig up a way to get to the host */
+ WebWidgetHost* host = NULL;
if (host) {
switch ([event type]) {
case NSLeftMouseDown:
diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h
index 7b09d16..fd7f4d9 100644
--- a/webkit/tools/test_shell/webwidget_host.h
+++ b/webkit/tools/test_shell/webwidget_host.h
@@ -27,7 +27,6 @@ class WebWidgetHost {
static WebWidgetHost* Create(gfx::NativeView parent_view,
WebWidgetDelegate* delegate);
- static WebWidgetHost* FromWindow(gfx::NativeView view);
#if defined(OS_MACOSX)
static void HandleEvent(gfx::NativeView view, NSEvent* event);
#endif
diff --git a/webkit/tools/test_shell/webwidget_host_gtk.cc b/webkit/tools/test_shell/webwidget_host_gtk.cc
index fd67ebd..5ca52e6 100644
--- a/webkit/tools/test_shell/webwidget_host_gtk.cc
+++ b/webkit/tools/test_shell/webwidget_host_gtk.cc
@@ -285,11 +285,6 @@ void WebWidgetHost::DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect) {
DidInvalidateRect(clip_rect);
}
-WebWidgetHost* FromWindow(GtkWidget* view) {
- const gpointer p = g_object_get_data(G_OBJECT(view), "webwidgethost");
- return (WebWidgetHost* ) p;
-}
-
WebWidgetHost::WebWidgetHost()
: view_(NULL),
webwidget_(NULL),
diff --git a/webkit/tools/test_shell/webwidget_host_win.cc b/webkit/tools/test_shell/webwidget_host_win.cc
index c8ef89c..7fd45ca 100644
--- a/webkit/tools/test_shell/webwidget_host_win.cc
+++ b/webkit/tools/test_shell/webwidget_host_win.cc
@@ -44,8 +44,7 @@ WebWidgetHost* WebWidgetHost::Create(HWND parent_view,
return host;
}
-/*static*/
-WebWidgetHost* WebWidgetHost::FromWindow(HWND view) {
+static WebWidgetHost* FromWindow(HWND view) {
return reinterpret_cast<WebWidgetHost*>(win_util::GetWindowUserData(view));
}