Title: [261098] trunk/Source
- Revision
- 261098
- Author
- [email protected]
- Date
- 2020-05-04 12:18:10 -0700 (Mon, 04 May 2020)
Log Message
Remove now-unneded HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
https://bugs.webkit.org/show_bug.cgi?id=211380
Reviewed by Sam Weinig.
Source/WebKit:
* UIProcess/mac/WindowServerConnection.h: Don't check
HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS) in this Mac-only header.
Also removed #pragma once in this header that is only included from .mm files.
* UIProcess/mac/WindowServerConnection.mm: Wrapped the whole file in
PLATFORM(MAC) because this is macOS-specific code that may be compiled on
iOS family platforms. Could wrap it in HAVE(WINDOW_SERVER) instead, but we
don't have anything like that and PageClientImplMac.mm, the client of this
code, uses PLATFORM(MAC).
(WebKit::registerOcclusionNotificationHandler): Ditto.
(WebKit::WindowServerConnection::WindowServerConnection): Ditto.
Source/WTF:
* wtf/PlatformHave.h: Don't define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (261097 => 261098)
--- trunk/Source/WTF/ChangeLog 2020-05-04 19:04:25 UTC (rev 261097)
+++ trunk/Source/WTF/ChangeLog 2020-05-04 19:18:10 UTC (rev 261098)
@@ -1,5 +1,14 @@
2020-05-04 Darin Adler <[email protected]>
+ Remove now-unneded HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
+ https://bugs.webkit.org/show_bug.cgi?id=211380
+
+ Reviewed by Sam Weinig.
+
+ * wtf/PlatformHave.h: Don't define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS.
+
+2020-05-04 Darin Adler <[email protected]>
+
Remove unused USE(COREAUDIO)
https://bugs.webkit.org/show_bug.cgi?id=211384
Modified: trunk/Source/WTF/wtf/PlatformHave.h (261097 => 261098)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 19:04:25 UTC (rev 261097)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-05-04 19:18:10 UTC (rev 261098)
@@ -387,10 +387,6 @@
#define HAVE_FUNC_USLEEP 1
#endif
-#if PLATFORM(MAC)
-#define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
-#endif
-
#if PLATFORM(COCOA)
#define HAVE_SEC_ACCESS_CONTROL 1
#endif
Modified: trunk/Source/WebKit/ChangeLog (261097 => 261098)
--- trunk/Source/WebKit/ChangeLog 2020-05-04 19:04:25 UTC (rev 261097)
+++ trunk/Source/WebKit/ChangeLog 2020-05-04 19:18:10 UTC (rev 261098)
@@ -1,5 +1,24 @@
2020-05-04 Darin Adler <[email protected]>
+ Remove now-unneded HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
+ https://bugs.webkit.org/show_bug.cgi?id=211380
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/mac/WindowServerConnection.h: Don't check
+ HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS) in this Mac-only header.
+ Also removed #pragma once in this header that is only included from .mm files.
+
+ * UIProcess/mac/WindowServerConnection.mm: Wrapped the whole file in
+ PLATFORM(MAC) because this is macOS-specific code that may be compiled on
+ iOS family platforms. Could wrap it in HAVE(WINDOW_SERVER) instead, but we
+ don't have anything like that and PageClientImplMac.mm, the client of this
+ code, uses PLATFORM(MAC).
+ (WebKit::registerOcclusionNotificationHandler): Ditto.
+ (WebKit::WindowServerConnection::WindowServerConnection): Ditto.
+
+2020-05-04 Darin Adler <[email protected]>
+
Remove now-unneeded HAVE(UI_REMOTE_VIEW)
https://bugs.webkit.org/show_bug.cgi?id=211382
Modified: trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.h (261097 => 261098)
--- trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.h 2020-05-04 19:04:25 UTC (rev 261097)
+++ trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.h 2020-05-04 19:18:10 UTC (rev 261098)
@@ -23,8 +23,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma once
-
namespace WebKit {
class WindowServerConnection {
@@ -36,11 +34,8 @@
private:
WindowServerConnection();
-#if HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
void windowServerConnectionStateChanged();
-
void applicationWindowModificationsStopped(bool stopped);
-#endif
bool m_applicationWindowModificationsHaveStopped;
};
Modified: trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm (261097 => 261098)
--- trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm 2020-05-04 19:04:25 UTC (rev 261097)
+++ trunk/Source/WebKit/UIProcess/mac/WindowServerConnection.mm 2020-05-04 19:18:10 UTC (rev 261098)
@@ -26,13 +26,13 @@
#import "config.h"
#import "WindowServerConnection.h"
+#if PLATFORM(MAC)
+
#import "WebProcessPool.h"
#import <pal/spi/cg/CoreGraphicsSPI.h>
namespace WebKit {
-#if HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
-
void WindowServerConnection::applicationWindowModificationsStopped(bool stopped)
{
if (m_applicationWindowModificationsHaveStopped == stopped)
@@ -47,8 +47,6 @@
processPool->windowServerConnectionStateChanged();
}
-#endif
-
WindowServerConnection& WindowServerConnection::singleton()
{
static WindowServerConnection& windowServerConnection = *new WindowServerConnection;
@@ -55,7 +53,6 @@
return windowServerConnection;
}
-#if HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
static bool registerOcclusionNotificationHandler(CGSNotificationType type, CGSNotifyConnectionProcPtr handler)
{
CGSConnectionID mainConnection = CGSMainConnectionID();
@@ -70,12 +67,10 @@
return CGSRegisterConnectionNotifyProc(mainConnection, handler, type, nullptr) == kCGErrorSuccess;
}
-#endif
WindowServerConnection::WindowServerConnection()
: m_applicationWindowModificationsHaveStopped(false)
{
-#if HAVE(WINDOW_SERVER_OCCLUSION_NOTIFICATIONS)
struct OcclusionNotificationHandler {
CGSNotificationType notificationType;
CGSNotifyConnectionProcPtr handler;
@@ -100,8 +95,8 @@
UNUSED_PARAM(result);
ASSERT_WITH_MESSAGE(result, "Registration of \"%s\" notification handler failed.\n", occlusionNotificationHandler.name);
}
-#endif
}
} // namespace WebKit
+#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
