[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[weinig at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d278901ece654efa29381e988e2c719c2fb2a760
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 1 23:23:25 2010 +0000

    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: http://svn.webkit.org/repository/webkit/trunk@54156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 37cf8af..fab3c22 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-02-01  Sam Weinig  <sam at 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 at chromium.org>
 
         Unreviewed, Chromium build fix.
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index 6a12e70..f490073 100644
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -33,7 +33,7 @@
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 
-#if PLATFORM(MAC) && !defined(__OBJC__) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
+#if PLATFORM(MAC) && !defined(__OBJC__)
 class NSView;
 #endif
 
@@ -172,7 +172,7 @@ public:
     void sendResizeEvent();
     void sendScrollEvent();
     
-#if PLATFORM(MAC) && defined(__OBJC__) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
+#if PLATFORM(MAC) && defined(__OBJC__)
     PassRefPtr<KeyboardEvent> currentKeyboardEvent() const;
 
     void mouseDown(NSEvent *);
@@ -400,9 +400,11 @@ private:
 
     RefPtr<Node> m_previousWheelScrolledNode;
 
-#if PLATFORM(MAC) && !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
+#if PLATFORM(MAC)
+#if !ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
     NSView *m_mouseDownView;
     bool m_sendingEventToSubview;
+#endif
     int m_activationEventNumber;
 #endif
 #if ENABLE(TOUCH_EVENTS)
diff --git a/WebCore/page/mac/EventHandlerMac.mm b/WebCore/page/mac/EventHandlerMac.mm
index 91a2018..650c0e1 100644
--- a/WebCore/page/mac/EventHandlerMac.mm
+++ b/WebCore/page/mac/EventHandlerMac.mm
@@ -663,6 +663,11 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
 
 #else // ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE)
 
+NSEvent *EventHandler::currentNSEvent()
+{
+    return 0;
+}
+
 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
 {
     subframe->eventHandler()->handleMousePressEvent(mev.event());
@@ -711,6 +716,62 @@ bool EventHandler::eventActivatedView(const PlatformMouseEvent&) const
     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
 
 #if ENABLE(DRAG_SUPPORT)

-- 
WebKit Debian packaging