Changeset 201485 in webkit

Timestamp:

May 28, 2016, 9:55:38 AM (9 years ago)

Author:

Konstantin Tokarev

Message:

Use COMPILER(MSVC) instead of PLATFORM(WIN) for MSVC-specific workaround
​https://bugs.webkit.org/show_bug.cgi?id=158169

Reviewed by NOBODY (OOPS!).

No new tests needed.

• platform/PlatformMouseEvent.h:
• platform/win/PlatformMouseEventWin.cpp: Moved operators'

implementations to PlatformMouseEvent.h

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PlatformMouseEvent.h (modified) (1 diff)
• platform/win/PlatformMouseEventWin.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2016-05-28  Konstantin Tokarev  <annulen@yandex.ru>
+
+        Use COMPILER(MSVC) instead of PLATFORM(WIN) for MSVC-specific workaround
+        https://bugs.webkit.org/show_bug.cgi?id=158169
+
+        Reviewed by Darin Adler.
+
+        No new tests needed.
+
+        * platform/PlatformMouseEvent.h:
+        * platform/win/PlatformMouseEventWin.cpp: Moved operators'
+        implementations to PlatformMouseEvent.h
+
 2016-05-27  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/PlatformMouseEvent.h ¶

@@ -139 +139 @@
     };
 
-#if PLATFORM(WIN)
-    // These methods are necessary to work around the fact that MSVC will not find a most-specific
+#if COMPILER(MSVC)
+    // These functions are necessary to work around the fact that MSVC will not find a most-specific
     // operator== to use after implicitly converting MouseButton to an unsigned short.
-    bool operator==(unsigned short a, MouseButton b);
-    bool operator!=(unsigned short a, MouseButton b);
+    inline bool operator==(unsigned short a, MouseButton b)
+    {
+        return a == static_cast<unsigned short>(b);
+    }
+
+    inline bool operator!=(unsigned short a, MouseButton b)
+    {
+        return a != static_cast<unsigned short>(b);
+    }
 #endif
 

trunk/Source/WebCore/platform/win/PlatformMouseEventWin.cpp ¶

@@ -123 +123 @@
 }
 
-bool operator==(unsigned short a, MouseButton b)
-{
-    return a == static_cast<unsigned short>(b);
-}
-
-bool operator!=(unsigned short a, MouseButton b)
-{
-    return a != static_cast<unsigned short>(b);
-}
-
 } // namespace WebCore