Diff
Modified: trunk/Source/WTF/ChangeLog (147754 => 147755)
--- trunk/Source/WTF/ChangeLog 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/ChangeLog 2013-04-05 16:51:39 UTC (rev 147755)
@@ -1,3 +1,17 @@
+2013-04-05 Anders Carlsson <[email protected]>
+
+ Remove more dead Chromium code from WTF
+ https://bugs.webkit.org/show_bug.cgi?id=114037
+
+ Reviewed by Allan Sandfeld Jensen.
+
+ * wtf/CurrentTime.cpp:
+ (WTF):
+ * wtf/DisallowCType.h:
+ * wtf/ExportMacros.h:
+ * wtf/MainThread.cpp:
+ * wtf/Platform.h:
+
2013-04-05 Raphael Kubo da Costa <[email protected]>
[EFL] Disable GLOBAL_FAST_MALLOC_NEW by default.
Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (147754 => 147755)
--- trunk/Source/WTF/wtf/CurrentTime.cpp 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2013-04-05 16:51:39 UTC (rev 147755)
@@ -65,8 +65,6 @@
namespace WTF {
-#if !PLATFORM(CHROMIUM)
-
#if OS(WINDOWS)
// Number of 100 nanosecond between January 1, 1601 and January 1, 1970.
@@ -333,6 +331,4 @@
#endif
-#endif // !PLATFORM(CHROMIUM)
-
} // namespace WTF
Modified: trunk/Source/WTF/wtf/DisallowCType.h (147754 => 147755)
--- trunk/Source/WTF/wtf/DisallowCType.h 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/wtf/DisallowCType.h 2013-04-05 16:51:39 UTC (rev 147755)
@@ -41,7 +41,7 @@
// or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> which uses
// isacii().
#include <wtf/Platform.h>
-#if !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
+#if !PLATFORM(QT) && !PLATFORM(WX) && !(OS(DARWIN) && PLATFORM(GTK)) && !OS(QNX) && !defined(_LIBCPP_VERSION)
#include <ctype.h>
Modified: trunk/Source/WTF/wtf/ExportMacros.h (147754 => 147755)
--- trunk/Source/WTF/wtf/ExportMacros.h 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/wtf/ExportMacros.h 2013-04-05 16:51:39 UTC (rev 147755)
@@ -38,7 +38,7 @@
// being local to the target being generated, and thus not subject to (e.g.) ELF
// symbol interposition rules.
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS)
+#if OS(WINDOWS)
#define HAVE_INTERNAL_VISIBILITY 1
#define WTF_INTERNAL
#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
@@ -48,7 +48,7 @@
#define WTF_INTERNAL
#endif
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS)
+#if OS(WINDOWS)
#define WTF_EXPORT_DECLARATION __declspec(dllexport)
#define WTF_IMPORT_DECLARATION __declspec(dllimport)
@@ -89,15 +89,15 @@
#else // !USE(EXPORT_MACROS)
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC)
+#if OS(WINDOWS) && !COMPILER(GCC)
#if defined(BUILDING_WTF) || defined(STATICALLY_LINKED_WITH_WTF)
#define WTF_EXPORTDATA __declspec(dllexport)
#else
#define WTF_EXPORTDATA __declspec(dllimport)
#endif
-#else // PLATFORM(CHROMIUM) || !OS(WINDOWS) || COMPILER(GCC)
+#else // !OS(WINDOWS) || COMPILER(GCC)
#define WTF_EXPORTDATA
-#endif // !PLATFORM(CHROMIUM)...
+#endif
#define WTF_EXPORTCLASS WTF_EXPORTDATA
Modified: trunk/Source/WTF/wtf/MainThread.cpp (147754 => 147755)
--- trunk/Source/WTF/wtf/MainThread.cpp 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2013-04-05 16:51:39 UTC (rev 147755)
@@ -36,10 +36,6 @@
#include "Threading.h"
#include <wtf/ThreadSpecific.h>
-#if PLATFORM(CHROMIUM)
-#error Chromium uses a different main thread implementation
-#endif
-
namespace WTF {
struct FunctionWithContext {
Modified: trunk/Source/WTF/wtf/Platform.h (147754 => 147755)
--- trunk/Source/WTF/wtf/Platform.h 2013-04-05 16:40:31 UTC (rev 147754)
+++ trunk/Source/WTF/wtf/Platform.h 2013-04-05 16:51:39 UTC (rev 147755)
@@ -434,7 +434,6 @@
/* Operating environments */
/* FIXME: these are all mixes of OS, operating environment and policy choices. */
-/* PLATFORM(CHROMIUM) */
/* PLATFORM(QT) */
/* PLATFORM(WX) */
/* PLATFORM(EFL) */
@@ -442,9 +441,7 @@
/* PLATFORM(BLACKBERRY) */
/* PLATFORM(MAC) */
/* PLATFORM(WIN) */
-#if defined(BUILDING_CHROMIUM__)
-#define WTF_PLATFORM_CHROMIUM 1
-#elif defined(BUILDING_QT__)
+#if defined(BUILDING_QT__)
#define WTF_PLATFORM_QT 1
#elif defined(BUILDING_WX__)
#define WTF_PLATFORM_WX 1
@@ -482,24 +479,6 @@
#define WTF_USE_CA 1
#endif
-/* USE(SKIA) for Win/Linux/Mac/Android */
-#if PLATFORM(CHROMIUM)
-#if OS(DARWIN)
-#define WTF_USE_SKIA 1
-#define WTF_USE_ICCJPEG 1
-#define WTF_USE_QCMSLIB 1
-#elif OS(ANDROID)
-#define WTF_USE_SKIA 1
-#define WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION 1
-#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_DITHERING 1
-#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_FANCY_UPSAMPLING 1
-#else
-#define WTF_USE_SKIA 1
-#define WTF_USE_ICCJPEG 1
-#define WTF_USE_QCMSLIB 1
-#endif
-#endif
-
#if PLATFORM(BLACKBERRY)
#define WTF_USE_SKIA 1
#define WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION 1
@@ -554,23 +533,6 @@
#define WTF_USE_SECURITY_FRAMEWORK 1
#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
-#define WTF_USE_CF 1
-#define WTF_USE_WK_SCROLLBAR_PAINTER 1
-#endif
-
-#if PLATFORM(CHROMIUM)
-#if OS(DARWIN)
-/* We can't override the global operator new and delete on OS(DARWIN) because
- * some object are allocated by WebKit and deallocated by the embedder. */
-#define ENABLE_GLOBAL_FASTMALLOC_NEW 0
-#else /* !OS(DARWIN) */
-/* On non-OS(DARWIN), the "system malloc" is actually TCMalloc anyway, so there's
- * no need to use WebKit's copy of TCMalloc. */
-#define USE_SYSTEM_MALLOC 1
-#endif /* OS(DARWIN) */
-#endif /* PLATFORM(CHROMIUM) */
-
#if PLATFORM(IOS)
#define DONT_FINALIZE_ON_MAIN_THREAD 1
#endif
@@ -620,7 +582,7 @@
#endif
#if !defined(HAVE_ACCESSIBILITY)
-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && !OS(ANDROID)) || PLATFORM(EFL)
+#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
#define HAVE_ACCESSIBILITY 1
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
@@ -881,7 +843,7 @@
#define ENABLE_REGEXP_TRACING 0
/* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
-#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
+#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
#define ENABLE_YARR_JIT 1
/* Setting this flag compares JIT results with interpreter results. */
@@ -1048,10 +1010,6 @@
#define WTF_USE_COREAUDIO 1
#endif
-#if !defined(WTF_USE_V8) && PLATFORM(CHROMIUM)
-#define WTF_USE_V8 1
-#endif
-
/* Not using V8 implies using JSC and vice versa */
#if !USE(V8)
#define WTF_USE_JSC 1
