Code drop from //branches/cupcake/...@124589

1 files changed, 8 insertions, 10 deletions

diff --git a/WebCore/dom/UIEventWithKeyState.h b/WebCore/dom/UIEventWithKeyState.h
index 9d42129..414161a 100644
--- a/WebCore/dom/UIEventWithKeyState.h
+++ b/WebCore/dom/UIEventWithKeyState.h
@@ -1,10 +1,8 @@
 /*
- * This file is part of the DOM implementation for KDE.
- *
  * Copyright (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -32,6 +30,12 @@ namespace WebCore {
     
     class UIEventWithKeyState : public UIEvent {
     public:
+        bool ctrlKey() const { return m_ctrlKey; }
+        bool shiftKey() const { return m_shiftKey; }
+        bool altKey() const { return m_altKey; }
+        bool metaKey() const { return m_metaKey; }
+
+    protected:
         UIEventWithKeyState()
             : m_ctrlKey(false)
             , m_altKey(false)
@@ -40,7 +44,7 @@ namespace WebCore {
         {
         }
         
-        UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, AbstractView* view,
+        UIEventWithKeyState(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view,
                             int detail, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
             : UIEvent(type, canBubble, cancelable, view, detail)
             , m_ctrlKey(ctrlKey)
@@ -50,12 +54,6 @@ namespace WebCore {
         {
         }
 
-        bool ctrlKey() const { return m_ctrlKey; }
-        bool shiftKey() const { return m_shiftKey; }
-        bool altKey() const { return m_altKey; }
-        bool metaKey() const { return m_metaKey; }
-
-    protected:
         // Expose these so init functions can set them.
         bool m_ctrlKey : 1;
         bool m_altKey : 1;