Attachment 387540 Details for Bug 205964 – Patch

[patch] Patch

bug-205964.diff (text/plain), 10.67 KB, created by Don Olmstead on 2020-01-13 10:03:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2020-01-13 10:03:54 PST

Size: 10.67 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 48b2f565b339..aee2f54f5349 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,26 @@
>+2020-01-13  Don Olmstead  <don.olmstead@sony.com>
>+
>+        Share TextChecker stub for ports without text checking
>+        https://bugs.webkit.org/show_bug.cgi?id=205964
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests. No change in behavior.
>+
>+        The Windows and WPE ports have the same stub for text checking. Combine those
>+        two for non-Cocoa and non-GTK ports.
>+
>+        * PlatformFTW.cmake:
>+        * PlatformWin.cmake:
>+        * Sources.txt:
>+        * SourcesWPE.txt:
>+        * UIProcess/TextChecker.cpp: Renamed from Source/WebKit/UIProcess/wpe/TextCheckerWPE.cpp.
>+        (WebKit::checkerState):
>+        (WebKit::TextChecker::state):
>+        (WebKit::TextChecker::checkTextOfParagraph):
>+        * UIProcess/win/TextCheckerWin.cpp: Removed.
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2020-01-13  Brent Fulgham  <bfulgham@apple.com>
> 
>         [iOS] Remove 'com.apple.diagnosticd' from WebContent process sandbox
>diff --git a/Source/WebKit/PlatformFTW.cmake b/Source/WebKit/PlatformFTW.cmake
>index 3a1cff9006ae..8e4033eb704c 100644
>--- a/Source/WebKit/PlatformFTW.cmake
>+++ b/Source/WebKit/PlatformFTW.cmake
>@@ -55,7 +55,6 @@ list(APPEND WebKit_SOURCES
>     UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
> 
>     UIProcess/win/PageClientImpl.cpp
>-    UIProcess/win/TextCheckerWin.cpp
>     UIProcess/win/WebContextMenuProxyWin.cpp
>     UIProcess/win/WebInspectorProxyWin.cpp
>     UIProcess/win/WebPageProxyWin.cpp
>diff --git a/Source/WebKit/PlatformWin.cmake b/Source/WebKit/PlatformWin.cmake
>index 26c9bea5089c..2749522250ce 100644
>--- a/Source/WebKit/PlatformWin.cmake
>+++ b/Source/WebKit/PlatformWin.cmake
>@@ -55,7 +55,6 @@ list(APPEND WebKit_SOURCES
>     UIProcess/WebsiteData/win/WebsiteDataStoreWin.cpp
> 
>     UIProcess/win/PageClientImpl.cpp
>-    UIProcess/win/TextCheckerWin.cpp
>     UIProcess/win/WebContextMenuProxyWin.cpp
>     UIProcess/win/WebInspectorProxyWin.cpp
>     UIProcess/win/WebPageProxyWin.cpp
>diff --git a/Source/WebKit/Sources.txt b/Source/WebKit/Sources.txt
>index 306cd1e69356..f87cf93fb6ad 100644
>--- a/Source/WebKit/Sources.txt
>+++ b/Source/WebKit/Sources.txt
>@@ -272,6 +272,7 @@ UIProcess/ResponsivenessTimer.cpp
> UIProcess/StatisticsRequest.cpp
> UIProcess/SuspendedPageProxy.cpp
> UIProcess/SystemPreviewController.cpp
>+UIProcess/TextChecker.cpp
> UIProcess/TextCheckerCompletion.cpp
> UIProcess/UserMediaPermissionCheckProxy.cpp
> UIProcess/UserMediaPermissionRequestManagerProxy.cpp
>diff --git a/Source/WebKit/SourcesWPE.txt b/Source/WebKit/SourcesWPE.txt
>index 0c9dfe119fca..5bd42f762640 100644
>--- a/Source/WebKit/SourcesWPE.txt
>+++ b/Source/WebKit/SourcesWPE.txt
>@@ -211,7 +211,6 @@ UIProcess/linux/MemoryPressureMonitor.cpp
> UIProcess/soup/WebCookieManagerProxySoup.cpp
> UIProcess/soup/WebProcessPoolSoup.cpp
> 
>-UIProcess/wpe/TextCheckerWPE.cpp
> UIProcess/wpe/WebInspectorProxyWPE.cpp
> UIProcess/wpe/WebPageProxyWPE.cpp
> UIProcess/wpe/WebPasteboardProxyWPE.cpp
>diff --git a/Source/WebKit/UIProcess/wpe/TextCheckerWPE.cpp b/Source/WebKit/UIProcess/TextChecker.cpp
>similarity index 86%
>rename from Source/WebKit/UIProcess/wpe/TextCheckerWPE.cpp
>rename to Source/WebKit/UIProcess/TextChecker.cpp
>index 01921216868a..3f826f5066bc 100644
>--- a/Source/WebKit/UIProcess/wpe/TextCheckerWPE.cpp
>+++ b/Source/WebKit/UIProcess/TextChecker.cpp
>@@ -1,5 +1,7 @@
> /*
>+ * Copyright (C) 2010 Apple Inc. All rights reserved.
>  * Copyright (C) 2014 Igalia S.L.
>+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -26,17 +28,22 @@
> #include "config.h"
> #include "TextChecker.h"
> 
>+#if !PLATFORM(COCOA) && !PLATFORM(GTK)
> #include "TextCheckerState.h"
> #include <WebCore/NotImplemented.h>
> 
> namespace WebKit {
> using namespace WebCore;
> 
>-static TextCheckerState textCheckerState;
>+static TextCheckerState& checkerState()
>+{
>+    static TextCheckerState textCheckerState;
>+    return textCheckerState;
>+}
> 
> const TextCheckerState& TextChecker::state()
> {
>-    return textCheckerState;
>+    return checkerState();
> }
> 
> void TextChecker::setTestingMode(bool)
>@@ -138,4 +145,14 @@ void TextChecker::requestCheckingOfString(Ref<TextCheckerCompletion>&&, int32_t)
>     notImplemented();
> }
> 
>-} // namespace WebKit
>+#if USE(UNIFIED_TEXT_CHECKING)
>+Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(SpellDocumentTag, StringView, int32_t, OptionSet<TextCheckingType>, bool)
>+{
>+    notImplemented();
>+    return { };
>+}
>+#endif
>+
>+} // namespace WebKit 
>+
>+#endif // !PLATFORM(COCOA) && !PLATFORM(GTK)
>diff --git a/Source/WebKit/UIProcess/win/TextCheckerWin.cpp b/Source/WebKit/UIProcess/win/TextCheckerWin.cpp
>deleted file mode 100644
>index c7f2f70d80bb..000000000000
>--- a/Source/WebKit/UIProcess/win/TextCheckerWin.cpp
>+++ /dev/null
>@@ -1,140 +0,0 @@
>-/*
>- * Copyright (C) 2010 Apple Inc. All rights reserved.
>- * Copyright (C) 2017 Sony Interactive Entertainment Inc.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>- * THE POSSIBILITY OF SUCH DAMAGE.
>- */
>-
>-#include "config.h"
>-#include "TextChecker.h"
>-
>-#include "TextCheckerState.h"
>-#include <WebCore/NotImplemented.h>
>-
>-namespace WebKit {
>-using namespace WebCore;
>-
>-TextCheckerState& checkerState()
>-{
>-    static TextCheckerState textCheckerState;
>-    return textCheckerState;
>-}
>-
>-const TextCheckerState& TextChecker::state()
>-{
>-    return checkerState();
>-}
>-
>-static bool testingModeEnabled = false;
>-
>-void TextChecker::setTestingMode(bool enabled)
>-{
>-    testingModeEnabled = enabled;
>-}
>-
>-bool TextChecker::isTestingMode()
>-{
>-    return testingModeEnabled;
>-}
>-
>-bool TextChecker::isContinuousSpellCheckingAllowed()
>-{
>-    return false;
>-}
>-
>-bool TextChecker::setContinuousSpellCheckingEnabled(bool)
>-{
>-    return false;
>-}
>-
>-void TextChecker::setGrammarCheckingEnabled(bool)
>-{
>-}
>-
>-void TextChecker::continuousSpellCheckingEnabledStateChanged(bool)
>-{
>-}
>-
>-void TextChecker::grammarCheckingEnabledStateChanged(bool)
>-{
>-}
>-
>-SpellDocumentTag TextChecker::uniqueSpellDocumentTag(WebPageProxy*)
>-{
>-    return { };
>-}
>-
>-void TextChecker::closeSpellDocumentWithTag(SpellDocumentTag)
>-{
>-}
>-
>-void TextChecker::checkSpellingOfString(SpellDocumentTag, StringView, int32_t&, int32_t&)
>-{
>-}
>-
>-void TextChecker::checkGrammarOfString(SpellDocumentTag, StringView /* text */, Vector<WebCore::GrammarDetail>& /* grammarDetails */, int32_t& /* badGrammarLocation */, int32_t& /* badGrammarLength */)
>-{
>-}
>-
>-bool TextChecker::spellingUIIsShowing()
>-{
>-    return false;
>-}
>-
>-void TextChecker::toggleSpellingUIIsShowing()
>-{
>-}
>-
>-void TextChecker::updateSpellingUIWithMisspelledWord(SpellDocumentTag, const String& /* misspelledWord */)
>-{
>-}
>-
>-void TextChecker::updateSpellingUIWithGrammarString(SpellDocumentTag, const String& /* badGrammarPhrase */, const GrammarDetail& /* grammarDetail */)
>-{
>-}
>-
>-void TextChecker::getGuessesForWord(SpellDocumentTag, const String&, const String& /* context */, int32_t /* insertionPoint */, Vector<String>&, bool)
>-{
>-}
>-
>-void TextChecker::learnWord(SpellDocumentTag, const String&)
>-{
>-}
>-
>-void TextChecker::ignoreWord(SpellDocumentTag, const String&)
>-{
>-}
>-
>-void TextChecker::requestCheckingOfString(Ref<TextCheckerCompletion>&&, int32_t)
>-{
>-}
>-
>-#if USE(UNIFIED_TEXT_CHECKING)
>-
>-Vector<TextCheckingResult> TextChecker::checkTextOfParagraph(SpellDocumentTag, StringView, int32_t, OptionSet<TextCheckingType>, bool)
>-{
>-    return { };
>-}
>-
>-#endif
>-
>-} // namespace WebKit
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index afbdc2575e44..9f2cd4a23e0d 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -1418,6 +1418,7 @@
> 		A1EA02381DABFF7E0096021F /* WKContextMenuListener.h in Headers */ = {isa = PBXBuildFile; fileRef = A1EA02361DABFF7E0096021F /* WKContextMenuListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A1EA02401DAC31DB0096021F /* WebContextMenuListenerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A1EA023E1DAC31DB0096021F /* WebContextMenuListenerProxy.h */; };
> 		A1FB68241F6E518200C43F9F /* WKCrashReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = A1FB68221F6E518200C43F9F /* WKCrashReporter.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		A38A12E123C93AC700FABFA9 /* TextChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextChecker.cpp; sourceTree = "<group>"; };
> 		A513F5402154A5D700662841 /* WebPageInspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = A513F53E2154A5CC00662841 /* WebPageInspectorController.h */; };
> 		A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = A518B5D01FE1D55B00F9FA28 /* WKInspectorWKWebView.h */; };
> 		A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */ = {isa = PBXBuildFile; fileRef = A54293A2195A43C6002782C7 /* WKInspectorNodeSearchGestureRecognizer.h */; };
>@@ -8322,6 +8323,7 @@
> 				515C415B207D74E100726E02 /* SuspendedPageProxy.h */,
> 				318A1F04204F4764003480BC /* SystemPreviewController.cpp */,
> 				3157135D2040A9B20084F9CF /* SystemPreviewController.h */,
>+				A38A12E123C93AC700FABFA9 /* TextChecker.cpp */,
> 				1AA417C912C00CCA002BE67B /* TextChecker.h */,
> 				53CFBBC62224D1B000266546 /* TextCheckerCompletion.cpp */,
> 				53CFBBC72224D1B000266546 /* TextCheckerCompletion.h */,

Flags:

ross.kirsling: review+
commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 205964: 387150 | 387153 | 387160 | 387540 | 387663 | 387665