From ed10f5334e4e42a92114ceeb9a73c6a2abcf70de Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Wed, 22 Oct 2008 18:09:02 +0000 Subject: Glue changes for our PLATFORM(MAC) killing project Review URL: http://codereview.chromium.org/8060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3746 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/event_conversion.cc | 14 -------------- webkit/glue/webview_impl.cc | 23 ----------------------- 2 files changed, 37 deletions(-) (limited to 'webkit/glue') diff --git a/webkit/glue/event_conversion.cc b/webkit/glue/event_conversion.cc index 857fb9e..d37b2ff 100644 --- a/webkit/glue/event_conversion.cc +++ b/webkit/glue/event_conversion.cc @@ -35,13 +35,7 @@ uint32 MakePlatformMouseEvent::last_click_time_ = 0; MakePlatformMouseEvent::MakePlatformMouseEvent(Widget* widget, const WebMouseEvent& e) -#if defined(OS_WIN) { -#elif defined(OS_MACOSX) - : PlatformMouseEvent(e.mac_event.get()) { -#elif defined(OS_LINUX) - : PlatformMouseEvent() { -#endif #if defined(OS_WIN) || defined(OS_LINUX) // TODO(mpcomplete): widget is always toplevel, unless it's a popup. We // may be able to get rid of this once we abstract popups into a WebKit API. @@ -117,11 +111,7 @@ MakePlatformMouseEvent::MakePlatformMouseEvent(Widget* widget, MakePlatformWheelEvent::MakePlatformWheelEvent(Widget* widget, const WebMouseWheelEvent& e) -#if defined(OS_WIN) || defined(OS_LINUX) { -#elif defined(OS_MACOSX) - : PlatformWheelEvent(e.mac_event.get()) { -#endif #if defined(OS_WIN) || defined(OS_LINUX) m_position = widget->convertFromContainingWindow(IntPoint(e.x, e.y)); #endif @@ -273,11 +263,7 @@ static String GetKeyIdentifierForWindowsKeyCode(unsigned short keyCode) { #endif MakePlatformKeyboardEvent::MakePlatformKeyboardEvent(const WebKeyboardEvent& e) -#if defined(OS_WIN) || defined(OS_LINUX) { -#elif defined(OS_MACOSX) - : PlatformKeyboardEvent(e.mac_event.get()) { -#endif #if defined(OS_WIN) || defined(OS_LINUX) m_type = ToPlatformKeyboardEventType(e.type); if (m_type == Char || m_type == KeyDown) diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index a5149c3..e3bab02 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1269,15 +1269,9 @@ bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data, *drop_data_copy = drop_data; current_drop_data_.reset(drop_data_copy); -#if defined(OS_WIN) || defined(OS_LINUX) DragData drag_data(reinterpret_cast(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); -#elif defined(OS_MACOSX) - DragData drag_data(reinterpret_cast(current_drop_data_.get()), - IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), - kDropTargetOperation, nil); -#endif DragOperation effect = page_->dragController()->dragEntered(&drag_data); return effect != DragOperationNone; } @@ -1285,28 +1279,17 @@ bool WebViewImpl::DragTargetDragEnter(const WebDropData& drop_data, bool WebViewImpl::DragTargetDragOver( int client_x, int client_y, int screen_x, int screen_y) { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) DragData drag_data(reinterpret_cast(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); -#elif defined(OS_MACOSX) - DragData drag_data(reinterpret_cast(current_drop_data_.get()), - IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), - kDropTargetOperation, nil); -#endif DragOperation effect = page_->dragController()->dragUpdated(&drag_data); return effect != DragOperationNone; } void WebViewImpl::DragTargetDragLeave() { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) DragData drag_data(reinterpret_cast(current_drop_data_.get()), IntPoint(), IntPoint(), DragOperationNone); -#elif defined(OS_MACOSX) - DragData drag_data(reinterpret_cast(current_drop_data_.get()), - IntPoint(), IntPoint(), DragOperationNone, nil); -#endif page_->dragController()->dragExited(&drag_data); current_drop_data_.reset(NULL); } @@ -1314,15 +1297,9 @@ void WebViewImpl::DragTargetDragLeave() { void WebViewImpl::DragTargetDrop( int client_x, int client_y, int screen_x, int screen_y) { DCHECK(current_drop_data_.get()); -#if defined(OS_WIN) || defined(OS_LINUX) DragData drag_data(reinterpret_cast(current_drop_data_.get()), IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), kDropTargetOperation); -#elif defined(OS_MACOSX) - DragData drag_data(reinterpret_cast(current_drop_data_.get()), - IntPoint(client_x, client_y), IntPoint(screen_x, screen_y), - kDropTargetOperation, nil); -#endif page_->dragController()->performDrag(&drag_data); current_drop_data_.reset(NULL); } -- cgit v1.1