Make LOG() work in WebProcess and NetworkProcess
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2012 19:07:30 +0000 (19:07 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2012 19:07:30 +0000 (19:07 +0000)
commit841be6fd360536cfd59a0341eaf228ca54d1a9c0
tree1b1b3ce0e504274e652caa6a07afb6beeb9b8257
parent2931d2b76e81822b132630257842abfb493e6082
Make LOG() work in WebProcess and NetworkProcess
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: https://svn.webkit.org/repository/webkit/trunk@137486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
40 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Target.pri
Source/WebCore/WebCore.exp.in
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/platform/InitializeLogging.h [new file with mode: 0644]
Source/WebCore/platform/Logging.h
Source/WebCore/platform/NotImplemented.cpp [new file with mode: 0644]
Source/WebCore/platform/NotImplemented.h
Source/WebCore/platform/PODRedBlackTree.h
Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp
Source/WebCore/platform/efl/LoggingEfl.cpp
Source/WebCore/platform/gtk/LoggingGtk.cpp
Source/WebCore/platform/mac/LoggingMac.mm
Source/WebCore/platform/qt/LoggingQt.cpp
Source/WebCore/platform/win/LoggingWin.cpp
Source/WebCore/platform/wx/LoggingWx.cpp
Source/WebCore/rendering/RenderLayerCompositor.cpp
Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp
Source/WebKit/blackberry/ChangeLog
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/ewk/ewk_main.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/webkit/webkitglobals.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/NetworkProcess.cpp
Source/WebKit2/Platform/Logging.cpp
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/WebProcess/WebProcess.cpp