Diff
Modified: trunk/Source/WebCore/ChangeLog (206643 => 206644)
--- trunk/Source/WebCore/ChangeLog 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 18:29:31 UTC (rev 206644)
@@ -1,3 +1,20 @@
+2016-09-27 Anders Carlsson <[email protected]>
+
+ Remove a couple of unused members from PlatformKeyboardEvent
+ https://bugs.webkit.org/show_bug.cgi?id=162641
+
+ Reviewed by Tim Horton.
+
+ * platform/PlatformKeyboardEvent.h:
+ (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+ (WebCore::PlatformKeyboardEvent::nativeVirtualKeyCode): Deleted.
+ (WebCore::PlatformKeyboardEvent::macCharCode): Deleted.
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::PlatformKeyboardEventBuilder::PlatformKeyboardEventBuilder):
+ * replay/SerializationMethods.cpp:
+ (JSC::EncodingTraits<PlatformKeyboardEvent>::encodeValue):
+ (JSC::EncodingTraits<PlatformKeyboardEvent>::decodeValue):
+
2016-09-30 Antti Koivisto <[email protected]>
Remove "rem" unit optimization for document element font size changes
Modified: trunk/Source/WebCore/platform/PlatformKeyboardEvent.h (206643 => 206644)
--- trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/PlatformKeyboardEvent.h 2016-09-30 18:29:31 UTC (rev 206644)
@@ -58,8 +58,6 @@
PlatformKeyboardEvent()
: PlatformEvent(PlatformEvent::KeyDown)
, m_windowsVirtualKeyCode(0)
- , m_nativeVirtualKeyCode(0)
- , m_macCharCode(0)
#if USE(APPKIT) || PLATFORM(GTK)
, m_handledByInputMethod(false)
#endif
@@ -72,14 +70,12 @@
{
}
- PlatformKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, int nativeVirtualKeyCode, int macCharCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<Modifier> modifiers, double timestamp)
+ PlatformKeyboardEvent(Type type, const String& text, const String& unmodifiedText, const String& keyIdentifier, int windowsVirtualKeyCode, bool isAutoRepeat, bool isKeypad, bool isSystemKey, OptionSet<Modifier> modifiers, double timestamp)
: PlatformEvent(type, modifiers, timestamp)
, m_text(text)
, m_unmodifiedText(unmodifiedText)
, m_keyIdentifier(keyIdentifier)
, m_windowsVirtualKeyCode(windowsVirtualKeyCode)
- , m_nativeVirtualKeyCode(nativeVirtualKeyCode)
- , m_macCharCode(macCharCode)
#if USE(APPKIT) || PLATFORM(GTK)
, m_handledByInputMethod(false)
#endif
@@ -111,9 +107,6 @@
int windowsVirtualKeyCode() const { return m_windowsVirtualKeyCode; }
void setWindowsVirtualKeyCode(int code) { m_windowsVirtualKeyCode = code; }
- int nativeVirtualKeyCode() const { return m_nativeVirtualKeyCode; }
- int macCharCode() const { return m_macCharCode; }
-
#if USE(APPKIT) || PLATFORM(GTK)
bool handledByInputMethod() const { return m_handledByInputMethod; }
#endif
@@ -163,8 +156,6 @@
String m_unmodifiedText;
String m_keyIdentifier;
int m_windowsVirtualKeyCode;
- int m_nativeVirtualKeyCode;
- int m_macCharCode;
#if USE(APPKIT) || PLATFORM(GTK)
bool m_handledByInputMethod;
#endif
Modified: trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp (206643 => 206644)
--- trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp 2016-09-30 18:29:31 UTC (rev 206644)
@@ -45,8 +45,6 @@
, m_unmodifiedText(String::fromUTF8(event->string))
, m_keyIdentifier(keyIdentifierForEvasKeyName(String(event->key)))
, m_windowsVirtualKeyCode(windowsKeyCodeForEvasKeyName(String(event->key)))
- , m_nativeVirtualKeyCode(0)
- , m_macCharCode(0)
, m_autoRepeat(false)
, m_isKeypad(String(event->key).startsWith("KP_"))
, m_isSystemKey(false)
@@ -59,8 +57,6 @@
, m_unmodifiedText(String::fromUTF8(event->string))
, m_keyIdentifier(keyIdentifierForEvasKeyName(String(event->key)))
, m_windowsVirtualKeyCode(windowsKeyCodeForEvasKeyName(String(event->key)))
- , m_nativeVirtualKeyCode(0)
- , m_macCharCode(0)
, m_autoRepeat(false)
, m_isKeypad(String(event->key).startsWith("KP_"))
, m_isSystemKey(false)
Modified: trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp (206643 => 206644)
--- trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/gtk/PlatformKeyboardEventGtk.cpp 2016-09-30 18:29:31 UTC (rev 206644)
@@ -576,8 +576,6 @@
, m_unmodifiedText(m_text)
, m_keyIdentifier(keyIdentifierForGdkKeyCode(event->keyval))
, m_windowsVirtualKeyCode(windowsKeyCodeForGdkKeyCode(event->keyval))
- , m_nativeVirtualKeyCode(event->keyval)
- , m_macCharCode(0)
, m_autoRepeat(false)
, m_isKeypad(event->keyval >= GDK_KP_Space && event->keyval <= GDK_KP_9)
, m_isSystemKey(false)
Modified: trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm (206643 => 206644)
--- trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/ios/PlatformEventFactoryIOS.mm 2016-09-30 18:29:31 UTC (rev 206644)
@@ -143,7 +143,6 @@
m_unmodifiedText = event.charactersIgnoringModifiers;
m_keyIdentifier = keyIdentifierForKeyEvent(event);
m_windowsVirtualKeyCode = event.keyCode;
- m_macCharCode = 0;
m_autoRepeat = event.isKeyRepeating;
m_isKeypad = false; // iOS does not distinguish the numpad. See <rdar://problem/7190835>.
m_isSystemKey = false;
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (206643 => 206644)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2016-09-30 18:29:31 UTC (rev 206644)
@@ -562,8 +562,6 @@
m_unmodifiedText = unmodifiedTextFromEvent(event);
m_keyIdentifier = keyIdentifierForKeyEvent(event);
m_windowsVirtualKeyCode = windowsKeyCodeForKeyEvent(event);
- m_nativeVirtualKeyCode = [event keyCode];
- m_macCharCode = wkGetNSEventKeyChar(event);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
m_autoRepeat = [event type] != NSFlagsChanged && [event isARepeat];
Modified: trunk/Source/WebCore/platform/win/KeyEventWin.cpp (206643 => 206644)
--- trunk/Source/WebCore/platform/win/KeyEventWin.cpp 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/platform/win/KeyEventWin.cpp 2016-09-30 18:29:31 UTC (rev 206644)
@@ -225,8 +225,6 @@
, m_unmodifiedText((type == PlatformEvent::Char) ? singleCharacterString(code) : String())
, m_keyIdentifier((type == PlatformEvent::Char) ? String() : keyIdentifierForWindowsKeyCode(code))
, m_windowsVirtualKeyCode((type == RawKeyDown || type == KeyUp) ? windowsKeycodeWithLocation(code, keyData) : 0)
- , m_nativeVirtualKeyCode(m_windowsVirtualKeyCode)
- , m_macCharCode(0)
, m_autoRepeat(HIWORD(keyData) & KF_REPEAT)
, m_isKeypad(isKeypadEvent(code, keyData, type))
, m_isSystemKey(systemKey)
Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (206643 => 206644)
--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2016-09-30 18:29:31 UTC (rev 206644)
@@ -258,8 +258,6 @@
ENCODE_TYPE_WITH_KEY(encodedValue, String, unmodifiedText, input.unmodifiedText());
ENCODE_TYPE_WITH_KEY(encodedValue, String, keyIdentifier, input.keyIdentifier());
ENCODE_TYPE_WITH_KEY(encodedValue, int, windowsVirtualKeyCode, input.windowsVirtualKeyCode());
- ENCODE_TYPE_WITH_KEY(encodedValue, int, nativeVirtualKeyCode, input.nativeVirtualKeyCode());
- ENCODE_TYPE_WITH_KEY(encodedValue, int, macCharCode, input.macCharCode());
ENCODE_TYPE_WITH_KEY(encodedValue, bool, autoRepeat, input.isAutoRepeat());
ENCODE_TYPE_WITH_KEY(encodedValue, bool, keypad, input.isKeypad());
ENCODE_TYPE_WITH_KEY(encodedValue, bool, systemKey, input.isSystemKey());
@@ -279,8 +277,6 @@
DECODE_TYPE_WITH_KEY(encodedValue, String, unmodifiedText);
DECODE_TYPE_WITH_KEY(encodedValue, String, keyIdentifier);
DECODE_TYPE_WITH_KEY(encodedValue, int, windowsVirtualKeyCode);
- DECODE_TYPE_WITH_KEY(encodedValue, int, nativeVirtualKeyCode);
- DECODE_TYPE_WITH_KEY(encodedValue, int, macCharCode);
DECODE_TYPE_WITH_KEY(encodedValue, bool, autoRepeat);
DECODE_TYPE_WITH_KEY(encodedValue, bool, keypad);
DECODE_TYPE_WITH_KEY(encodedValue, bool, systemKey);
@@ -289,7 +285,7 @@
DECODE_TYPE_WITH_KEY(encodedValue, Vector<KeypressCommand>, commands);
#endif
- PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, WTF::safeCast<int>(windowsVirtualKeyCode), WTF::safeCast<int>(nativeVirtualKeyCode), WTF::safeCast<int>(macCharCode), autoRepeat, keypad, systemKey, modifiers, timestamp);
+ PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, WTF::safeCast<int>(windowsVirtualKeyCode), autoRepeat, keypad, systemKey, modifiers, timestamp);
#if USE(APPKIT)
input = std::make_unique<PlatformKeyboardEventAppKit>(platformEvent, handledByInputMethod, commands);
#else
Modified: trunk/Source/WebKit2/ChangeLog (206643 => 206644)
--- trunk/Source/WebKit2/ChangeLog 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-30 18:29:31 UTC (rev 206644)
@@ -1,3 +1,13 @@
+2016-09-27 Anders Carlsson <[email protected]>
+
+ Remove a couple of unused members from PlatformKeyboardEvent
+ https://bugs.webkit.org/show_bug.cgi?id=162641
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebEventConversion.cpp:
+ (WebKit::WebKit2PlatformKeyboardEvent::WebKit2PlatformKeyboardEvent):
+
2016-09-29 Nan Wang <[email protected]>
AX: iOS: Tapping <input> in Safari zooms in a bit when page has max scale = 1
Modified: trunk/Source/WebKit2/Shared/WebEventConversion.cpp (206643 => 206644)
--- trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2016-09-30 18:15:38 UTC (rev 206643)
+++ trunk/Source/WebKit2/Shared/WebEventConversion.cpp 2016-09-30 18:29:31 UTC (rev 206644)
@@ -193,8 +193,6 @@
m_unmodifiedText = webEvent.unmodifiedText();
m_keyIdentifier = webEvent.keyIdentifier();
m_windowsVirtualKeyCode = webEvent.windowsVirtualKeyCode();
- m_nativeVirtualKeyCode = webEvent.nativeVirtualKeyCode();
- m_macCharCode = webEvent.macCharCode();
#if USE(APPKIT) || PLATFORM(GTK)
m_handledByInputMethod = webEvent.handledByInputMethod();
m_commands = webEvent.commands();
