Changeset 177040 in webkit

Timestamp:

Dec 9, 2014 2:39:35 PM (9 years ago)

Author:

ap@apple.com

Message:

Kotoeri sometimes doesn't correctly process the first chanaracter in a text field in Safari 7.1 or 6.2
​https://bugs.webkit.org/show_bug.cgi?id=139459
rdar://problem/19017432
rdar://problem/19036869

Reviewed by Enrica Casucci.

When inputContext changes, notify the application. We already did this when the context
changed due to plug-ins, and this used to sort of make it work on on yahoo.co.jp,
which has plug-ins. But that was quite unreliable, as evidenced by the reproducible
cases where we didn't use an input method for the first keypress.

• UIProcess/PageClient.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::editorStateChanged):

• UIProcess/mac/PageClientImpl.h:
• UIProcess/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::notifyApplicationAboutInputContextChange):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• UIProcess/mac/PageClientImpl.h (modified) (1 diff)
• UIProcess/mac/PageClientImpl.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-09  Alexey Proskuryakov  <ap@apple.com>
+
+        Kotoeri sometimes doesn't correctly process the first chanaracter in a text field in Safari 7.1 or 6.2
+        https://bugs.webkit.org/show_bug.cgi?id=139459
+        rdar://problem/19017432
+        rdar://problem/19036869
+
+        Reviewed by Enrica Casucci.
+
+        When inputContext changes, notify the application. We already did this when the context
+        changed due to plug-ins, and this used to sort of make it work on on yahoo.co.jp,
+        which has plug-ins. But that was quite unreliable, as evidenced by the reproducible
+        cases where we didn't use an input method for the first keypress.
+
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::editorStateChanged):
+        * UIProcess/mac/PageClientImpl.h:
+        * UIProcess/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::notifyApplicationAboutInputContextChange):
+
 2014-12-09  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -186 +186 @@
 #endif
 
+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+    virtual void notifyApplicationAboutInputContextChange() = 0;
+#endif
+
 #if USE(APPKIT)
     virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -3585 +3585 @@
     bool closedComposition = !editorState.shouldIgnoreCompositionSelectionChange && !editorState.hasComposition && (m_editorState.hasComposition || m_temporarilyClosedComposition);
     m_temporarilyClosedComposition = editorState.shouldIgnoreCompositionSelectionChange && (m_temporarilyClosedComposition || m_editorState.hasComposition) && !editorState.hasComposition;
+    bool editabilityChanged = m_editorState.isContentEditable != editorState.isContentEditable;
 #endif
 
@@ -3601 +3602 @@
     if (closedComposition)
         m_pageClient.notifyInputContextAboutDiscardedComposition();
+    if (editabilityChanged) {
+        // This is only needed in sync code path, because AppKit automatically refreshes input context for async clients (<rdar://problem/18604360>).
+        m_pageClient.notifyApplicationAboutInputContextChange();
+    }
     if (editorState.hasComposition) {
         // Abandon the current inline input session if selection changed for any other reason but an input method changing the composition.

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h

@@ -99 +99 @@
     virtual void resetSecureInputState() override;
     virtual void notifyInputContextAboutDiscardedComposition() override;
+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+    virtual void notifyApplicationAboutInputContextChange() override;
+#endif
 
     virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);

trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm

@@ -419 +419 @@
 }
 
+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+void PageClientImpl::notifyApplicationAboutInputContextChange()
+{
+    [NSApp updateWindows];
+}
+#endif
+
 FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& rect)
 {