Remove iCloud Pages and Keynote site-specific hacks
authorbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2016 21:33:37 +0000 (21:33 +0000)
committerbdakin@apple.com <bdakin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2016 21:33:37 +0000 (21:33 +0000)
https://bugs.webkit.org/show_bug.cgi?id=165544
-and corresponding-
rdar://problem/29082536

Reviewed by Wenson Hsieh.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::needsHiddenContentEditableQuirk):
(WebKit::needsPlainTextQuirk):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@209475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index 056ad0c..59c4535 100644 (file)
@@ -1,3 +1,16 @@
+2016-12-07  Beth Dakin  <bdakin@apple.com>
+
+        Remove iCloud Pages and Keynote site-specific hacks
+        https://bugs.webkit.org/show_bug.cgi?id=165544
+        -and corresponding-
+        rdar://problem/29082536
+
+        Reviewed by Wenson Hsieh.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::needsHiddenContentEditableQuirk):
+        (WebKit::needsPlainTextQuirk):
+
 2016-12-05  Ada Chan  <adachan@apple.com>
 
         Add a getter for serverTrust in _WKObservablePageState
index 6def4fc..ab5efe7 100644 (file)
@@ -4824,7 +4824,7 @@ static bool needsHiddenContentEditableQuirk(bool needsQuirks, const URL& url)
 
     String host = url.host();
     String path = url.path();
-    return equalLettersIgnoringASCIICase(host, "docs.google.com") || (equalLettersIgnoringASCIICase(host, "www.icloud.com") && path.contains("/pages/"));
+    return equalLettersIgnoringASCIICase(host, "docs.google.com");
 }
 
 static bool needsPlainTextQuirk(bool needsQuirks, const URL& url)
@@ -4841,7 +4841,7 @@ static bool needsPlainTextQuirk(bool needsQuirks, const URL& url)
         return true;
 
     String path = url.path();
-    if (equalLettersIgnoringASCIICase(host, "www.icloud.com") && (path.contains("notes") || url.fragmentIdentifier().contains("notes") || path.contains("/keynote/")))
+    if (equalLettersIgnoringASCIICase(host, "www.icloud.com") && (path.contains("notes") || url.fragmentIdentifier().contains("notes")))
         return true;
 
     if (equalLettersIgnoringASCIICase(host, "trix-editor.org"))