Title: [295103] trunk/Source/WebKit
- Revision
- 295103
- Author
- [email protected]
- Date
- 2022-06-01 13:17:33 -0700 (Wed, 01 Jun 2022)
Log Message
Avoid triggering image analysis when the user has disabled Live Text
https://bugs.webkit.org/show_bug.cgi?id=241193
Reviewed by Aditya Keerthi.
* Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.h:
* Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.mm:
(WebKit::canStartImageAnalysis):
* Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _startImageAnalysis:target:]):
Canonical link: https://commits.webkit.org/251198@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.h (295102 => 295103)
--- trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.h 2022-06-01 20:15:53 UTC (rev 295102)
+++ trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.h 2022-06-01 20:17:33 UTC (rev 295103)
@@ -53,6 +53,7 @@
bool textRecognitionEnhancementsSystemFeatureEnabled();
bool imageAnalysisQueueSystemFeatureEnabled();
bool isImageAnalysisMarkupSystemFeatureEnabled();
+bool canStartImageAnalysis(NSString *);
WebCore::TextRecognitionResult makeTextRecognitionResult(CocoaImageAnalysis *);
Modified: trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.mm (295102 => 295103)
--- trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.mm 2022-06-01 20:15:53 UTC (rev 295102)
+++ trunk/Source/WebKit/Platform/cocoa/ImageAnalysisUtilities.mm 2022-06-01 20:17:33 UTC (rev 295103)
@@ -145,6 +145,11 @@
#include <WebKitAdditions/ImageAnalysisUtilitiesAdditions.mm>
#else
+bool canStartImageAnalysis(NSString *)
+{
+ return true;
+}
+
bool textRecognitionEnhancementsSystemFeatureEnabled()
{
#if ENABLE(IMAGE_ANALYSIS_ENHANCEMENTS)
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (295102 => 295103)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-06-01 20:15:53 UTC (rev 295102)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2022-06-01 20:17:33 UTC (rev 295103)
@@ -39,6 +39,7 @@
#import "FullscreenClient.h"
#import "GlobalFindInPageState.h"
#import "IconLoadingDelegate.h"
+#import "ImageAnalysisUtilities.h"
#import "LegacySessionStateCoding.h"
#import "Logging.h"
#import "MediaUtilities.h"
@@ -2328,7 +2329,7 @@
#if ENABLE(IMAGE_ANALYSIS)
THROW_IF_SUSPENDED;
- if (!_page || !_page->preferences().imageAnalysisQueueEnabled())
+ if (!_page || !_page->preferences().imageAnalysisQueueEnabled() || !WebKit::canStartImageAnalysis(source))
return;
_page->startImageAnalysis(source, target);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
