Diff
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-09-15 06:56:50 UTC (rev 205947)
@@ -1,3 +1,34 @@
+2016-09-14 Babak Shafiei <[email protected]>
+
+ Merge r205928. rdar://problem/26013388
+
+ 2016-09-14 Beth Dakin <[email protected]>
+
+ Add needsHiddenContentEditableQuirk and send it to the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=161984
+ -and corresponding-
+ rdar://problem/26013388
+
+ Reviewed by Anders Carlsson.
+
+ Keep track of m_needsHiddenContentEditableQuirk in WebPageProxy.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setNeedsHiddenContentEditableQuirk):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::needsHiddenContentEditableQuirk):
+ (WebKit::WebPageProxy::hasHadSelectionChangesFromUserInteraction): Deleted.
+ * UIProcess/WebPageProxy.messages.in:
+
+ If m_needsHiddenContentEditableQuirk is true, set it back to false on page
+ transition.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didStartPageTransition):
+
+ Google Docs and iCloud Pages are the sites that need this quirk.
+ (WebKit::needsHiddenContentEditableQuirk):
+ (WebKit::WebPage::didChangeSelection):
+ * WebProcess/WebPage/WebPage.h:
+
2016-09-13 Babak Shafiei <[email protected]>
Merge r205873. rdar://problem/28208208
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-09-15 06:56:50 UTC (rev 205947)
@@ -4263,6 +4263,11 @@
m_hasHadSelectionChangesFromUserInteraction = hasHadUserSelectionChanges;
}
+void WebPageProxy::setNeedsHiddenContentEditableQuirk(bool needsHiddenContentEditableQuirk)
+{
+ m_needsHiddenContentEditableQuirk = needsHiddenContentEditableQuirk;
+}
+
// BackForwardList
void WebPageProxy::backForwardAddItem(uint64_t itemID)
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-09-15 06:56:50 UTC (rev 205947)
@@ -1117,6 +1117,7 @@
void setUserInterfaceLayoutDirection(WebCore::UserInterfaceLayoutDirection);
bool hasHadSelectionChangesFromUserInteraction() const { return m_hasHadSelectionChangesFromUserInteraction; }
+ bool needsHiddenContentEditableQuirk() const { return m_needsHiddenContentEditableQuirk; }
bool isAlwaysOnLoggingAllowed() const;
@@ -1280,6 +1281,7 @@
void editorStateChanged(const EditorState&);
void compositionWasCanceled(const EditorState&);
void setHasHadSelectionChangesFromUserInteraction(bool);
+ void setNeedsHiddenContentEditableQuirk(bool);
// Back/Forward list management
void backForwardAddItem(uint64_t itemID);
@@ -1847,6 +1849,7 @@
bool m_isResourceCachingDisabled { false };
bool m_hasHadSelectionChangesFromUserInteraction { false };
+ bool m_needsHiddenContentEditableQuirk { false };
#if ENABLE(MEDIA_SESSION)
bool m_hasMediaSessionWithActiveMediaElements { false };
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-09-15 06:56:50 UTC (rev 205947)
@@ -234,6 +234,7 @@
EditorStateChanged(struct WebKit::EditorState editorState)
CompositionWasCanceled(struct WebKit::EditorState editorState)
SetHasHadSelectionChangesFromUserInteraction(bool hasHadUserSelectionChanges)
+ SetNeedsHiddenContentEditableQuirk(bool needsHiddenContentEditableQuirk)
# Find messages
DidCountStringMatches(String string, uint32_t matchCount)
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-09-15 06:56:50 UTC (rev 205947)
@@ -2631,6 +2631,10 @@
#if PLATFORM(MAC)
if (hasPreviouslyFocusedDueToUserInteraction)
send(Messages::WebPageProxy::SetHasHadSelectionChangesFromUserInteraction(m_hasEverFocusedElementDueToUserInteractionSincePageTransition));
+ if (m_needsHiddenContentEditableQuirk) {
+ m_needsHiddenContentEditableQuirk = false;
+ send(Messages::WebPageProxy::SetNeedsHiddenContentEditableQuirk(m_needsHiddenContentEditableQuirk));
+ }
#endif
}
@@ -4758,6 +4762,18 @@
}
#endif
+#if PLATFORM(MAC)
+static bool needsHiddenContentEditableQuirk(bool needsQuirks, const URL& url)
+{
+ if (!needsQuirks)
+ return false;
+
+ String host = url.host();
+ String path = url.path();
+ return equalLettersIgnoringASCIICase(host, "docs.google.com") || (equalLettersIgnoringASCIICase(host, "www.icloud.com") && path.contains("/pages/"));
+}
+#endif
+
void WebPage::didChangeSelection()
{
Frame& frame = m_page->focusController().focusedOrMainFrame();
@@ -4773,8 +4789,13 @@
bool hasPreviouslyFocusedDueToUserInteraction = m_hasEverFocusedElementDueToUserInteractionSincePageTransition;
m_hasEverFocusedElementDueToUserInteractionSincePageTransition |= m_userIsInteracting;
- if (!hasPreviouslyFocusedDueToUserInteraction && m_hasEverFocusedElementDueToUserInteractionSincePageTransition)
+ if (!hasPreviouslyFocusedDueToUserInteraction && m_hasEverFocusedElementDueToUserInteractionSincePageTransition) {
+ if (needsHiddenContentEditableQuirk(m_page->settings().needsSiteSpecificQuirks(), m_page->mainFrame().document()->url())) {
+ m_needsHiddenContentEditableQuirk = true;
+ send(Messages::WebPageProxy::SetNeedsHiddenContentEditableQuirk(m_needsHiddenContentEditableQuirk));
+ }
send(Messages::WebPageProxy::SetHasHadSelectionChangesFromUserInteraction(m_hasEverFocusedElementDueToUserInteractionSincePageTransition));
+ }
// Abandon the current inline input session if selection changed for any other reason but an input method direct action.
// FIXME: This logic should be in WebCore.
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (205946 => 205947)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-15 04:54:37 UTC (rev 205946)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-09-15 06:56:50 UTC (rev 205947)
@@ -1392,6 +1392,7 @@
bool m_userIsInteracting;
bool m_isAssistingNodeDueToUserInteraction { false };
bool m_hasEverFocusedElementDueToUserInteractionSincePageTransition { false };
+ bool m_needsHiddenContentEditableQuirk { false };
#if ENABLE(CONTEXT_MENUS)
bool m_isShowingContextMenu;