diff options
Diffstat (limited to 'Source/WebKit2/Shared/WebKit2Initialize.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebKit2Initialize.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Source/WebKit2/Shared/WebKit2Initialize.cpp b/Source/WebKit2/Shared/WebKit2Initialize.cpp index ef3cd948d..c5637c74a 100644 --- a/Source/WebKit2/Shared/WebKit2Initialize.cpp +++ b/Source/WebKit2/Shared/WebKit2Initialize.cpp @@ -26,13 +26,13 @@ #include "config.h" #include "WebKit2Initialize.h" -#include "Logging.h" -#include <WebCore/Logging.h> +#include "LogInitialization.h" +#include <WebCore/LogInitialization.h> #include <runtime/InitializeThreading.h> #include <wtf/MainThread.h> #include <wtf/RunLoop.h> -#if PLATFORM(MAC) +#if PLATFORM(COCOA) #include "WebSystemInterface.h" #endif #if PLATFORM(IOS) @@ -43,7 +43,7 @@ namespace WebKit { void InitializeWebKit2() { -#if PLATFORM(MAC) +#if PLATFORM(COCOA) InitWebCoreSystemInterface(); #endif #if PLATFORM(IOS) @@ -51,13 +51,12 @@ void InitializeWebKit2() #endif JSC::initializeThreading(); - WTF::initializeMainThread(); RunLoop::initializeMainRunLoop(); -#if !LOG_DISABLED - WebCore::initializeLoggingChannelsIfNecessary(); +#if !LOG_DISABLED || !RELEASE_LOG_DISABLED + WebCore::initializeLogChannelsIfNecessary(); WebKit::initializeLogChannelsIfNecessary(); -#endif // !LOG_DISABLED +#endif // !LOG_DISABLED || !RELEASE_LOG_DISABLED } } // namespace WebKit |