Diff
Modified: trunk/LayoutTests/ChangeLog (235118 => 235119)
--- trunk/LayoutTests/ChangeLog 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/ChangeLog 2018-08-21 16:37:04 UTC (rev 235119)
@@ -1,3 +1,29 @@
+2018-08-21 Daniel Bates <daba...@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 Fujii Hironori <hironori.fu...@sony.com>
Unreviewed WinCairo port test gardening
Modified: trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen-expected.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -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).
Modified: trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-marker-includes-hyphen.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -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");
Modified: trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-expected.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -28,6 +28,9 @@
<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");
Modified: trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font-expected.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -28,6 +28,9 @@
<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");
Modified: trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines-large-font.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -22,6 +22,9 @@
<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");
Modified: trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html (235118 => 235119)
--- trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/editing/spelling/spelling-markers-in-overlapping-lines.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -22,6 +22,9 @@
<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");
Modified: trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html (235118 => 235119)
--- trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker-expected.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -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);
Modified: trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html (235118 => 235119)
--- trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/fast/writing-mode/english-bt-text-with-spelling-marker.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -25,6 +25,9 @@
<body>
<div id="test" contenteditable="true"></div>
<script>
+if (window.internals)
+ internals.setContinuousSpellCheckingEnabled(true);
+
var test = document.getElementById("test");
typeText("a mispelled", test);
Modified: trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html (235118 => 235119)
--- trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker-expected.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -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");
Modified: trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html (235118 => 235119)
--- trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/fast/writing-mode/english-rl-text-with-spelling-marker.html 2018-08-21 16:37:04 UTC (rev 235119)
@@ -24,6 +24,9 @@
<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");
Modified: trunk/LayoutTests/platform/ios/TestExpectations (235118 => 235119)
--- trunk/LayoutTests/platform/ios/TestExpectations 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/LayoutTests/platform/ios/TestExpectations 2018-08-21 16:37:04 UTC (rev 235119)
@@ -102,14 +102,9 @@
# 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/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 ]
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (235118 => 235119)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-08-21 16:37:04 UTC (rev 235119)
@@ -1,3 +1,21 @@
+2018-08-21 Daniel Bates <daba...@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 <achristen...@webkit.org>
Add some plumbing for safe browsing
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h (235118 => 235119)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2018-08-21 16:37:04 UTC (rev 235119)
@@ -230,10 +230,6 @@
{
}
-inline void WebEditorClient::toggleContinuousSpellChecking()
-{
-}
-
inline int WebEditorClient::spellCheckerDocumentTag()
{
return 0;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (235118 => 235119)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2018-08-21 16:37:04 UTC (rev 235119)
@@ -212,13 +212,13 @@
return [m_webView isContinuousSpellCheckingEnabled];
}
-#if !PLATFORM(IOS)
-
void WebEditorClient::toggleContinuousSpellChecking()
{
[m_webView toggleContinuousSpellChecking:nil];
}
+#if !PLATFORM(IOS)
+
bool WebEditorClient::isGrammarCheckingEnabled()
{
return [m_webView isGrammarCheckingEnabled];
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.h (235118 => 235119)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.h 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.h 2018-08-21 16:37:04 UTC (rev 235119)
@@ -580,8 +580,8 @@
- (IBAction)makeTextSmaller:(id)sender;
@property (nonatomic, readonly) BOOL canMakeTextStandardSize;
- (IBAction)makeTextStandardSize:(id)sender;
+- (IBAction)toggleContinuousSpellChecking:(id)sender;
#if !TARGET_OS_IPHONE
-- (IBAction)toggleContinuousSpellChecking:(id)sender;
- (IBAction)toggleSmartInsertDelete:(id)sender;
#endif
#if TARGET_OS_IPHONE
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (235118 => 235119)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-08-21 16:33:51 UTC (rev 235118)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-08-21 16:37:04 UTC (rev 235119)
@@ -7480,6 +7480,11 @@
return [self _resetZoom:sender isTextOnly:![[NSUserDefaults standardUserDefaults] boolForKey:WebKitDebugFullPageZoomPreferenceKey]];
}
+- (IBAction)toggleContinuousSpellChecking:(id)sender
+{
+ [self setContinuousSpellCheckingEnabled:![self isContinuousSpellCheckingEnabled]];
+}
+
#if !PLATFORM(IOS)
- (IBAction)toggleSmartInsertDelete:(id)sender
{
@@ -7486,11 +7491,6 @@
[self setSmartInsertDeleteEnabled:![self smartInsertDeleteEnabled]];
}
-- (IBAction)toggleContinuousSpellChecking:(id)sender
-{
- [self setContinuousSpellCheckingEnabled:![self isContinuousSpellCheckingEnabled]];
-}
-
- (BOOL)_responderValidateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
{
id responder = [self _responderForResponderOperations];
