Pump events to the renderer. Doesn't work currently due to activation issues.

Review URL: http://codereview.chromium.org/21306

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9702 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 143 insertions, 2 deletions

diff --git a/chrome/browser/cocoa/event_view.h b/chrome/browser/cocoa/event_view.h
new file mode 100644
index 0000000..fc49232
--- /dev/null
+++ b/chrome/browser/cocoa/event_view.h
@@ -0,0 +1,25 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_COCOA_EVENT_VIEW_H_
+#define CHROME_BROWSER_COCOA_EVENT_VIEW_H_
+
+#import <Cocoa/Cocoa.h>
+
+// A view that registers for mouse move events, and funnels all events.
+
+@interface EventView : NSView {
+ @private
+  NSTrackingArea *trackingArea_;
+}
+
+- (id)initWithFrame:(NSRect)frame;
+
+// Override these methods in a subclass.
+- (void)mouseEvent:(NSEvent *)theEvent;
+- (void)keyEvent:(NSEvent *)theEvent;
+
+@end
+
+#endif  // CHROME_BROWSER_COCOA_EVENT_VIEW_H_
diff --git a/chrome/browser/cocoa/event_view.mm b/chrome/browser/cocoa/event_view.mm
new file mode 100644
index 0000000..3cb4c44
--- /dev/null
+++ b/chrome/browser/cocoa/event_view.mm
@@ -0,0 +1,99 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/cocoa/event_view.h"
+
+@implementation EventView
+
+- (id)initWithFrame:(NSRect)frame {
+  self = [super initWithFrame:frame];
+  if (self) {
+    trackingArea_ =
+        [[NSTrackingArea alloc] initWithRect:frame
+                                     options:NSTrackingMouseMoved |
+                                             NSTrackingActiveInActiveApp |
+                                             NSTrackingInVisibleRect
+                                       owner:self
+                                    userInfo:nil];
+    [self addTrackingArea:trackingArea_];
+  }
+  return self;
+}
+
+- (void)dealloc {
+  [self removeTrackingArea:trackingArea_];
+  [trackingArea_ release];
+  
+  [super dealloc];
+}
+
+- (void)mouseEvent:(NSEvent *)theEvent {
+  // This method left intentionally blank.
+}
+
+- (void)keyEvent:(NSEvent *)theEvent {
+  // This method left intentionally blank.
+}
+
+- (void)mouseDown:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)rightMouseDown:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)otherMouseDown:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)mouseUp:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)rightMouseUp:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)otherMouseUp:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)mouseMoved:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)mouseDragged:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)rightMouseDragged:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)otherMouseDragged:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)mouseEntered:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)mouseExited:(NSEvent *)theEvent {
+  [self mouseEvent:theEvent];
+}
+
+- (void)keyDown:(NSEvent *)theEvent {
+  [self keyEvent:theEvent];
+}
+
+- (void)keyUp:(NSEvent *)theEvent {
+  [self keyEvent:theEvent];
+}
+
+- (BOOL)isOpaque {
+  return YES;
+}
+
+@end
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index 398c411..073573d 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -8,6 +8,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/time.h"
+#include "chrome/browser/cocoa/event_view.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "webkit/glue/webcursor.h"
 
@@ -18,7 +19,7 @@ class RenderWidgetHostViewMac;
 // but that means that the view needs to own the delegate and will dispose of it
 // when it's removed from the view system.
 
-@interface RenderWidgetHostViewCocoa : NSView {
+@interface RenderWidgetHostViewCocoa : EventView {
  @private
   RenderWidgetHostViewMac* renderWidgetHostView_;
 }
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index dd2066a..6dc179f 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -11,6 +11,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "skia/ext/platform_canvas.h"
+#include "webkit/glue/webinputevent.h"
 
 @interface RenderWidgetHostViewCocoa (Private)
 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r;
@@ -215,7 +216,7 @@ void RenderWidgetHostViewMac::ShutdownHost() {
 // them into the C++ system. TODO(avi): all that jazz
 
 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r {
-  self = [super init];
+  self = [super initWithFrame:NSZeroRect];
   if (self != nil) {
     renderWidgetHostView_ = r;
   }
@@ -228,6 +229,21 @@ void RenderWidgetHostViewMac::ShutdownHost() {
   [super dealloc];
 }
 
+- (void)mouseEvent:(NSEvent *)theEvent {
+  WebMouseEvent event(theEvent, self);
+  renderWidgetHostView_->render_widget_host()->ForwardMouseEvent(event);
+}
+
+- (void)keyEvent:(NSEvent *)theEvent {
+  WebKeyboardEvent event(theEvent);
+  renderWidgetHostView_->render_widget_host()->ForwardKeyboardEvent(event);
+}
+
+- (void)scrollWheel:(NSEvent *)theEvent {
+  WebMouseWheelEvent event(theEvent, self);
+  renderWidgetHostView_->render_widget_host()->ForwardWheelEvent(event);
+}
+
 - (void)drawRect:(NSRect)dirtyRect {
   DCHECK(renderWidgetHostView_->render_widget_host()->process()->channel());