Changeset 121707 in webkit
- Timestamp:
- Jul 2, 2012 2:47:42 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 39 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r121697 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 Initializating of the logging channels was taking time on startup. When logging is disabled 9 (and the LOG macro does nothing), we should aslo disable logging channels and initialization. 10 11 This patch #ifdef the Logging initialization with the macro LOG_DISABLED. 12 13 * WebCore.exp.in: 14 * make-export-file-generator: Explicitely adds Assertions.h so that LOG_DISABLED is defined. 15 * platform/Logging.cpp: 16 * platform/Logging.h: 17 * platform/blackberry/LoggingBlackBerry.cpp: 18 * platform/efl/LoggingEfl.cpp: 19 * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: 20 * platform/gtk/LoggingGtk.cpp: 21 * platform/mac/LoggingMac.mm: 22 * platform/network/soup/ResourceHandleSoup.cpp: 23 (WebCore::ensureSessionIsInitialized): 24 * platform/qt/LoggingQt.cpp: 25 * platform/win/LoggingWin.cpp: 26 * platform/wx/LoggingWx.cpp: 27 1 28 2012-07-02 Dan Bernstein <mitz@apple.com> 2 29 -
trunk/Source/WebCore/WebCore.exp.in
r121578 r121707 626 626 __ZN7WebCore32plainTextToMallocAllocatedBufferEPKNS_5RangeERjbNS_20TextIteratorBehaviorE 627 627 __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE 628 __ZN7WebCore36initializeLoggingChannelsIfNecessaryEv629 628 __ZN7WebCore3macERKNS_10CredentialE 630 629 __ZN7WebCore3macERKNS_23AuthenticationChallengeE … … 1977 1976 #endif 1978 1977 1978 #if !LOG_DISABLED 1979 __ZN7WebCore36initializeLoggingChannelsIfNecessaryEv 1980 #endif // !LOG_DISABLED 1981 1979 1982 #if !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) && !PLATFORM(IOS) 1980 1983 __ZN7WebCore7IntSizeC1ERK7_NSSize -
trunk/Source/WebCore/make-export-file-generator
r62608 r121707 37 37 #include "config.h" 38 38 #include <stdio.h> 39 #include <wtf/Assertions.h> 39 40 40 41 int main(int, char**) -
trunk/Source/WebCore/platform/Logging.cpp
r115165 r121707 27 27 #include "Logging.h" 28 28 #include "PlatformString.h" 29 30 #if !LOG_DISABLED 29 31 30 32 namespace WebCore { … … 150 152 151 153 } 154 155 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/Logging.h
r115165 r121707 29 29 #include <wtf/Assertions.h> 30 30 #include <wtf/Forward.h> 31 32 #if !LOG_DISABLED 31 33 32 34 #ifndef LOG_CHANNEL_PREFIX … … 67 69 } 68 70 71 #endif // !LOG_DISABLED 72 69 73 #endif // Logging_h -
trunk/Source/WebCore/platform/blackberry/LoggingBlackBerry.cpp
r105027 r121707 19 19 #include "config.h" 20 20 #include "Logging.h" 21 22 #if !LOG_DISABLED 21 23 22 24 #include <wtf/text/WTFString.h> … … 54 56 55 57 } // namespace WebCore 58 59 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/efl/LoggingEfl.cpp
r102235 r121707 23 23 #include "config.h" 24 24 #include "Logging.h" 25 26 #if !LOG_DISABLED 25 27 26 28 #include "PlatformString.h" … … 63 65 64 66 } 67 68 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
r121575 r121707 1720 1720 1721 1721 // Turn off text overlay unless logging is enabled. 1722 #if LOG_DISABLED 1723 g_object_set(m_fpsSink, "text-overlay", FALSE , NULL); 1724 #else 1722 1725 WTFLogChannel* channel = getChannelFromName("Media"); 1723 1726 if (channel->state != WTFLogChannelOn) 1724 1727 g_object_set(m_fpsSink, "text-overlay", FALSE , NULL); 1728 #endif // LOG_DISABLED 1725 1729 1726 1730 if (g_object_class_find_property(G_OBJECT_GET_CLASS(m_fpsSink), "video-sink")) { -
trunk/Source/WebCore/platform/gtk/LoggingGtk.cpp
r102235 r121707 21 21 #include "config.h" 22 22 #include "Logging.h" 23 24 #if !LOG_DISABLED 25 23 26 #include "PlatformString.h" 24 25 27 #include <glib.h> 26 28 #include <string.h> … … 63 65 64 66 } // namespace WebCore 67 68 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/mac/LoggingMac.mm
r115165 r121707 27 27 28 28 #include "Logging.h" 29 30 #if !LOG_DISABLED 29 31 30 32 namespace WebCore { … … 78 80 79 81 } 82 83 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
r121437 r121707 201 201 } 202 202 203 #if !LOG_DISABLED 203 204 if (!soup_session_get_feature(session, SOUP_TYPE_LOGGER) && LogNetwork.state == WTFLogChannelOn) { 204 205 SoupLogger* logger = soup_logger_new(static_cast<SoupLoggerLogLevel>(SOUP_LOGGER_LOG_BODY), -1); … … 206 207 g_object_unref(logger); 207 208 } 209 #endif // !LOG_DISABLED 208 210 209 211 if (!soup_session_get_feature(session, SOUP_TYPE_REQUESTER)) { -
trunk/Source/WebCore/platform/qt/LoggingQt.cpp
r102235 r121707 20 20 #include "config.h" 21 21 #include "Logging.h" 22 23 #if !LOG_DISABLED 22 24 23 25 #include "PlatformString.h" … … 55 57 56 58 } // namespace WebCore 59 60 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/win/LoggingWin.cpp
r102235 r121707 26 26 #include "config.h" 27 27 #include "Logging.h" 28 29 #if !LOG_DISABLED 28 30 29 31 #include "PlatformString.h" … … 103 105 104 106 } // namespace WebCore 107 108 #endif // !LOG_DISABLED -
trunk/Source/WebCore/platform/wx/LoggingWx.cpp
r102235 r121707 26 26 #include "config.h" 27 27 #include "Logging.h" 28 29 #if !LOG_DISABLED 28 30 29 31 #include "PlatformString.h" … … 63 65 64 66 } 67 68 #endif // !LOG_DISABLED -
trunk/Source/WebKit/blackberry/Api/BlackBerryGlobal.cpp
r121381 r121707 61 61 #endif 62 62 63 #if !LOG_DISABLED 63 64 // Turn on logging. 64 65 initializeLoggingChannelsIfNecessary(); 66 #endif // !LOG_DISABLED 65 67 66 68 // Initialize threading/ -
trunk/Source/WebKit/blackberry/ChangeLog
r121634 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * Api/BlackBerryGlobal.cpp: 9 (BlackBerry::WebKit::globalInitialize): 10 1 11 2012-07-01 George Staikos <staikos@webkit.org> 2 12 -
trunk/Source/WebKit/chromium/ChangeLog
r121655 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * src/WebKit.cpp: 9 (WebKit::enableLogChannel): 10 1 11 2012-07-01 Keishi Hattori <keishi@webkit.org> 2 12 -
trunk/Source/WebKit/chromium/src/WebKit.cpp
r120318 r121707 51 51 #include <wtf/MainThread.h> 52 52 #include <wtf/Threading.h> 53 #include <wtf/UnusedParam.h> 53 54 #include <wtf/text/AtomicString.h> 54 55 … … 186 187 void enableLogChannel(const char* name) 187 188 { 189 #if !LOG_DISABLED 188 190 WTFLogChannel* channel = WebCore::getChannelFromName(name); 189 191 if (channel) 190 192 channel->state = WTFLogChannelOn; 193 #else 194 UNUSED_PARAM(name); 195 #endif // !LOG_DISABLED 191 196 } 192 197 -
trunk/Source/WebKit/efl/ChangeLog
r121679 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * ewk/ewk_main.cpp: 9 (_ewk_init_body): 10 1 11 2012-07-02 Gyuyoung Kim <gyuyoung.kim@samsung.com> 2 12 -
trunk/Source/WebKit/efl/ewk/ewk_main.cpp
r119233 r121707 147 147 148 148 WebCore::ScriptController::initializeThreading(); 149 #if !LOG_DISABLED 149 150 WebCore::initializeLoggingChannelsIfNecessary(); 151 #endif // !LOG_DISABLED 150 152 WebCore::Settings::setDefaultMinDOMTimerInterval(0.004); 151 153 -
trunk/Source/WebKit/gtk/ChangeLog
r121568 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * webkit/webkitglobals.cpp: 9 (webkitInit): 10 1 11 2012-06-29 Tony Chang <tony@chromium.org> 2 12 -
trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp
r113147 r121707 505 505 WTF::initializeMainThread(); 506 506 507 #if !LOG_DISABLED 507 508 WebCore::initializeLoggingChannelsIfNecessary(); 509 #endif // !LOG_DISABLED 508 510 PlatformStrategiesGtk::initialize(); 509 511 -
trunk/Source/WebKit/mac/ChangeLog
r121646 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * Misc/WebIconDatabase.mm: 9 (-[WebIconDatabase _scaleIcon:toSize:]): 10 * Misc/WebKitLogging.h: 11 * Misc/WebKitLogging.m: 12 * WebView/WebHTMLView.mm: 13 (-[WebHTMLView _attributeStringFromDOMRange:]): 14 * WebView/WebView.mm: 15 (-[WebView _commonInitializationWithFrameName:groupName:]): 16 1 17 2012-07-01 Timothy Hatcher <timothy@apple.com> 2 18 -
trunk/Source/WebKit/mac/Misc/WebIconDatabase.mm
r105552 r121707 442 442 ASSERT(size.height); 443 443 444 #if !LOG_DISABLED 444 #if !LOG_DISABLED 445 445 double start = CFAbsoluteTimeGetCurrent(); 446 446 #endif -
trunk/Source/WebKit/mac/Misc/WebKitLogging.h
r39455 r121707 37 37 #endif 38 38 39 #if !LOG_DISABLED 39 40 extern WTFLogChannel WebKitLogTiming; 40 41 extern WTFLogChannel WebKitLogLoading; … … 63 64 64 65 void WebKitInitializeLoggingChannelsIfNecessary(void); 66 #endif // !LOG_DISABLED 65 67 66 68 // FIXME: Why is this in the "logging" header file? -
trunk/Source/WebKit/mac/Misc/WebKitLogging.m
r39455 r121707 28 28 29 29 #import "WebKitLogging.h" 30 31 #if !LOG_DISABLED 30 32 31 33 WTFLogChannel WebKitLogTextInput = { 0x00000010, "WebKitLogLevel", WTFLogChannelOff }; … … 99 101 initializeLogChannel(&WebKitLogTextInput); 100 102 } 103 #endif // !LOG_DISABLED 101 104 102 105 void ReportDiscardedDelegateException(SEL delegateSelector, id exception) -
trunk/Source/WebKit/mac/WebView/WebHTMLView.mm
r121536 r121707 6141 6141 { 6142 6142 NSAttributedString *attributedString; 6143 #if !LOG_DISABLED 6143 #if !LOG_DISABLED 6144 6144 double start = CFAbsoluteTimeGetCurrent(); 6145 6145 #endif -
trunk/Source/WebKit/mac/WebView/WebView.mm
r121536 r121707 724 724 static bool didOneTimeInitialization = false; 725 725 if (!didOneTimeInitialization) { 726 #if !LOG_DISABLED 726 727 WebKitInitializeLoggingChannelsIfNecessary(); 727 728 WebCore::initializeLoggingChannelsIfNecessary(); 729 #endif // !LOG_DISABLED 728 730 [WebHistoryItem initWindowWatcherIfNecessary]; 729 731 #if ENABLE(SQL_DATABASE) -
trunk/Source/WebKit/qt/ChangeLog
r121555 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * WebCoreSupport/InitWebCoreQt.cpp: 9 (WebCore::initializeWebCoreQt): 10 1 11 2012-06-29 Konrad Piascik <kpiascik@rim.com> 2 12 -
trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp
r114042 r121707 67 67 return; 68 68 69 #if !LOG_DISABLED 69 70 WebCore::initializeLoggingChannelsIfNecessary(); 71 #endif // !LOG_DISABLED 70 72 ScriptController::initializeThreading(); 71 73 WTF::initializeMainThread(); -
trunk/Source/WebKit/win/ChangeLog
r121597 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * WebView.cpp: 9 (WebView::initWithFrame): 10 1 11 2012-06-29 Mihai Balan <mibalan@adobe.com> 2 12 -
trunk/Source/WebKit/win/WebView.cpp
r121597 r121707 2642 2642 static bool didOneTimeInitialization; 2643 2643 if (!didOneTimeInitialization) { 2644 #if !LOG_DISABLED 2644 2645 initializeLoggingChannelsIfNecessary(); 2646 #endif // !LOG_DISABLED 2645 2647 #if ENABLE(SQL_DATABASE) 2646 2648 WebKitInitializeWebDatabasesIfNecessary(); -
trunk/Source/WebKit/wx/ChangeLog
r119192 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * WebView.cpp: 9 (WebKit::WebView::Create): 10 1 11 2012-05-31 Hajime Morrita <morrita@chromium.org> 2 12 -
trunk/Source/WebKit/wx/WebView.cpp
r116863 r121707 390 390 m_impl = new WebViewPrivate(); 391 391 392 WebCore::initializeLoggingChannelsIfNecessary(); 392 #if !LOG_DISABLED 393 WebCore::initializeLoggingChannelsIfNecessary(); 394 #endif // !LOG_DISABLED 393 395 WebCore::HTMLFrameOwnerElement* parentFrame = 0; 394 396 -
trunk/Source/WebKit2/ChangeLog
r121698 r121707 1 2012-07-02 Benjamin Poulain <bpoulain@apple.com> 2 3 Do not do any logging initialization when logging is disabled 4 https://bugs.webkit.org/show_bug.cgi?id=90228 5 6 Reviewed by Simon Fraser. 7 8 * Platform/Logging.cpp: 9 * Platform/Logging.h: 10 * UIProcess/WebContext.cpp: 11 (WebKit::WebContext::WebContext): 12 * WebProcess/WebProcess.cpp: 13 (WebKit::WebProcess::WebProcess): 14 1 15 2012-07-02 No'am Rosenthal <noam.rosenthal@nokia.com> 2 16 -
trunk/Source/WebKit2/Platform/Logging.cpp
r119517 r121707 91 91 } // namespace WebKit 92 92 93 #endif // LOG_DISABLED93 #endif // !LOG_DISABLED -
trunk/Source/WebKit2/Platform/Logging.h
r119517 r121707 53 53 } // namespace WebKit 54 54 55 #endif // LOG_DISABLED55 #endif // !LOG_DISABLED 56 56 57 57 #endif // Logging_h -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r118934 r121707 158 158 addLanguageChangeObserver(this, languageChanged); 159 159 160 #if !LOG_DISABLED 160 161 WebCore::initializeLoggingChannelsIfNecessary(); 162 #endif // !LOG_DISABLED 161 163 162 164 #ifndef NDEBUG -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r121381 r121707 162 162 #endif // USE(PLATFORM_STRATEGIES) 163 163 164 #if !LOG_DISABLED 164 165 WebCore::initializeLoggingChannelsIfNecessary(); 166 #endif // !LOG_DISABLED 165 167 } 166 168
Note: See TracChangeset
for help on using the changeset viewer.