Title: [228254] trunk/Source/WebCore
- Revision
- 228254
- Author
- [email protected]
- Date
- 2018-02-07 18:25:37 -0800 (Wed, 07 Feb 2018)
Log Message
Unreviewed, rolling out r228243.
Introduced an assertion failure with API test
FullscreenZoomInitialFrame.WebKit
Reverted changeset:
"Assert that NSApp is not running in the WebProcess."
https://bugs.webkit.org/show_bug.cgi?id=182553
https://trac.webkit.org/changeset/228243
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (228253 => 228254)
--- trunk/Source/WebCore/ChangeLog 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/ChangeLog 2018-02-08 02:25:37 UTC (rev 228254)
@@ -1,3 +1,16 @@
+2018-02-07 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r228243.
+
+ Introduced an assertion failure with API test
+ FullscreenZoomInitialFrame.WebKit
+
+ Reverted changeset:
+
+ "Assert that NSApp is not running in the WebProcess."
+ https://bugs.webkit.org/show_bug.cgi?id=182553
+ https://trac.webkit.org/changeset/228243
+
2018-02-07 Christopher Reid <[email protected]>
[Curl] Cookie Database has some warnings when compiled in clang
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (228253 => 228254)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2018-02-08 02:25:37 UTC (rev 228254)
@@ -196,8 +196,6 @@
// that state. Handling this was critical when we used AppKit widgets for form elements.
// 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];
return EventHandler::currentNSEvent() != currentEventAfterHandlingMouseDown
@@ -572,7 +570,6 @@
m_sendingEventToSubview = false;
int eventType = [initiatingEvent type];
if (eventType == NSEventTypeLeftMouseDown || eventType == NSEventTypeKeyDown) {
- ASSERT([NSApp isRunning]);
NSEvent *fakeEvent = nil;
if (eventType == NSEventTypeLeftMouseDown) {
fakeEvent = [NSEvent mouseEventWithType:NSEventTypeLeftMouseUp
Modified: trunk/Source/WebCore/platform/mac/EventLoopMac.mm (228253 => 228254)
--- trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/platform/mac/EventLoopMac.mm 2018-02-08 02:25:37 UTC (rev 228254)
@@ -36,7 +36,6 @@
return;
}
#endif
- ASSERT([NSApp isRunning]);
[NSApp setWindowsNeedUpdate:YES];
if (NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES])
[NSApp sendEvent:event];
Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (228253 => 228254)
--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2018-02-08 02:25:37 UTC (rev 228254)
@@ -658,15 +658,10 @@
// 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 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];
- ASSERT([NSApp isRunning]);
- [NSApp postEvent:event atStart:YES];
- }
+ // 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];
}
#endif
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (228253 => 228254)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2018-02-08 02:25:37 UTC (rev 228254)
@@ -109,8 +109,6 @@
[(NSView*)[window contentView] setLayer:[CALayer layer]];
[[window contentView] setWantsLayer:YES];
- ASSERT([NSApp isRunning]);
-
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
}
@@ -340,7 +338,6 @@
options |= NSApplicationPresentationAutoHideDock;
}
- ASSERT([NSApp isRunning]);
NSApp.presentationOptions = options;
}
Modified: trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm (228253 => 228254)
--- trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2018-02-08 01:27:04 UTC (rev 228253)
+++ trunk/Source/WebCore/platform/mac/WebWindowAnimation.mm 2018-02-08 02:25:37 UTC (rev 228254)
@@ -38,7 +38,6 @@
static NSTimeInterval WebWindowAnimationDurationFromDuration(NSTimeInterval duration)
{
- ASSERT([NSApp isRunning]);
return ([[NSApp currentEvent] modifierFlags] & NSEventModifierFlagShift) ? duration * slowMotionFactor : duration;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
