diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit2/Shared/NativeWebKeyboardEvent.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit2/Shared/NativeWebKeyboardEvent.h')
| -rw-r--r-- | Source/WebKit2/Shared/NativeWebKeyboardEvent.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebKit2/Shared/NativeWebKeyboardEvent.h b/Source/WebKit2/Shared/NativeWebKeyboardEvent.h index cdf1aef..d88455c 100644 --- a/Source/WebKit2/Shared/NativeWebKeyboardEvent.h +++ b/Source/WebKit2/Shared/NativeWebKeyboardEvent.h @@ -1,5 +1,7 @@ /* * Copyright (C) 2010 Apple Inc. All rights reserved. + * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. + * Copyright (C) 2011 Igalia S.L * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,6 +35,9 @@ OBJC_CLASS NSView; #elif PLATFORM(QT) #include <QKeyEvent> +#elif PLATFORM(GTK) +#include <GOwnPtrGtk.h> +typedef union _GdkEvent GdkEvent; #endif namespace WebKit { @@ -45,6 +50,9 @@ public: NativeWebKeyboardEvent(HWND, UINT message, WPARAM, LPARAM); #elif PLATFORM(QT) explicit NativeWebKeyboardEvent(QKeyEvent*); +#elif PLATFORM(GTK) + NativeWebKeyboardEvent(const NativeWebKeyboardEvent&); + NativeWebKeyboardEvent(GdkEvent*); #endif #if PLATFORM(MAC) @@ -53,6 +61,8 @@ public: const MSG* nativeEvent() const { return &m_nativeEvent; } #elif PLATFORM(QT) const QKeyEvent* nativeEvent() const { return &m_nativeEvent; } +#elif PLATFORM(GTK) + const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); } #endif private: @@ -62,6 +72,8 @@ private: MSG m_nativeEvent; #elif PLATFORM(QT) QKeyEvent m_nativeEvent; +#elif PLATFORM(GTK) + GOwnPtr<GdkEvent> m_nativeEvent; #endif }; |