Title: [239453] trunk
- Revision
- 239453
- Author
- [email protected]
- Date
- 2018-12-20 10:32:38 -0800 (Thu, 20 Dec 2018)
Log Message
Unreviewed, rolling out r239417.
Introduced two API test failures on macOS.
Reverted changeset:
"<rdar://problem/46194315> macOS: WebKit1 does not handle
occlusion changes"
https://bugs.webkit.org/show_bug.cgi?id=192821
https://trac.webkit.org/changeset/239417
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239452 => 239453)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-12-20 18:32:38 UTC (rev 239453)
@@ -1,3 +1,16 @@
+2018-12-20 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r239417.
+
+ Introduced two API test failures on macOS.
+
+ Reverted changeset:
+
+ "<rdar://problem/46194315> macOS: WebKit1 does not handle
+ occlusion changes"
+ https://bugs.webkit.org/show_bug.cgi?id=192821
+ https://trac.webkit.org/changeset/239417
+
2018-12-20 Brent Fulgham <[email protected]>
WKWebView default UA doesn't freeze the build number
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (239452 => 239453)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-12-20 18:32:38 UTC (rev 239453)
@@ -4671,21 +4671,15 @@
- (BOOL)_isViewVisible
{
- NSWindow *window = [self window];
- if (!window)
+ if (![self window])
return false;
- if (![window isVisible])
+ if (![[self window] isVisible])
return false;
if ([self isHiddenOrHasHiddenAncestor])
return false;
-#if !PLATFORM(IOS_FAMILY)
- if (_private->windowOcclusionDetectionEnabled && (window.occlusionState & NSWindowOcclusionStateVisible) != NSWindowOcclusionStateVisible)
- return false;
-#endif
-
return true;
}
@@ -5074,18 +5068,6 @@
}
}
-#if !PLATFORM(IOS_FAMILY)
-- (BOOL)windowOcclusionDetectionEnabled
-{
- return _private->windowOcclusionDetectionEnabled;
-}
-
-- (void)setWindowOcclusionDetectionEnabled:(BOOL)flag
-{
- _private->windowOcclusionDetectionEnabled = flag;
-}
-#endif
-
- (void)_setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns
{
Page* page = core(self);
@@ -6021,26 +6003,22 @@
- (void)addWindowObserversForWindow:(NSWindow *)window
{
if (window) {
- NSNotificationCenter *defaultNotificationCenter = [NSNotificationCenter defaultCenter];
-
- [defaultNotificationCenter addObserver:self selector:@selector(windowKeyStateChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowKeyStateChanged:)
name:NSWindowDidBecomeKeyNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(windowKeyStateChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowKeyStateChanged:)
name:NSWindowDidResignKeyNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowWillOrderOnScreen:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowWillOrderOnScreen:)
name:NSWindowWillOrderOnScreenNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowWillOrderOffScreen:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowWillOrderOffScreen:)
name:NSWindowWillOrderOffScreenNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeBackingProperties:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeBackingProperties:)
name:windowDidChangeBackingPropertiesNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeScreen:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidChangeScreen:)
name:NSWindowDidChangeScreenNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowVisibilityChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowVisibilityChanged:)
name:NSWindowDidMiniaturizeNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowVisibilityChanged:)
+ [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowVisibilityChanged:)
name:NSWindowDidDeminiaturizeNotification object:window];
- [defaultNotificationCenter addObserver:self selector:@selector(_windowDidChangeOcclusionState:)
- name:NSWindowDidChangeOcclusionStateNotification object:window];
[_private->windowVisibilityObserver startObserving:window];
}
}
@@ -6049,26 +6027,22 @@
{
NSWindow *window = [self window];
if (window) {
- NSNotificationCenter *defaultNotificationCenter = [NSNotificationCenter defaultCenter];
-
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowDidBecomeKeyNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowDidResignKeyNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowWillOrderOnScreenNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowWillOrderOffScreenNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:windowDidChangeBackingPropertiesNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowDidChangeScreenNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowDidMiniaturizeNotification object:window];
- [defaultNotificationCenter removeObserver:self
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:NSWindowDidDeminiaturizeNotification object:window];
- [defaultNotificationCenter removeObserver:self
- name:NSWindowDidChangeOcclusionStateNotification object:window];
[_private->windowVisibilityObserver stopObserving:window];
}
}
@@ -6219,12 +6193,6 @@
_private->page->setDeviceScaleFactor(newBackingScaleFactor);
}
-
-- (void)_windowDidChangeOcclusionState:(NSNotification *)notification
-{
- [self _updateVisibilityState];
-}
-
#else
- (void)_wakWindowScreenScaleChanged:(NSNotification *)notification
{
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h (239452 => 239453)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h 2018-12-20 18:32:38 UTC (rev 239453)
@@ -211,7 +211,6 @@
std::unique_ptr<WebCore::TextIndicatorWindow> textIndicatorWindow;
BOOL hasInitializedLookupObserver;
RetainPtr<WebWindowVisibilityObserver> windowVisibilityObserver;
- BOOL windowOcclusionDetectionEnabled;
RetainPtr<NSEvent> pressureEvent;
#endif // PLATFORM(MAC)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm (239452 => 239453)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewData.mm 2018-12-20 18:32:38 UTC (rev 239453)
@@ -183,10 +183,6 @@
usesPageCache = YES;
shouldUpdateWhileOffscreen = YES;
-#if !PLATFORM(IOS_FAMILY)
- windowOcclusionDetectionEnabled = YES;
-#endif
-
zoomMultiplier = 1;
zoomsTextOnly = NO;
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (239452 => 239453)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2018-12-20 18:32:38 UTC (rev 239453)
@@ -852,11 +852,6 @@
- (WebPageVisibilityState)_visibilityState;
- (void)_setVisibilityState:(WebPageVisibilityState)visibilityState isInitialState:(BOOL)isInitialState;
-#if !TARGET_OS_IPHONE
-- (BOOL)windowOcclusionDetectionEnabled;
-- (void)setWindowOcclusionDetectionEnabled:(BOOL)flag;
-#endif
-
// Whether the column-break-{before,after} properties are respected instead of the
// page-break-{before,after} properties.
- (void)_setPaginationBehavesLikeColumns:(BOOL)behavesLikeColumns;
Modified: trunk/Tools/ChangeLog (239452 => 239453)
--- trunk/Tools/ChangeLog 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Tools/ChangeLog 2018-12-20 18:32:38 UTC (rev 239453)
@@ -1,3 +1,16 @@
+2018-12-20 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r239417.
+
+ Introduced two API test failures on macOS.
+
+ Reverted changeset:
+
+ "<rdar://problem/46194315> macOS: WebKit1 does not handle
+ occlusion changes"
+ https://bugs.webkit.org/show_bug.cgi?id=192821
+ https://trac.webkit.org/changeset/239417
+
2018-12-20 Devin Rousso <[email protected]>
Web Inspector: UIString should take an optional key and description to aid localization
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (239452 => 239453)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2018-12-20 18:29:45 UTC (rev 239452)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2018-12-20 18:32:38 UTC (rev 239453)
@@ -724,7 +724,6 @@
[WebView registerURLSchemeAsLocal:@"feedsearch"];
#if PLATFORM(MAC)
- [webView setWindowOcclusionDetectionEnabled:NO];
[WebView _setFontWhitelist:fontWhitelist()];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
