<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205948] branches/safari-602-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205948">205948</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-09-14 23:56:53 -0700 (Wed, 14 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205934">r205934</a>. rdar://problem/26013388</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxymessagesin">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-09-14 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r205934. rdar://problem/26013388
+
+ 2016-09-14 Beth Dakin <bdakin@apple.com>
+
+ Add needsPlainTextQuirk and send it to the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=161996
+ -and corresponding-
+ rdar://problem/26013388
+
+ Reviewed by Anders Carlsson.
+
+ WebPageProxy should keep track of m_needsPlainTextQuirk.
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setNeedsPlainTextQuirk):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::needsPlainTextQuirk):
+ (WebKit::WebPageProxy::needsHiddenContentEditableQuirk): Deleted.
+ * UIProcess/WebPageProxy.messages.in:
+
+ If m_needsPlainTextQuirk is true, set it back to false on page transition.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didStartPageTransition):
+
+ The sites that need this quirk.
+ (WebKit::needsPlainTextQuirk):
+ (WebKit::WebPage::didChangeSelection):
+ * WebProcess/WebPage/WebPage.h:
+
+2016-09-14 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r205928. rdar://problem/26013388
</span><span class="cx">
</span><span class="cx"> 2016-09-14 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -4268,6 +4268,11 @@
</span><span class="cx"> m_needsHiddenContentEditableQuirk = needsHiddenContentEditableQuirk;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setNeedsPlainTextQuirk(bool needsPlainTextQuirk)
+{
+ m_needsPlainTextQuirk = needsPlainTextQuirk;
+}
+
</ins><span class="cx"> // BackForwardList
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::backForwardAddItem(uint64_t itemID)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -1118,6 +1118,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasHadSelectionChangesFromUserInteraction() const { return m_hasHadSelectionChangesFromUserInteraction; }
</span><span class="cx"> bool needsHiddenContentEditableQuirk() const { return m_needsHiddenContentEditableQuirk; }
</span><ins>+ bool needsPlainTextQuirk() const { return m_needsPlainTextQuirk; }
</ins><span class="cx">
</span><span class="cx"> bool isAlwaysOnLoggingAllowed() const;
</span><span class="cx">
</span><span class="lines">@@ -1282,6 +1283,7 @@
</span><span class="cx"> void compositionWasCanceled(const EditorState&);
</span><span class="cx"> void setHasHadSelectionChangesFromUserInteraction(bool);
</span><span class="cx"> void setNeedsHiddenContentEditableQuirk(bool);
</span><ins>+ void setNeedsPlainTextQuirk(bool);
</ins><span class="cx">
</span><span class="cx"> // Back/Forward list management
</span><span class="cx"> void backForwardAddItem(uint64_t itemID);
</span><span class="lines">@@ -1850,6 +1852,7 @@
</span><span class="cx">
</span><span class="cx"> bool m_hasHadSelectionChangesFromUserInteraction { false };
</span><span class="cx"> bool m_needsHiddenContentEditableQuirk { false };
</span><ins>+ bool m_needsPlainTextQuirk { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> bool m_hasMediaSessionWithActiveMediaElements { false };
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -235,6 +235,7 @@
</span><span class="cx"> CompositionWasCanceled(struct WebKit::EditorState editorState)
</span><span class="cx"> SetHasHadSelectionChangesFromUserInteraction(bool hasHadUserSelectionChanges)
</span><span class="cx"> SetNeedsHiddenContentEditableQuirk(bool needsHiddenContentEditableQuirk)
</span><ins>+ SetNeedsPlainTextQuirk(bool needsPlainTextQuirk)
</ins><span class="cx">
</span><span class="cx"> # Find messages
</span><span class="cx"> DidCountStringMatches(String string, uint32_t matchCount)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -2635,6 +2635,10 @@
</span><span class="cx"> m_needsHiddenContentEditableQuirk = false;
</span><span class="cx"> send(Messages::WebPageProxy::SetNeedsHiddenContentEditableQuirk(m_needsHiddenContentEditableQuirk));
</span><span class="cx"> }
</span><ins>+ if (m_needsPlainTextQuirk) {
+ m_needsPlainTextQuirk = false;
+ send(Messages::WebPageProxy::SetNeedsPlainTextQuirk(m_needsPlainTextQuirk));
+ }
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4772,6 +4776,30 @@
</span><span class="cx"> String path = url.path();
</span><span class="cx"> return equalLettersIgnoringASCIICase(host, "docs.google.com") || (equalLettersIgnoringASCIICase(host, "www.icloud.com") && path.contains("/pages/"));
</span><span class="cx"> }
</span><ins>+
+static bool needsPlainTextQuirk(bool needsQuirks, const URL& url)
+{
+ if (!needsQuirks)
+ return false;
+
+ String host = url.host();
+ String path = url.path();
+ String fragmentIdentifier = url.fragmentIdentifier();
+
+ if (equalLettersIgnoringASCIICase(host, "twitter.com"))
+ return true;
+
+ if (equalLettersIgnoringASCIICase(host, "onedrive.live.com"))
+ return true;
+
+ if (equalLettersIgnoringASCIICase(host, "www.icloud.com") && (path.contains("notes") || fragmentIdentifier.contains("notes") || path.contains("/keynote/")))
+ return true;
+
+ if (equalLettersIgnoringASCIICase(host, "trix-editor.org"))
+ return true;
+
+ return false;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPage::didChangeSelection()
</span><span class="lines">@@ -4794,6 +4822,12 @@
</span><span class="cx"> m_needsHiddenContentEditableQuirk = true;
</span><span class="cx"> send(Messages::WebPageProxy::SetNeedsHiddenContentEditableQuirk(m_needsHiddenContentEditableQuirk));
</span><span class="cx"> }
</span><ins>+
+ if (needsPlainTextQuirk(m_page->settings().needsSiteSpecificQuirks(), m_page->mainFrame().document()->url())) {
+ m_needsPlainTextQuirk = true;
+ send(Messages::WebPageProxy::SetNeedsPlainTextQuirk(m_needsPlainTextQuirk));
+ }
+
</ins><span class="cx"> send(Messages::WebPageProxy::SetHasHadSelectionChangesFromUserInteraction(m_hasEverFocusedElementDueToUserInteractionSincePageTransition));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (205947 => 205948)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2016-09-15 06:56:50 UTC (rev 205947)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2016-09-15 06:56:53 UTC (rev 205948)
</span><span class="lines">@@ -1393,6 +1393,7 @@
</span><span class="cx"> bool m_isAssistingNodeDueToUserInteraction { false };
</span><span class="cx"> bool m_hasEverFocusedElementDueToUserInteractionSincePageTransition { false };
</span><span class="cx"> bool m_needsHiddenContentEditableQuirk { false };
</span><ins>+ bool m_needsPlainTextQuirk { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> bool m_isShowingContextMenu;
</span></span></pre>
</div>
</div>
</body>
</html>