Title: [157643] trunk/Source/WebKit2
- Revision
- 157643
- Author
- [email protected]
- Date
- 2013-10-18 12:17:25 -0700 (Fri, 18 Oct 2013)
Log Message
Remove some Windows specific code from WebKit2
https://bugs.webkit.org/show_bug.cgi?id=123034
Reviewed by Beth Dakin.
* Platform/PlatformProcessIdentifier.h:
* Shared/API/c/WKDeclarationSpecifiers.h:
* UIProcess/API/C/WKNativeEvent.h:
* UIProcess/API/C/WKPreferencesPrivate.h:
* config.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (157642 => 157643)
--- trunk/Source/WebKit2/ChangeLog 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/ChangeLog 2013-10-18 19:17:25 UTC (rev 157643)
@@ -1,3 +1,16 @@
+2013-10-18 Anders Carlsson <[email protected]>
+
+ Remove some Windows specific code from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=123034
+
+ Reviewed by Beth Dakin.
+
+ * Platform/PlatformProcessIdentifier.h:
+ * Shared/API/c/WKDeclarationSpecifiers.h:
+ * UIProcess/API/C/WKNativeEvent.h:
+ * UIProcess/API/C/WKPreferencesPrivate.h:
+ * config.h:
+
2013-10-18 Dan Bernstein <[email protected]>
Removed the __MAC_OS_X_VERSION_MIN_REQUIRED condition from the definition of WK_API_ENABLED.
Modified: trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h (157642 => 157643)
--- trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/Platform/PlatformProcessIdentifier.h 2013-10-18 19:17:25 UTC (rev 157643)
@@ -36,12 +36,7 @@
#if PLATFORM(MAC)
typedef pid_t PlatformProcessIdentifier;
#elif PLATFORM(GTK)
-#ifdef G_OS_WIN32
-typedef void* GPid;
-#else
-typedef int GPid;
-#endif
-typedef GPid PlatformProcessIdentifier;
+typedef int PlatformProcessIdentifier;
#elif PLATFORM(EFL)
typedef pid_t PlatformProcessIdentifier;
#endif
Modified: trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (157642 => 157643)
--- trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2013-10-18 19:17:25 UTC (rev 157643)
@@ -32,12 +32,6 @@
#define WK_EXPORT
#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
#define WK_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
-#if BUILDING_WEBKIT
-#define WK_EXPORT __declspec(dllexport)
-#else
-#define WK_EXPORT __declspec(dllimport)
-#endif
#else /* !defined(WK_NO_EXPORT) */
#define WK_EXPORT
#endif /* defined(WK_NO_EXPORT) */
@@ -47,8 +41,6 @@
#define WK_INLINE static inline
#elif defined(__GNUC__)
#define WK_INLINE static __inline__
-#elif defined(__WIN32__)
-#define WK_INLINE static __inline
#else
#define WK_INLINE static
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h (157642 => 157643)
--- trunk/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNativeEvent.h 2013-10-18 19:17:25 UTC (rev 157643)
@@ -39,8 +39,6 @@
struct NSEvent;
#endif
typedef NSEvent *WKNativeEventPtr;
-#elif defined(WIN32) || defined(_WIN32)
-typedef const struct tagMSG* WKNativeEventPtr;
#elif defined(BUILDING_GTK__)
typedef union _GdkEvent GdkEvent;
typedef const GdkEvent* WKNativeEventPtr;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h (157642 => 157643)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h 2013-10-18 19:17:25 UTC (rev 157643)
@@ -37,9 +37,6 @@
kWKFontSmoothingLevelLight = 1,
kWKFontSmoothingLevelMedium = 2,
kWKFontSmoothingLevelStrong = 3,
-#if defined(WIN32) || defined(_WIN32)
- kWKFontSmoothingLevelWindows = 4,
-#endif
};
typedef enum WKFontSmoothingLevel WKFontSmoothingLevel;
@@ -55,7 +52,7 @@
// Creates a copy with no identifier.
WK_EXPORT WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef);
-// Defaults to kWKFontSmoothingLevelWindows on Windows, kWKFontSmoothingLevelMedium on other platforms.
+// Defaults to kWKFontSmoothingLevelMedium.
WK_EXPORT void WKPreferencesSetFontSmoothingLevel(WKPreferencesRef, WKFontSmoothingLevel);
WK_EXPORT WKFontSmoothingLevel WKPreferencesGetFontSmoothingLevel(WKPreferencesRef);
Modified: trunk/Source/WebKit2/config.h (157642 => 157643)
--- trunk/Source/WebKit2/config.h 2013-10-18 19:11:08 UTC (rev 157642)
+++ trunk/Source/WebKit2/config.h 2013-10-18 19:17:25 UTC (rev 157643)
@@ -55,29 +55,6 @@
return name##Value; \
}
-#if defined(WIN32) || defined(_WIN32)
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0502
-#endif
-
-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_ /* Prevent inclusion of winsock.h in windows.h */
-#endif
-
-#include <WebCore/config.h>
-#include <windows.h>
-
-#if USE(CG)
-#include <CoreGraphics/CoreGraphics.h>
-#endif
-
-#endif /* defined(WIN32) || defined(_WIN32) */
-
#ifdef __cplusplus
// These undefs match up with defines in WebKit2Prefix.h for Mac OS X.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
