Attachment 347569 Details for Bug 188763 – For landing

[patch] For landing

bug-188763-20180820165003.patch (text/plain), 14.65 KB, created by Daniel Bates on 2018-08-20 16:50:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-08-20 16:50:04 PDT

Size: 14.65 KB

patch

obsolete

>Subversion Revision: 235099
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 98581661ba40994932aab0d77b0c4a274a97f6cd..0b6370726d192f8072b2baf53d29f327b9f991d4 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-20  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS][WK1] Support toggling continuous spell checking from tests
>+        https://bugs.webkit.org/show_bug.cgi?id=188763
>+
>+        Reviewed by Simon Fraser.
>+
>+        Move some more code out from under a !PLATFORM(IOS)-guard so as to support toggling continuous
>+        spell checking from tests in iOS WebKit Legacy.
>+
>+        * WebCoreSupport/WebEditorClient.h:
>+        (WebEditorClient::toggleContinuousSpellChecking): Deleted.
>+        * WebCoreSupport/WebEditorClient.mm:
>+        * WebView/WebView.h:
>+        * WebView/WebView.mm:
>+        (-[WebView toggleContinuousSpellChecking:]):
>+        (-[WebView toggleSmartInsertDelete:]):
>+
> 2018-08-17  Alex Christensen  <achristensen@webkit.org>
> 
>         Add some plumbing for safe browsing
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h
>index 4f10ad376d1edfafc65b0f2bbd402b44a495b1fb..da35efe551ea6e8db6a7ac608b650ce95bee09a4 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h
>@@ -230,10 +230,6 @@ inline void WebEditorClient::toggleGrammarChecking()
> {
> }
> 
>-inline void WebEditorClient::toggleContinuousSpellChecking()
>-{
>-}
>-
> inline int WebEditorClient::spellCheckerDocumentTag()
> {
>     return 0;
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>index d311dd65f170c1b25d47a3279753a5d535b575eb..7ae5685f34e841b96561f462225ff4750a8163d6 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm
>@@ -212,13 +212,13 @@ bool WebEditorClient::isContinuousSpellCheckingEnabled()
>     return [m_webView isContinuousSpellCheckingEnabled];
> }
> 
>-#if !PLATFORM(IOS)
>-
> void WebEditorClient::toggleContinuousSpellChecking()
> {
>     [m_webView toggleContinuousSpellChecking:nil];
> }
> 
>+#if !PLATFORM(IOS)
>+
> bool WebEditorClient::isGrammarCheckingEnabled()
> {
>     return [m_webView isGrammarCheckingEnabled];
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.h b/Source/WebKitLegacy/mac/WebView/WebView.h
>index ee343731863988923b69f17bf964473dd67b9456..d11daabae46447fecf74597f86303f024e888fee 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.h
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.h
>@@ -580,8 +580,8 @@ WEBKIT_CLASS_DEPRECATED_MAC(10_3, 10_14, "No longer supported; please adopt WKWe
> - (IBAction)makeTextSmaller:(id)sender;
> @property (nonatomic, readonly) BOOL canMakeTextStandardSize;
> - (IBAction)makeTextStandardSize:(id)sender;
>-#if !TARGET_OS_IPHONE
> - (IBAction)toggleContinuousSpellChecking:(id)sender;
>+#if !TARGET_OS_IPHONE
> - (IBAction)toggleSmartInsertDelete:(id)sender;
> #endif
> #if TARGET_OS_IPHONE
>diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm
>index 5617fb7c3394d1247b7c4de7db63eadf8de9263f..11cb3ba719b7a590ac7af6ee2af65e99e5cf0280 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm
>@@ -7480,15 +7480,15 @@ - (IBAction)makeTextStandardSize:(id)sender
>    return [self _resetZoom:sender isTextOnly:![[NSUserDefaults standardUserDefaults] boolForKey:WebKitDebugFullPageZoomPreferenceKey]];
> }
> 
>-#if !PLATFORM(IOS)
>-- (IBAction)toggleSmartInsertDelete:(id)sender
>+- (IBAction)toggleContinuousSpellChecking:(id)sender
> {
>-    [self setSmartInsertDeleteEnabled:![self smartInsertDeleteEnabled]];
>+    [self setContinuousSpellCheckingEnabled:![self isContinuousSpellCheckingEnabled]];
> }
> 
>-- (IBAction)toggleContinuousSpellChecking:(id)sender
>+#if !PLATFORM(IOS)
>+- (IBAction)toggleSmartInsertDelete:(id)sender
> {
>-    [self setContinuousSpellCheckingEnabled:![self isContinuousSpellCheckingEnabled]];
>+    [self setSmartInsertDeleteEnabled:![self smartInsertDeleteEnabled]];
> }
> 
> - (BOOL)_responderValidateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index e0325cd10b14b72090a05235b5aee646a239976c..d5ba8e69e1c420a5022eab2c3eb63409426e579d 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-08-20  Daniel Bates  <dabates@apple.com>
>+
>+        [iOS][WK1] Support toggling continuous spell checking from tests
>+        https://bugs.webkit.org/show_bug.cgi?id=188763
>+
>+        Reviewed by Simon Fraser.
>+
>+        Fix up some spelling tests so that they enable continuous spell checking and unskip them,
>+        with the exception of fast/writing-mode/english-rl-text-with-spelling-marker.html, now
>+        that they pass.
>+
>+        Mark the test fast/writing-mode/english-rl-text-with-spelling-marker.html as an image-only
>+        failure. See <https://bugs.webkit.org/show_bug.cgi?id=188762> for more details.
>+
>+        * editing/spelling/spelling-marker-includes-hyphen-expected.html:
>+        * editing/spelling/spelling-marker-includes-hyphen.html:
>+        * editing/spelling/spelling-markers-in-overlapping-lines-expected.html:
>+        * editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html:
>+        * editing/spelling/spelling-markers-in-overlapping-lines-large-font.html:
>+        * editing/spelling/spelling-markers-in-overlapping-lines.html:
>+        * fast/writing-mode/english-bt-text-with-spelling-marker-expected.html:
>+        * fast/writing-mode/english-bt-text-with-spelling-marker.html:
>+        * fast/writing-mode/english-rl-text-with-spelling-marker-expected.html:
>+        * fast/writing-mode/english-rl-text-with-spelling-marker.html:
>+        * platform/ios/TestExpectations:
>+
> 2018-08-20  Jeremy Jones  <jeremyj@apple.com>
> 
>         Enable ios media tests that were blocked on user gesture.
>diff --git a/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html b/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html
>index 858b132607d01bfd70eba2191b8dcae55dcd30d9..caa9d955580584be64300e73093b9bfbe0ca443a 100644
>--- a/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html
>+++ b/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html
>@@ -15,6 +15,9 @@
> <body>
> <div id="test" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var testElement = document.getElementById("test");
> testElement.focus();
> document.execCommand("InsertText", false, "misllHlll"); // The H is a placeholder for the hyphen (had it been automatically inserted).
>diff --git a/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html b/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html
>index 6424daca90c9dddd7fa51a33a864b1fb0fd90c9f..954ab48df1760648c50fe78d11d152d66c83d530 100644
>--- a/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html
>+++ b/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html
>@@ -17,6 +17,9 @@
> <body>
> <div id="test" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var testElement = document.getElementById("test");
> testElement.focus();
> document.execCommand("InsertText", false, "mislllll");
>diff --git a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html
>index 7ffb16c73f8946059d1cd0a92fd2be3350340950..ffbd45be499d2208c6cd7cb4fa2d968f4079d9fb 100644
>--- a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html
>+++ b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html
>@@ -28,6 +28,9 @@ body {
> <div id="first" contenteditable="true"></div>
> <div id="second" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var first = document.getElementById("first");
> var second = document.getElementById("second");
> 
>diff --git a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html
>index 53aa4f187bad5dcc7fab3f8bc77e34a5b69eb314..b1ba97c78fb1c61d31deb3e84085d41fba063681 100644
>--- a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html
>+++ b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html
>@@ -28,6 +28,9 @@ body {
> <div id="first" contenteditable="true"></div>
> <div id="second" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var first = document.getElementById("first");
> var second = document.getElementById("second");
> 
>diff --git a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html
>index adf4c72eaf269869d142816bcfcee1cc80f4fe0c..17158ee061bf795175a9717a51c495921ea9fdc3 100644
>--- a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html
>+++ b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html
>@@ -22,6 +22,9 @@ body {
> <div id="first" contenteditable="true"></div>
> <div id="second" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var first = document.getElementById("first");
> var second = document.getElementById("second");
> 
>diff --git a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html
>index 99e66e94f81d516867660cea697c5fda1614a4bd..df381565fbfcba07954096fc6f7bc0de588ac59b 100644
>--- a/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html
>+++ b/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html
>@@ -22,6 +22,9 @@ body {
> <div id="first" contenteditable="true"></div>
> <div id="second" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var first = document.getElementById("first");
> var second = document.getElementById("second");
> 
>diff --git a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>index a4a1420f40364711fc14e20db00debc892fe5081..d0fcabc24116b2941a8451a6012ba28a84e0387d 100644
>--- a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>+++ b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html
>@@ -21,6 +21,9 @@
> <body>
> <div id="expected" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var expected = document.getElementById("expected");
> 
> typeText("mispelled a", expected);
>diff --git a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>index a249419c8a8831c46241f5ab4bd89c3c00c54186..a96e7018122e89ca452c9eaf5ca8d2553b4ff5ca 100644
>--- a/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>+++ b/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html
>@@ -25,6 +25,9 @@ body {
> <body>
> <div id="test" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var test = document.getElementById("test");
> 
> typeText("a mispelled", test);
>diff --git a/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html b/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html
>index 6e71dca6f3b9ec9e950893dbba09a972bd3d783f..a8b94a55c5ab3c7f74c499ef2e76f6ca20227ae9 100644
>--- a/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html
>+++ b/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html
>@@ -21,6 +21,9 @@
> <body>
> <div id="expected" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var expected = document.getElementById("expected");
> expected.focus();
> document.execCommand("InsertText", false, "mispelled");
>diff --git a/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html b/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html
>index 6691509149976c952bbbf0ab8f3d5001200b6a62..5ef79a141f64f20c22058a02589413a7c80bed8e 100644
>--- a/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html
>+++ b/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html
>@@ -24,6 +24,9 @@ body {
> <body>
> <div id="test" contenteditable="true"></div>
> <script>
>+if (window.internals)
>+    internals.setContinuousSpellCheckingEnabled(true);
>+
> var test = document.getElementById("test");
> test.focus();
> document.execCommand("InsertText", false, "mispelled");
>diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
>index c1975ab126dba7fa16478b03ddc874bd231d4204..45f51f894c1a31bc5a8f7b15e358a3ca71b4f03a 100644
>--- a/LayoutTests/platform/ios/TestExpectations
>+++ b/LayoutTests/platform/ios/TestExpectations
>@@ -102,14 +102,9 @@ fast/forms/file/file-input-capture.html
> # ENABLE(DRAGGABLE_REGION) is disabled
> fast/css/draggable-region-parser.html
> 
>-# Spelling and grammar markers are not supported
>+# Retro-correction is not supported on iOS
> editing/spelling/retro-correction-spelling-markers.html [ WontFix ]
>-editing/spelling/spelling-marker-includes-hyphen.html [ WontFix ]
> editing/spelling/spelling-markers-after-pasting-sentence.html [ WontFix ]
>-editing/spelling/spelling-markers-in-overlapping-lines.html [ WontFix ]
>-editing/spelling/spelling-markers-in-overlapping-lines-large-font.html [ WontFix ]
>-fast/writing-mode/english-bt-text-with-spelling-marker.html [ WontFix ]
>-fast/writing-mode/english-rl-text-with-spelling-marker.html [ WontFix ]
> 
> # Requires support for testing text replacement
> editing/spelling/text-replacement-after-typing-to-word.html [ Skip ]
>@@ -3201,3 +3196,5 @@ webkit.org/b/187982 webgl/2.0.0/conformance2/glsl3 [ Skip ]
> webkit.org/b/188285 platform/mac/media/audio-session-category-video-paused.html [ Skip ]
> 
> webkit.org/b/188578 svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html [ Pass Failure ]
>+
>+webkit.org/b/188762 fast/writing-mode/english-rl-text-with-spelling-marker.html [ ImageOnlyFailure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 188763: 347558 | 347569