[EFL][WK2] Implement missing initializeLogChannel function

https://bugs.webkit.org/show_bug.cgi?id=96478

Patch by KwangYong Choi <ky0.choi@samsung.com> on 2012-09-13
Reviewed by Gyuyoung Kim.

Implemented log channel initialization function for EFL platform in WebKit2.

* Platform/Logging.cpp:
(WebKit):
* Platform/Logging.h:
(WebKit):
* Platform/efl/LoggingEfl.cpp: Added.
(WebKit):
(WebKit::initializeLogChannel): Channel is initialized if its name is found in WEBKIT_DEBUG.
* PlatformEfl.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6ab53e53
2012-09-13 KwangYong Choi <ky0.choi@samsung.com>
[EFL][WK2] Implement missing initializeLogChannel function
https://bugs.webkit.org/show_bug.cgi?id=96478
Reviewed by Gyuyoung Kim.
Implemented log channel initialization function for EFL platform in WebKit2.
* Platform/Logging.cpp:
(WebKit):
* Platform/Logging.h:
(WebKit):
* Platform/efl/LoggingEfl.cpp: Added.
(WebKit):
(WebKit::initializeLogChannel): Channel is initialized if its name is found in WEBKIT_DEBUG.
* PlatformEfl.cmake:
2012-09-13 Mark Rowe <mrowe@apple.com>
<rdar://problem/12283706> WebKit looks for some files on the system even when building against an SDK.
......
......@@ -38,14 +38,14 @@ WTFLogChannel LogView = { 0x00000008, "WebKit2LogLevel", WTFLogChannelOf
WTFLogChannel LogIconDatabase = { 0x00000010, "WebKit2LogLevel", WTFLogChannelOff };
WTFLogChannel LogKeyHandling = { 0x00000020, "WebKit2LogLevel", WTFLogChannelOff };
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT)
#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(QT) && !PLATFORM(EFL)
void initializeLogChannel(WTFLogChannel* channel)
{
// FIXME: Each platform will need to define their own initializeLogChannel().
}
#endif
#if PLATFORM(GTK) || PLATFORM(QT)
#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
WTFLogChannel* getChannelFromName(const String& channelName)
{
if (!(channelName.length() >= 2))
......
......@@ -46,7 +46,7 @@ extern WTFLogChannel LogView;
void initializeLogChannel(WTFLogChannel*);
void initializeLogChannelsIfNecessary(void);
#if PLATFORM(GTK) || PLATFORM(QT)
#if PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
WTFLogChannel* getChannelFromName(const String& channelName);
#endif
......
/*
* Copyright (C) 2012 Samsung Electronics. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "Logging.h"
#if !LOG_DISABLED
namespace WebKit {
void initializeLogChannel(WTFLogChannel* channel)
{
DEFINE_STATIC_LOCAL(Vector<WTFLogChannel*>, activatedChannels, ());
// Fill activatedChannels vector only once based on names set in logValue.
if (activatedChannels.isEmpty()) {
const String logValue = getenv("WEBKIT_DEBUG");
if (logValue.isEmpty())
return;
Vector<String> activatedNames;
logValue.split(',', activatedNames);
for (size_t i = 0; i < activatedNames.size(); i++) {
WTFLogChannel* activeChannel = getChannelFromName(activatedNames[i]);
if (activeChannel)
activatedChannels.append(activeChannel);
}
}
if (activatedChannels.contains(channel))
channel->state = WTFLogChannelOn;
}
} // namespace WebKit
#endif // !LOG_DISABLED
LIST(APPEND WebKit2_SOURCES
Platform/efl/LoggingEfl.cpp
Platform/efl/ModuleEfl.cpp
Platform/efl/WorkQueueEfl.cpp
Platform/unix/SharedMemoryUnix.cpp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment