MacViews: Fix build errors related to NativeWebKeyboardEvent

content/browser/renderer_host/native_web_keyboard_event_aura.cc

 // Copyright (c) 2011 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 "content/public/browser/native_web_keyboard_event.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "ui/events/event.h"
 
 namespace {
 
 // We need to copy |os_event| in NativeWebKeyboardEvent because it is
 // queued in RenderWidgetHost and may be passed and used
 // RenderViewHostDelegate::HandledKeybardEvent after the original aura
 // event is destroyed.
-ui::Event* CopyEvent(ui::Event* event) {
-  return event ? new ui::KeyEvent(*static_cast<ui::KeyEvent*>(event)) : NULL;
+ui::Event* CopyEvent(const ui::Event* event) {
+  return event ? new ui::KeyEvent(*static_cast<const ui::KeyEvent*>(event))
+               : NULL;

[sadrul, 2014/11/24 06:24:33]

You can do:
  return event ? ui::Event::Clone(*event) : nullptr;
instead.

[Andre, 2014/11/25 03:26:57]

Done.

 }
 
 int EventFlagsToWebInputEventModifiers(int flags) {
   return
       (flags & ui::EF_SHIFT_DOWN ? blink::WebInputEvent::ShiftKey : 0) |
       (flags & ui::EF_CONTROL_DOWN ? blink::WebInputEvent::ControlKey : 0) |
       (flags & ui::EF_CAPS_LOCK_DOWN ? blink::WebInputEvent::CapsLockOn : 0) |
       (flags & ui::EF_ALT_DOWN ? blink::WebInputEvent::AltKey : 0);
 }
 
 }  // namespace
 
 using blink::WebKeyboardEvent;
 
 namespace content {
 
 NativeWebKeyboardEvent::NativeWebKeyboardEvent()
     : os_event(NULL),
       skip_in_browser(false),
       match_edit_command(false) {
 }
 
 NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
-    : WebKeyboardEvent(MakeWebKeyboardEvent(
-          static_cast<ui::KeyEvent*>(native_event))),
-      os_event(CopyEvent(native_event)),
+    : NativeWebKeyboardEvent(static_cast<ui::KeyEvent&>(*native_event)) {
+}
+
+NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)
+    : WebKeyboardEvent(MakeWebKeyboardEvent(&key_event)),
+      os_event(CopyEvent(&key_event)),
       skip_in_browser(false),
       match_edit_command(false) {
 }
 
 NativeWebKeyboardEvent::NativeWebKeyboardEvent(
     const NativeWebKeyboardEvent& other)
     : WebKeyboardEvent(other),
       os_event(CopyEvent(other.os_event)),
       skip_in_browser(other.skip_in_browser),
       match_edit_command(false) {
@@ skipping 39 matching lines @@
   skip_in_browser = other.skip_in_browser;
   match_edit_command = other.match_edit_command;
   return *this;
 }
 
 NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
   delete os_event;
 }
 
 }  // namespace content