Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_mac.mm

Issue 40065: RenderWidgetHost now stores both the WebKeyboardEvent and the native (Closed)
Patch Set: Redesign Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
6 6
7 #include "base/histogram.h" 7 #include "base/histogram.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/browser/browser_trial.h" 9 #include "chrome/browser/browser_trial.h"
10 #include "chrome/browser/renderer_host/backing_store.h" 10 #include "chrome/browser/renderer_host/backing_store.h"
11 #include "chrome/browser/renderer_host/render_process_host.h" 11 #include "chrome/browser/renderer_host/render_process_host.h"
12 #include "chrome/browser/renderer_host/render_widget_host.h" 12 #include "chrome/browser/renderer_host/render_widget_host.h"
13 #include "chrome/common/native_web_keyboard_event.h"
13 #include "skia/ext/platform_canvas.h" 14 #include "skia/ext/platform_canvas.h"
14 #include "webkit/glue/webinputevent.h" 15 #include "webkit/glue/webinputevent.h"
15 16
16 @interface RenderWidgetHostViewCocoa (Private) 17 @interface RenderWidgetHostViewCocoa (Private)
17 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r; 18 - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r;
18 @end 19 @end
19 20
20 namespace { 21 namespace {
21 22
22 // Maximum number of characters we allow in a tooltip. 23 // Maximum number of characters we allow in a tooltip.
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 244
244 [super dealloc]; 245 [super dealloc];
245 } 246 }
246 247
247 - (void)mouseEvent:(NSEvent *)theEvent { 248 - (void)mouseEvent:(NSEvent *)theEvent {
248 WebMouseEvent event(theEvent, self); 249 WebMouseEvent event(theEvent, self);
249 renderWidgetHostView_->render_widget_host()->ForwardMouseEvent(event); 250 renderWidgetHostView_->render_widget_host()->ForwardMouseEvent(event);
250 } 251 }
251 252
252 - (void)keyEvent:(NSEvent *)theEvent { 253 - (void)keyEvent:(NSEvent *)theEvent {
253 WebKeyboardEvent event(theEvent); 254 NativeWebKeyboardEvent event(theEvent);
254 renderWidgetHostView_->render_widget_host()->ForwardKeyboardEvent(event); 255 renderWidgetHostView_->render_widget_host()->ForwardKeyboardEvent(event);
255 } 256 }
256 257
257 - (void)scrollWheel:(NSEvent *)theEvent { 258 - (void)scrollWheel:(NSEvent *)theEvent {
258 WebMouseWheelEvent event(theEvent, self); 259 WebMouseWheelEvent event(theEvent, self);
259 renderWidgetHostView_->render_widget_host()->ForwardWheelEvent(event); 260 renderWidgetHostView_->render_widget_host()->ForwardWheelEvent(event);
260 } 261 }
261 262
262 - (void)setFrame:(NSRect)frameRect { 263 - (void)setFrame:(NSRect)frameRect {
263 [super setFrame:frameRect]; 264 [super setFrame:frameRect];
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 return YES; 346 return YES;
346 } 347 }
347 348
348 - (BOOL)resignFirstResponder { 349 - (BOOL)resignFirstResponder {
349 renderWidgetHostView_->render_widget_host()->Blur(); 350 renderWidgetHostView_->render_widget_host()->Blur();
350 351
351 return YES; 352 return YES;
352 } 353 }
353 354
354 @end 355 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698