Commit 226bb49b authored by weinig@apple.com's avatar weinig@apple.com

Fix EXPERIMENTAL_SINGLE_VIEW_MODE build.

Reviewed by Beth Dakin.

* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::currentNSEvent):
(WebCore::EventHandler::currentKeyboardEvent):
(WebCore::EventHandler::mouseDown):
(WebCore::EventHandler::mouseDragged):
(WebCore::EventHandler::mouseUp):
(WebCore::EventHandler::mouseMoved):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::wheelEvent):
(WebCore::EventHandler::sendContextMenuEvent):
(WebCore::EventHandler::eventMayStartDrag):
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):



git-svn-id: svn://svn.chromium.org/blink/trunk@54156 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 2f351093
2010-02-01 Sam Weinig <sam@webkit.org>
Reviewed by Beth Dakin.
Fix EXPERIMENTAL_SINGLE_VIEW_MODE build.
* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::currentNSEvent):
(WebCore::EventHandler::currentKeyboardEvent):
(WebCore::EventHandler::mouseDown):
(WebCore::EventHandler::mouseDragged):
(WebCore::EventHandler::mouseUp):
(WebCore::EventHandler::mouseMoved):
(WebCore::EventHandler::keyEvent):
(WebCore::EventHandler::wheelEvent):
(WebCore::EventHandler::sendContextMenuEvent):
(WebCore::EventHandler::eventMayStartDrag):
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
2010-02-01 Nate Chapin <japhet@chromium.org> 2010-02-01 Nate Chapin <japhet@chromium.org>
Unreviewed, Chromium build fix. Unreviewed, Chromium build fix.
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <wtf/Forward.h> #include <wtf/Forward.h>
#include <wtf/RefPtr.h> #include <wtf/RefPtr.h>
#if PLATFORM(MAC) && !defined(__OBJC__) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) #if PLATFORM(MAC) && !defined(__OBJC__)
class NSView; class NSView;
#endif #endif
...@@ -172,7 +172,7 @@ public: ...@@ -172,7 +172,7 @@ public:
void sendResizeEvent(); void sendResizeEvent();
void sendScrollEvent(); void sendScrollEvent();
#if PLATFORM(MAC) && defined(__OBJC__) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) #if PLATFORM(MAC) && defined(__OBJC__)
PassRefPtr<KeyboardEvent> currentKeyboardEvent() const; PassRefPtr<KeyboardEvent> currentKeyboardEvent() const;
void mouseDown(NSEvent *); void mouseDown(NSEvent *);
...@@ -400,9 +400,11 @@ private: ...@@ -400,9 +400,11 @@ private:
RefPtr<Node> m_previousWheelScrolledNode; RefPtr<Node> m_previousWheelScrolledNode;
#if PLATFORM(MAC) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) #if PLATFORM(MAC)
#if !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
NSView *m_mouseDownView; NSView *m_mouseDownView;
bool m_sendingEventToSubview; bool m_sendingEventToSubview;
#endif
int m_activationEventNumber; int m_activationEventNumber;
#endif #endif
#if ENABLE(TOUCH_EVENTS) #if ENABLE(TOUCH_EVENTS)
......
...@@ -663,6 +663,11 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const ...@@ -663,6 +663,11 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
#else // ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) #else // ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
NSEvent *EventHandler::currentNSEvent()
{
return 0;
}
bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe) bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
{ {
subframe->eventHandler()->handleMousePressEvent(mev.event()); subframe->eventHandler()->handleMousePressEvent(mev.event());
...@@ -711,6 +716,62 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const ...@@ -711,6 +716,62 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
return false; return false;
} }
PassRefPtr<KeyboardEvent> EventHandler::currentKeyboardEvent() const
{
return 0;
}
void EventHandler::mouseDown(NSEvent *)
{
notImplemented();
}
void EventHandler::mouseDragged(NSEvent *)
{
notImplemented();
}
void EventHandler::mouseUp(NSEvent *)
{
notImplemented();
}
void EventHandler::mouseMoved(NSEvent *)
{
notImplemented();
}
bool EventHandler::keyEvent(NSEvent *)
{
notImplemented();
return false;
}
bool EventHandler::wheelEvent(NSEvent *)
{
notImplemented();
return false;
}
#if ENABLE(CONTEXT_MENUS)
bool EventHandler::sendContextMenuEvent(NSEvent *)
{
notImplemented();
return false;
}
#endif
bool EventHandler::eventMayStartDrag(NSEvent *)
{
notImplemented();
return false;
}
void EventHandler::sendFakeEventsAfterWidgetTracking(NSEvent *)
{
}
#endif #endif
#if ENABLE(DRAG_SUPPORT) #if ENABLE(DRAG_SUPPORT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment