[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
andersca at apple.com
andersca at apple.com
Wed Mar 17 18:10:35 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 4fb34686c15fc5f26c2cb4008bcbe128046c7729
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 2 22:27:26 2010 +0000
Make the default constructor available to all platforms.
Reviewed by Sam Weinig.
* platform/PlatformKeyboardEvent.h:
(WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
* platform/mac/KeyEventMac.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 61d6e7e..b4ef02d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-02 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Make the default constructor available to all platforms.
+
+ * platform/PlatformKeyboardEvent.h:
+ (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+ * platform/mac/KeyEventMac.mm:
+
2010-03-02 Jeremy Orlow <jorlow at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index ed472da..7e33221 100644
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -94,6 +94,28 @@ namespace WebCore {
ShiftKey = 1 << 3,
};
+ PlatformKeyboardEvent()
+ : m_type(KeyDown)
+ , m_autoRepeat(false)
+ , m_windowsVirtualKeyCode(0)
+ , m_nativeVirtualKeyCode(0)
+ , m_isKeypad(false)
+ , m_shiftKey(false)
+ , m_ctrlKey(false)
+ , m_altKey(false)
+ , m_metaKey(false)
+#if PLATFORM(WIN) || PLATFORM(CHROMIUM)
+ , m_isSystemKey(false)
+#endif
+#if PLATFORM(GTK)
+ , m_gdkEventKey(0)
+#endif
+#if PLATFORM(QT)
+ , m_qtEvent(0)
+#endif
+ {
+ }
+
Type type() const { return m_type; }
void disambiguateKeyDownEvent(Type, bool backwardCompatibilityMode = false); // Only used on platforms that need it, i.e. those that generate KeyDown events.
@@ -136,7 +158,6 @@ namespace WebCore {
static bool currentCapsLockState();
#if PLATFORM(MAC)
- PlatformKeyboardEvent();
PlatformKeyboardEvent(NSEvent*);
NSEvent* macEvent() const { return m_macEvent.get(); }
#endif
diff --git a/WebCore/platform/mac/KeyEventMac.mm b/WebCore/platform/mac/KeyEventMac.mm
index 2e1579b..3638cb1 100644
--- a/WebCore/platform/mac/KeyEventMac.mm
+++ b/WebCore/platform/mac/KeyEventMac.mm
@@ -811,19 +811,6 @@ static inline String unmodifiedTextFromEvent(NSEvent* event)
return [event charactersIgnoringModifiers];
}
-PlatformKeyboardEvent::PlatformKeyboardEvent()
- : m_type(KeyDown)
- , m_autoRepeat(false)
- , m_windowsVirtualKeyCode(0)
- , m_nativeVirtualKeyCode(0)
- , m_isKeypad(false)
- , m_shiftKey(false)
- , m_ctrlKey(false)
- , m_altKey(false)
- , m_metaKey(false)
-{
-}
-
PlatformKeyboardEvent::PlatformKeyboardEvent(NSEvent *event)
: m_type(isKeyUpEvent(event) ? PlatformKeyboardEvent::KeyUp : PlatformKeyboardEvent::KeyDown)
, m_text(textFromEvent(event))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list