diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-29 18:55:18 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-29 18:55:18 +0000 |
| commit | 48ce616af771249804667888297d0081b6b3e249 (patch) | |
| tree | 21aecf73bcb129000a2df54887cd569c18b04c5f /webkit/glue | |
| parent | 159b2a3a31ff9aab59dc489e2bb1549eefec6039 (diff) | |
| download | chromium_src-48ce616af771249804667888297d0081b6b3e249.zip chromium_src-48ce616af771249804667888297d0081b6b3e249.tar.gz chromium_src-48ce616af771249804667888297d0081b6b3e249.tar.bz2 | |
* Bring up render_mesages.cc on POSIX.
* Add Pickle::Read/WriteUint32 & ParamTraits<uint32>.
* Removed NSEvent from WebInputEvent since it appears not to be needed anymore.
Review URL: http://codereview.chromium.org/16479
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webinputevent.h | 6 | ||||
| -rw-r--r-- | webkit/glue/webinputevent_mac.mm | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/webkit/glue/webinputevent.h b/webkit/glue/webinputevent.h index e347cda..9a1c84d 100644 --- a/webkit/glue/webinputevent.h +++ b/webkit/glue/webinputevent.h @@ -11,7 +11,6 @@ #include <windows.h> #elif defined(OS_MACOSX) #include <vector> -#include <wtf/RetainPtr.h> #ifdef __OBJC__ @class NSEvent; @class NSView; @@ -70,11 +69,6 @@ class WebInputEvent { Type type; int modifiers; -#if defined(OS_MACOSX) - // For now, good enough for the test shell. TODO(avi): Revisit when we need - // to start sending this over an IPC pipe. - RetainPtr<NSEvent> mac_event; -#endif }; // WebMouseEvent -------------------------------------------------------------- diff --git a/webkit/glue/webinputevent_mac.mm b/webkit/glue/webinputevent_mac.mm index e3f6af6..3090d96 100644 --- a/webkit/glue/webinputevent_mac.mm +++ b/webkit/glue/webinputevent_mac.mm @@ -89,8 +89,6 @@ WebMouseEvent::WebMouseEvent(NSEvent *event, NSView* view) { timestamp_sec = [event timestamp]; layout_test_click_count = 0; - - mac_event = event; // retains |event| } // WebMouseWheelEvent --------------------------------------------------------- @@ -130,8 +128,6 @@ WebMouseWheelEvent::WebMouseWheelEvent(NSEvent *event, NSView* view) { modifiers |= SHIFT_KEY; if ([event modifierFlags] & NSAlternateKeyMask) modifiers |= ALT_KEY; - - mac_event = event; // retains |event| } // WebKeyboardEvent ----------------------------------------------------------- @@ -964,6 +960,4 @@ WebKeyboardEvent::WebKeyboardEvent(NSEvent *event) { FillVectorFromNSString(&key_identifier, identStr); key_code = WebCore::windowsKeyCodeForKeyEvent(event); - - mac_event = event; // retains |event| } |