| OLD | NEW | 
|   1 /* |   1 /* | 
|   2  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved. |   2  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved. | 
|   3  * |   3  * | 
|   4  * Redistribution and use in source and binary forms, with or without |   4  * Redistribution and use in source and binary forms, with or without | 
|   5  * modification, are permitted provided that the following conditions |   5  * modification, are permitted provided that the following conditions | 
|   6  * are met: |   6  * are met: | 
|   7  * 1. Redistributions of source code must retain the above copyright |   7  * 1. Redistributions of source code must retain the above copyright | 
|   8  *    notice, this list of conditions and the following disclaimer. |   8  *    notice, this list of conditions and the following disclaimer. | 
|   9  * 2. Redistributions in binary form must reproduce the above copyright |   9  * 2. Redistributions in binary form must reproduce the above copyright | 
|  10  *    notice, this list of conditions and the following disclaimer in the |  10  *    notice, this list of conditions and the following disclaimer in the | 
|  11  *    documentation and/or other materials provided with the distribution. |  11  *    documentation and/or other materials provided with the distribution. | 
|  12  * |  12  * | 
|  13  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |  13  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 
|  14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |  14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
|  15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |  15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
|  16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR |  16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 
|  17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |  17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
|  18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |  18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
|  19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |  19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
|  20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |  20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
|  21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |  21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
|  22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |  22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
|  23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
|  24  */ |  24  */ | 
|  25  |  25  | 
|  26 #ifndef Logging_h |  26 #ifndef Logging_h | 
|  27 #define Logging_h |  27 #define Logging_h | 
|  28  |  28  | 
 |  29 // This is deprecated.  We'll remove this soon. | 
 |  30  | 
|  29 #include "platform/PlatformExport.h" |  31 #include "platform/PlatformExport.h" | 
|  30 #include "wtf/Assertions.h" |  32 #include "wtf/Assertions.h" | 
|  31 #include "wtf/Forward.h" |  33 #include "wtf/Forward.h" | 
|  32  |  34  | 
|  33 #if !LOG_DISABLED |  35 #if !LOG_DISABLED | 
|  34  |  36  | 
|  35 #ifndef LOG_CHANNEL_PREFIX |  37 #ifndef LOG_CHANNEL_PREFIX | 
|  36 #define LOG_CHANNEL_PREFIX Log |  38 #define LOG_CHANNEL_PREFIX Log | 
|  37 #endif |  39 #endif | 
|  38  |  40  | 
|  39 namespace blink { |  41 namespace blink { | 
|  40  |  42  | 
|  41 // WTFLogChannel is deprecated.  Do not add new channels. |  | 
|  42 PLATFORM_EXPORT extern WTFLogChannel LogNetwork; |  | 
|  43 PLATFORM_EXPORT extern WTFLogChannel LogResourceLoading; |  | 
|  44  |  | 
|  45 PLATFORM_EXPORT WTFLogChannel* getChannelFromName(const String& channelName); |  43 PLATFORM_EXPORT WTFLogChannel* getChannelFromName(const String& channelName); | 
|  46  |  44  | 
|  47 } |  45 } | 
|  48  |  46  | 
|  49 #endif // !LOG_DISABLED |  47 #endif // !LOG_DISABLED | 
|  50  |  48  | 
|  51 #endif // Logging_h |  49 #endif // Logging_h | 
| OLD | NEW |