Simplify macros in platform
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2018 22:12:42 +0000 (22:12 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2018 22:12:42 +0000 (22:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=191378

Reviewed by Michael Catanzaro.

No new tests. No change in behavior.

Modifies a few cases where a platform macro could be simplified.

* page/EventHandler.cpp:
* platform/network/DNS.h:
* platform/network/NetworkStateNotifier.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237944 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/EventHandler.cpp
Source/WebCore/platform/network/DNS.h
Source/WebCore/platform/network/NetworkStateNotifier.h

index 289c6d6..25e4a1a 100644 (file)
@@ -1,3 +1,18 @@
+2018-11-07  Don Olmstead  <don.olmstead@sony.com>
+
+        Simplify macros in platform
+        https://bugs.webkit.org/show_bug.cgi?id=191378
+
+        Reviewed by Michael Catanzaro.
+
+        No new tests. No change in behavior.
+
+        Modifies a few cases where a platform macro could be simplified.
+
+        * page/EventHandler.cpp:
+        * platform/network/DNS.h:
+        * platform/network/NetworkStateNotifier.h:
+
 2018-11-07  Simon Fraser  <simon.fraser@apple.com>
 
         Some WK1 repaint tests are flakey
 2018-11-07  Simon Fraser  <simon.fraser@apple.com>
 
         Some WK1 repaint tests are flakey
index 99b74bf..b80b768 100644 (file)
@@ -2640,7 +2640,7 @@ bool EventHandler::isInsideScrollbar(const IntPoint& windowPoint) const
     return false;
 }
 
     return false;
 }
 
-#if !PLATFORM(GTK) && !PLATFORM(WPE)
+#if !USE(GLIB)
 
 bool EventHandler::shouldSwapScrollDirection(const HitTestResult&, const PlatformWheelEvent&) const
 {
 
 bool EventHandler::shouldSwapScrollDirection(const HitTestResult&, const PlatformWheelEvent&) const
 {
index b6b5189..bae4a2d 100644 (file)
 
 #pragma once
 
 
 #pragma once
 
-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
-#include <netinet/in.h>
-#elif PLATFORM(WIN)
+#if OS(WINDOWS)
 #include <winsock2.h>
 #include <winsock2.h>
+#else
+#include <netinet/in.h>
 #endif
 
 #include <wtf/Forward.h>
 #endif
 
 #include <wtf/Forward.h>
index 3172fee..3fc2598 100644 (file)
@@ -67,7 +67,7 @@ private:
     static void CALLBACK addressChangeCallback(void*, BOOLEAN timedOut);
 #endif
 
     static void CALLBACK addressChangeCallback(void*, BOOLEAN timedOut);
 #endif
 
-#if PLATFORM(GTK) || PLATFORM(WPE)
+#if USE(GLIB)
     static void networkChangedCallback(NetworkStateNotifier*);
 #endif
 
     static void networkChangedCallback(NetworkStateNotifier*);
 #endif