Changeset 91169 in webkit

Timestamp:

Jul 17, 2011 6:47:28 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Patch by Lukasz Slachciak <​l.slachciak@samsung.com> on 2011-07-17
Reviewed by Martin Robinson.

[GTK] [WK2] Fix for getting editor client commands.
​https://bugs.webkit.org/show_bug.cgi?id=63081

Editor client commands intepretation was incorrect. It was based on the NativeWebKeyboardEvent only.
In fact EventHandler is generating interpreted events - keypress and keydown. These event types
are now passed from UIProcess to WebProcess so KeyBindingTranslator can correctly find editor commands.
Also build break for Debug build was fixed.

• UIProcess/API/gtk/PageClientImpl.cpp: KeyboardEvent type is used for KeyBindingTranslator.

(WebKit::PageClientImpl::getEditorCommandsForKeyEvent): getEditorCommandsForKeyEvent now has additional
parameter describing KeyboardEvent type.

• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/PageClient.h:
• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in:
• UIProcess/gtk/WebPageProxyGtk.cpp:

(WebKit::WebPageProxy::getEditorCommandsForKeyEvent): KeyboardEvent type passed to PageClient.

• WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:

(WebKit::WebEditorClient::getEditorCommandsForKeyEvent): Sync message send with KeyboardEvent type.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/gtk/WebPageProxyGtk.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-17  Lukasz Slachciak  <l.slachciak@samsung.com>
+
+        Reviewed by Martin Robinson.
+
+         [GTK] [WK2] Fix for getting editor client commands.
+         https://bugs.webkit.org/show_bug.cgi?id=63081
+
+         Editor client commands intepretation was incorrect. It was based on the NativeWebKeyboardEvent only.
+         In fact EventHandler is generating interpreted events - keypress and keydown. These event types
+         are now passed from UIProcess to WebProcess so KeyBindingTranslator can correctly find editor commands.
+         Also build break for Debug build was fixed.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp: KeyboardEvent type is used for KeyBindingTranslator.
+        (WebKit::PageClientImpl::getEditorCommandsForKeyEvent): getEditorCommandsForKeyEvent now has additional
+        parameter describing KeyboardEvent type.
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::getEditorCommandsForKeyEvent): KeyboardEvent type passed to PageClient.
+        * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+        (WebKit::WebEditorClient::getEditorCommandsForKeyEvent): Sync message send with KeyboardEvent type.
+
 2011-07-16  Daniel Bates  <dbates@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp

@@ -56 +56 @@
 }
 
-void PageClientImpl::getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent& event, Vector<WTF::String>& commandList)
-{
-    ASSERT(event.type == WebEvent::KeyDown || event.type == WebEvent.KeyPress);
-    KeyBindingTranslator::EventType type = WebEvent::KeyDown ? 
+void PageClientImpl::getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent& event, const AtomicString& eventType, Vector<WTF::String>& commandList)
+{
+    ASSERT(eventType == eventNames().keydownEvent || eventType == eventNames().keypressEvent);
+
+    KeyBindingTranslator::EventType type = eventType == eventNames().keydownEvent ?
         KeyBindingTranslator::KeyDown : KeyBindingTranslator::KeyPress;
     m_keyBindingTranslator.getEditorCommandsForKeyEvent(const_cast<GdkEventKey*>(&event.nativeEvent()->key), type, commandList);

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h

@@ -88 +88 @@
     virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects);
     virtual float userSpaceScaleFactor() const { return 1; }
-    virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, Vector<WTF::String>&);
+    virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&);
     virtual void findStringInCustomRepresentation(const String&, FindOptions, unsigned);
     virtual void countStringMatchesInCustomRepresentation(const String&, FindOptions, unsigned);

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -131 +131 @@
 #endif
 #if PLATFORM(GTK)
-    virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, Vector<WTF::String>&) = 0;
+    virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) = 0;
 #endif
     virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) = 0;

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -690 +690 @@
 #endif
 
-#if PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(GTK)
+    void getEditorCommandsForKeyEvent(const AtomicString&, Vector<String>&);
+#endif
+#if PLATFORM(EFL)
     void getEditorCommandsForKeyEvent(Vector<String>&);
 #endif

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -140 +140 @@
 #if PLATFORM(GTK)
     # Support for GTK+ platform keybindings
-    GetEditorCommandsForKeyEvent() -> (Vector<WTF::String> commandsList)
+    GetEditorCommandsForKeyEvent(AtomicString eventType) -> (Vector<WTF::String> commandsList)
 #endif
 

trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -45 +45 @@
 }
 
-void WebPageProxy::getEditorCommandsForKeyEvent(Vector<WTF::String>& commandsList)
+void WebPageProxy::getEditorCommandsForKeyEvent(const AtomicString& eventType, Vector<WTF::String>& commandsList)
 {
-    m_pageClient->getEditorCommandsForKeyEvent(m_keyEventQueue.first(), commandsList);
+    m_pageClient->getEditorCommandsForKeyEvent(m_keyEventQueue.first(), eventType, commandsList);
 }
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp

@@ -37 +37 @@
     ASSERT(event->type() == eventNames().keydownEvent || event->type() == eventNames().keypressEvent);
 
-    // First try to interpret the command in the UI and get the commands.
-    WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetEditorCommandsForKeyEvent(),
+    /* First try to interpret the command in the UI and get the commands.
+       UI needs to receive event type because only knows current NativeWebKeyboardEvent.*/
+    WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetEditorCommandsForKeyEvent(event->type()),
                                                 Messages::WebPageProxy::GetEditorCommandsForKeyEvent::Reply(pendingEditorCommands),
                                                 m_page->pageID(), CoreIPC::Connection::NoTimeout);