Changeset 228338 in webkit

Timestamp:

Feb 9, 2018 2:13:00 PM (6 years ago)

Author:

pvollan@apple.com

Message:

Assert that NSApp is not running in the WebProcess.
​https://bugs.webkit.org/show_bug.cgi?id=182553

Reviewed by Simon Fraser.

In WebCore, there are a few places where NSApp is referenced. Since the WebContent process
is no longer using the NSApplication run loop, and NSApp is no longer guaranteed to be
valid, we should make sure that the NSApp is not referenced by the WebContent process or
the Network process, by asserting that the NSApplication event loop is running when NSApp
is referenced. It is still ok for the UIProcess to reference NSApp. Adding these assert
will help catch NSApp references when the NSApplication run loop is not used.

Also, do not post a fake mouse event in PasteBoard::setDragImage when the NSApplication
run loop is not running, since this is only relevant in WK1.

No new tests, covered by existing tests.

• page/mac/EventHandlerMac.mm:

(WebCore::lastEventIsMouseUp):
(WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):

• platform/mac/PasteboardMac.mm:

(WebCore::Pasteboard::setDragImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (2 diffs)
• platform/mac/PasteboardMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-09  Per Arne Vollan  <pvollan@apple.com>
+
+        Assert that NSApp is not running in the WebProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=182553
+
+        Reviewed by Simon Fraser.
+
+        In WebCore, there are a few places where NSApp is referenced. Since the WebContent process
+        is no longer using the NSApplication run loop, and NSApp is no longer guaranteed to be
+        valid, we should make sure that the NSApp is not referenced by the WebContent process or
+        the Network process, by asserting that the NSApplication event loop is running when NSApp
+        is referenced. It is still ok for the UIProcess to reference NSApp. Adding these assert
+        will help catch NSApp references when the NSApplication run loop is not used.
+
+        Also, do not post a fake mouse event in PasteBoard::setDragImage when the NSApplication
+        run loop is not running, since this is only relevant in WK1.
+
+        No new tests, covered by existing tests. 
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::lastEventIsMouseUp):
+        (WebCore::EventHandler::sendFakeEventsAfterWidgetTracking):
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::setDragImage):
+
 2018-02-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/page/mac/EventHandlerMac.mm

@@ -197 +197 @@
     // It's not clear in what cases this is helpful now -- it's possible it can be removed. 
 
+    ASSERT([NSApp isRunning]);
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     NSEvent *currentEventAfterHandlingMouseDown = [NSApp currentEvent];
@@ -571 +573 @@
     int eventType = [initiatingEvent type];
     if (eventType == NSEventTypeLeftMouseDown || eventType == NSEventTypeKeyDown) {
+        ASSERT([NSApp isRunning]);
         NSEvent *fakeEvent = nil;
         if (eventType == NSEventTypeLeftMouseDown) {

trunk/Source/WebCore/platform/mac/PasteboardMac.mm

@@ -659 +659 @@
     // Hack: We must post an event to wake up the NSDragManager, which is sitting in a nextEvent call
     // up the stack from us because the CoreFoundation drag manager does not use the run loop by itself.
-    // This is the most innocuous event to use, per Kristen Forster.
-    NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:NSZeroPoint
-        modifierFlags:0 timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:0 pressure:0];
-    [NSApp postEvent:event atStart:YES];
+    // This is the most innocuous event to use, per Kristin Forster.
+    // This is only relevant in WK1. Do not execute in the WebContent process, since it is now using
+    // NSRunLoop, and not the NSApplication run loop.
+    if ([NSApp isRunning]) {
+        NSEvent* event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:NSZeroPoint
+            modifierFlags:0 timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:0 pressure:0];
+        [NSApp postEvent:event atStart:YES];
+    }
 }
 #endif