-
ap@apple.com authored
https://bugs.webkit.org/show_bug.cgi?id=104718 Reviewed by Tim Horton. Source/WebCore: Split initialization function into a new InitializeLogging.h file, because it's needed in WebKit, but cannot be included along with WebKit version of this file. We'd have a confilct between LOG_CHANNEL_PREFIX definitions if we tried. * WebCore.xcodeproj/project.pbxproj: Make Logging.h a project header, and InitializeLogging.h a private one. * GNUmakefile.list.am: * Target.pri: * platform/InitializeLogging.h: Added. * platform/Logging.h: * platform/blackberry/LoggingBlackBerry.cpp: * platform/efl/LoggingEfl.cpp: * platform/gtk/LoggingGtk.cpp: * platform/mac/LoggingMac.mm: * platform/qt/LoggingQt.cpp: * platform/win/LoggingWin.cpp: * platform/wx/LoggingWx.cpp: Include InitializeLogging.h where this function is implemented. * platform/NotImplemented.h: * platform/NotImplemented.cpp: Added. Changed to not include WebCore's Logging.h in the header, because NotImplemented.h is used in WebKits, which have incompatibe logging headers. Source/WebKit/blackberry: * Api/BlackBerryGlobal.cpp: Include InitializeLogging.h Source/WebKit/efl: * ewk/ewk_main.cpp: Include InitializeLogging.h Source/WebKit/gtk: * webkit/webkitglobals.cpp: Include InitializeLogging.h Source/WebKit/mac: * WebView/WebView.mm: Use WebCore/InitializeLogging.h to avoid conflicts between WebCore and WebKit versions of this file. Source/WebKit/qt: * WebCoreSupport/InitWebCoreQt.cpp: Include InitializeLogging.h Source/WebKit/win: * WebView.cpp: Updated for a new include file to use in WebKits. Source/WebKit/wx: * WebView.cpp: Include InitializeLogging.h Source/WebKit2: * NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::initializeNetworkProcess): Initialize WebCore and WebKit2 logging. * Platform/Logging.cpp: (WebKit::initializeLogChannelsIfNecessary): Added Network and NetworkScheduling. Re-ordered to match declaration order, alphabetical clearly doesn't help here. * WebProcess/WebProcess.cpp: (WebKit::WebProcess::WebProcess): Initialize WebKit2 logging in addition to WebCore. * UIProcess/WebContext.cpp: (WebKit::WebContext::WebContext): Initialize WebKit2 logging in addition to WebCore. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
f34a94f1