Diff
Modified: branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog (178981 => 178982)
--- branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog 2015-01-23 05:38:55 UTC (rev 178982)
@@ -1,5 +1,23 @@
2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+ Merge r174708. rdar://problem/19451256
+
+ 2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r175629. rdar://problem/19465100
+
+ 2014-11-05 Alexey Proskuryakov <a...@apple.com>
+
+ Incorrect sandbox_check in RemoteInspector.mm
+ https://bugs.webkit.org/show_bug.cgi?id=138408
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::canAccessWebInspectorMachPort):
+
+2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+
Merge r174381. rdar://problem/19450841
2014-10-06 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (178981 => 178982)
--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 05:38:55 UTC (rev 178982)
@@ -1,5 +1,23 @@
2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+ Merge r174708. rdar://problem/19451256
+
+ 2014-10-14 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r165356): Issues with Japanese text input
+ https://bugs.webkit.org/show_bug.cgi?id=137719
+ rdar://problem/18431952
+ rdar://problem/18483741
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didChangeSelection):
+ In sync code path, ensure consistent message delivery order by adding
+ a DispatchMessageEvenWhenWaitingForSyncReply flag. This way, delayed
+ EditorStateChanged messages won't confuse UI process.
+
+2015-01-22 Matthew Hanson <matthew_han...@apple.com>
+
Merge r177152. rdar://problem/19451288
2014-12-11 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h (178981 => 178982)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h 2015-01-23 05:38:55 UTC (rev 178982)
@@ -185,6 +185,10 @@
virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
#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,
const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) = 0;
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (178981 => 178982)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 05:38:55 UTC (rev 178982)
@@ -3495,6 +3495,7 @@
#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
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
m_editorState = editorState;
@@ -3511,6 +3512,10 @@
#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
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.
// FIXME: This logic should be in WebCore, no need to round-trip to UI process to cancel the composition.
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h (178981 => 178982)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-23 05:38:55 UTC (rev 178982)
@@ -98,6 +98,9 @@
virtual void updateSecureInputState() override;
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&);
virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (178981 => 178982)
--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-23 05:38:55 UTC (rev 178982)
@@ -429,6 +429,13 @@
[m_wkView _notifyInputContextAboutDiscardedComposition];
}
+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+void PageClientImpl::notifyApplicationAboutInputContextChange()
+{
+ [NSApp updateWindows];
+}
+#endif
+
FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& rect)
{
return [m_wkView _convertToDeviceSpace:rect];
