Changeset 261966 in webkit

Timestamp:

May 20, 2020 3:33:59 PM (4 years ago)

Author:

Megan Gardner

Message:

Hide password echo when screen is being captured.
​https://bugs.webkit.org/show_bug.cgi?id=212060
<rdar://problem/47653578>

Reviewed by Wenson Hsieh.

Source/WebCore:

When the screen is being captured, turn off the password echo.

• editing/InsertIntoTextNodeCommand.cpp:

(WebCore::InsertIntoTextNodeCommand::doApply):

• page/EditorClient.h:

(WebCore::EditorClient::isScreenCaptured const):

Source/WebKit:

Use the UIScreen state and notification to determine if the
screen is being shared or captured. This flag is for all
capture methods, Air Play, Screen Recording, etc. If the screen is
being captured, turn off the password echo to prevent the password from
being leaked.

• UIProcess/WebPageProxy.h:
• UIProcess/ios/WKContentView.mm:

(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
(-[WKContentView _screenCapturedDidChange:]):

• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::setIsScreenCaptured):

• WebProcess/WebCoreSupport/WebEditorClient.h:
• WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm:

(WebKit::WebEditorClient::isScreenCaptured const):

• WebProcess/WebPage/WebPage.h:

(WebKit::WebPage::isScreenCaptured const):

• WebProcess/WebPage/WebPage.messages.in:
• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::setIsScreenCaptured):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/InsertIntoTextNodeCommand.cpp (modified) (3 diffs)
• WebCore/page/EditorClient.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• WebKit/Shared/WebPageCreationParameters.h (modified) (1 diff)
• WebKit/UIProcess/WebPageProxy.h (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentView.mm (modified) (3 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebKit/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• WebKit/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm (modified) (1 diff)
• WebKit/WebProcess/WebPage/WebPage.h (modified) (3 diffs)
• WebKit/WebProcess/WebPage/WebPage.messages.in (modified) (1 diff)
• WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• WebKitLegacy/ios/DefaultDelegates/WebDefaultUIKitDelegate.m (modified) (1 diff)
• WebKitLegacy/ios/WebView/WebUIKitDelegate.h (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebView.mm (modified) (1 diff)
• WebKitLegacy/mac/WebView/WebViewData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-05-20  Megan Gardner  <megan_gardner@apple.com>
+
+        Hide password echo when screen is being captured.
+        https://bugs.webkit.org/show_bug.cgi?id=212060
+        <rdar://problem/47653578>
+
+        Reviewed by Wenson Hsieh.
+
+        When the screen is being captured, turn off the password echo. 
+
+        * editing/InsertIntoTextNodeCommand.cpp:
+        (WebCore::InsertIntoTextNodeCommand::doApply):
+        * page/EditorClient.h:
+        (WebCore::EditorClient::isScreenCaptured const):
+
 2020-05-20  ChangSeok Oh  <changseok@webkit.org>
 

trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp

@@ -28 +28 @@
 
 #include "Document.h"
+#include "Editor.h"
+#include "EditorClient.h"
 #include "Frame.h"
 #include "RenderText.h"
@@ -52 +54 @@
 {
     bool passwordEchoEnabled = document().settings().passwordEchoEnabled();
-    if (passwordEchoEnabled)
+    bool shouldSuppressPasswordEcho = document().editor().client()->shouldSuppressPasswordEcho();
+    if (passwordEchoEnabled && !shouldSuppressPasswordEcho)
         document().updateLayoutIgnorePendingStylesheets();
 
@@ -58 +61 @@
         return;
 
-    if (passwordEchoEnabled) {
+    if (passwordEchoEnabled && !shouldSuppressPasswordEcho) {
         if (RenderText* renderText = m_node->renderer())
             renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.length());

trunk/Source/WebCore/page/EditorClient.h

@@ -72 +72 @@
     virtual bool shouldChangeSelectedRange(Range* fromRange, Range* toRange, EAffinity, bool stillSelecting) = 0;
     virtual bool shouldRevealCurrentSelectionAfterInsertion() const { return true; };
+    virtual bool shouldSuppressPasswordEcho() const { return false; };
     
     virtual bool shouldApplyStyle(StyleProperties*, Range*) = 0;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-20  Megan Gardner  <megan_gardner@apple.com>
+
+        Hide password echo when screen is being captured.
+        https://bugs.webkit.org/show_bug.cgi?id=212060
+        <rdar://problem/47653578>
+
+        Reviewed by Wenson Hsieh.
+
+        Use the UIScreen state and notification to determine if the
+        screen is being shared or captured. This flag is for all
+        capture methods, Air Play, Screen Recording, etc. If the screen is
+        being captured, turn off the password echo to prevent the password from
+        being leaked.
+
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+        (-[WKContentView _screenCapturedDidChange:]):
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::setIsScreenCaptured):
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+        * WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm:
+        (WebKit::WebEditorClient::isScreenCaptured const):
+        * WebProcess/WebPage/WebPage.h:
+        (WebKit::WebPage::isScreenCaptured const):
+        * WebProcess/WebPage/WebPage.messages.in:
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::setIsScreenCaptured):
+
 2020-05-20  ChangSeok Oh  <changseok@webkit.org>
 

trunk/Source/WebKit/Shared/WebPageCreationParameters.cpp

@@ -108 +108 @@
     encoder << keyboardIsAttached;
     encoder << canShowWhileLocked;
+    encoder << isCapturingScreen;
 #endif
 #if PLATFORM(COCOA)
@@ -341 +342 @@
     if (!decoder.decode(parameters.canShowWhileLocked))
         return WTF::nullopt;
+    if (!decoder.decode(parameters.isCapturingScreen))
+        return WTF::nullopt;
 #endif
 

trunk/Source/WebKit/Shared/WebPageCreationParameters.h

@@ -168 +168 @@
     bool keyboardIsAttached { false };
     bool canShowWhileLocked { false };
+    bool isCapturingScreen { false };
 #endif
 #if PLATFORM(COCOA)

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -719 +719 @@
 
     void setShouldRevealCurrentSelectionAfterInsertion(bool);
+        
+    void setScreenIsBeingCaptured(bool);
 
     void insertTextPlaceholder(const WebCore::IntSize&, CompletionHandler<void(const Optional<WebCore::ElementContext>&)>&&);

trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

@@ -170 +170 @@
     _page->setUseFixedLayout(true);
     _page->setDelegatesScrolling(true);
+    _page->setScreenIsBeingCaptured([[[self window] screen] isCaptured]);
 
 #if ENABLE(FULLSCREEN_API)
@@ -209 +210 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:[UIApplication sharedApplication]];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:[UIApplication sharedApplication]];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_screenCapturedDidChange:) name:UIScreenCapturedDidChangeNotification object:[UIScreen mainScreen]];
 
 #if USE(UIKIT_KEYBOARD_ADDITIONS)
@@ -772 +774 @@
 }
 
+- (void)_screenCapturedDidChange:(NSNotification *)notification
+{
+    _page->setScreenIsBeingCaptured([[[self window] screen] isCaptured]);
+}
+
 @end
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -897 +897 @@
 
     _page->process().updateTextCheckerState();
+    _page->setScreenIsBeingCaptured([[[self window] screen] isCaptured]);
 
     _hasSetUpInteractions = YES;

trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

@@ -1582 +1582 @@
 }
 
+void WebPageProxy::setScreenIsBeingCaptured(bool captured)
+{
+    if (hasRunningProcess())
+        send(Messages::WebPage::SetScreenIsBeingCaptured(captured));
+}
+
 void WebPageProxy::willOpenAppLink()
 {

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebEditorClient.h

@@ -189 +189 @@
     bool shouldAllowSingleClickToChangeSelection(WebCore::Node&, const WebCore::VisibleSelection&) const final;
     bool shouldRevealCurrentSelectionAfterInsertion() const final;
+    bool shouldSuppressPasswordEcho() const final;
 #endif
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm

@@ -120 +120 @@
 }
 
+bool WebEditorClient::shouldSuppressPasswordEcho() const
+{
+    return m_page->screenIsBeingCaptured() || m_page->hardwareKeyboardIsAttached();
+}
+
 } // namespace WebKit
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.h

@@ -668 +668 @@
     int32_t deviceOrientation() const { return m_deviceOrientation; }
     void didReceiveMobileDocType(bool);
+    
+    bool screenIsBeingCaptured() const { return m_screenIsBeingCaptured; }
+    void setScreenIsBeingCaptured(bool);
 
     double minimumPageScaleFactor() const;
@@ -1017 +1020 @@
 
     void hardwareKeyboardAvailabilityChanged(bool keyboardIsAttached);
+    bool hardwareKeyboardIsAttached() const { return m_keyboardIsAttached; }
 
     void updateStringForFind(const String&);
@@ -1991 +1995 @@
     bool m_isInStableState { true };
     bool m_shouldRevealCurrentSelectionAfterInsertion { true };
+    bool m_screenIsBeingCaptured { false };
     MonotonicTime m_oldestNonStableUpdateVisibleContentRectsTimestamp;
     Seconds m_estimatedLatency { 0 };

trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in

@@ -53 +53 @@
     SetOverrideViewportArguments(Optional<WebCore::ViewportArguments> arguments)
     DynamicViewportSizeUpdate(WebCore::FloatSize viewLayoutSize, WebCore::FloatSize maximumUnobscuredSize, WebCore::FloatRect targetExposedContentRect, WebCore::FloatRect targetUnobscuredRect, WebCore::FloatRect targetUnobscuredRectInScrollViewCoordinates, WebCore::RectEdges<float> targetUnobscuredSafeAreaInsets, double scale, int32_t deviceOrientation, double minimumEffectiveDeviceWidth, uint64_t dynamicViewportSizeUpdateID)
+    
+    SetScreenIsBeingCaptured(bool captured)
 
     HandleTap(WebCore::IntPoint point, OptionSet<WebKit::WebEvent::Modifier> modifiers, WebKit::TransactionID lastLayerTreeTransactionId)

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -4293 +4293 @@
 }
 
+void WebPage::setScreenIsBeingCaptured(bool captured)
+{
+    m_screenIsBeingCaptured = captured;
+}
+
 void WebPage::textInputContextsInRect(FloatRect searchRect, CompletionHandler<void(const Vector<ElementContext>&)>&& completionHandler)
 {

trunk/Source/WebKitLegacy/ios/DefaultDelegates/WebDefaultUIKitDelegate.m

@@ -269 +269 @@
 #endif
 
+- (BOOL)shouldSuppressPasswordEcho
+{
+    return NO;
+}
+
 - (BOOL)hasRichlyEditableSelection
 {

trunk/Source/WebKitLegacy/ios/WebView/WebUIKitDelegate.h

@@ -129 +129 @@
 - (BOOL)shouldRevealCurrentSelectionAfterInsertion;
 
+- (BOOL)shouldSuppressPasswordEcho;
+
 #if ENABLE_ORIENTATION_EVENTS
 - (int)deviceOrientation;

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h

@@ -150 +150 @@
     bool performsTwoStepPaste(WebCore::DocumentFragment*) final;
     void updateStringForFind(const String&) final { }
-
     bool shouldRevealCurrentSelectionAfterInsertion() const final;
+    bool shouldSuppressPasswordEcho() const final;
 #endif
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm

@@ -829 +829 @@
         return [[m_webView _UIKitDelegateForwarder] shouldRevealCurrentSelectionAfterInsertion];
     return true;
+}
+
+bool WebEditorClient::shouldSuppressPasswordEcho() const
+{
+    if ([[m_webView _UIKitDelegateForwarder] respondsToSelector:@selector(shouldSuppressPasswordEcho)])
+        return [[m_webView _UIKitDelegateForwarder] shouldSuppressPasswordEcho];
+    return false;
 }
 

trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

@@ -1526 +1526 @@
     _private->deviceOrientation = [[self _UIKitDelegateForwarder] deviceOrientation];
 #endif
+    if ([[self _UIKitDelegateForwarder] respondsToSelector:@selector(shouldSuppressPasswordEcho)])
+        _private->shouldSuppressPasswordEcho = [[self _UIKitDelegateForwarder] shouldSuppressPasswordEcho];
 #endif
 

trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h

@@ -246 +246 @@
     NSUInteger deviceOrientation;
 #endif
+    BOOL shouldSuppressPasswordEcho;
 #endif
     BOOL shouldCloseWithWindow;