Diff
Modified: trunk/Source/WebCore/ChangeLog (203748 => 203749)
--- trunk/Source/WebCore/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,36 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ Fix some issues with the LOG macros.
+
+ First, they were not usable outside the WebKit namespace in WebKit2 code. Fix by moving
+ its log channels outside of the namespace (they are protected by a unique prefix anyway).
+
+ Second, allow LOG_WITH_STREAM to be used in WebKit2 by moving that and a helper macro
+ into LogMacros.h, which is exported from WebCore as a private header.
+
+ Third, split the Logging.h header into two. Logging.h remains for framework-internal
+ log channels and log macros. Add LogInitialization.h which is external, and used to
+ initialize the channels.
+
+ Finally unify "initializeLogChannels" and "initializeLoggingChannels" terminology everywhere.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/LogInitialization.h: Added.
+ * platform/LogMacros.h: Added.
+ * platform/Logging.cpp:
+ (WebCore::initializeLogChannelsIfNecessary):
+ (WebCore::initializeLoggingChannelsIfNecessary): Deleted.
+ * platform/Logging.h:
+ * testing/js/WebCoreTestSupport.cpp:
+ (WebCoreTestSupport::initializeLogChannelsIfNecessary):
+ (WebCoreTestSupport::initializeLoggingChannelsIfNecessary): Deleted.
+ * testing/js/WebCoreTestSupport.h:
+
2016-07-26 Anders Carlsson <[email protected]>
onpaymentauthorized callback not received when authorizing for a second time
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (203748 => 203749)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-07-26 23:30:01 UTC (rev 203749)
@@ -543,6 +543,8 @@
0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
0FDA7C261883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */; };
0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */; };
+ 0FDCD7F31D47E655009F08BC /* LogInitialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDCD7F21D47E655009F08BC /* LogInitialization.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0FDCD7F51D47E725009F08BC /* LogMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDCD7F41D47E725009F08BC /* LogMacros.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FDF45A71BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */; };
0FDF45A91BD1C82500E4FA8C /* TimingFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */; };
0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */; };
@@ -4485,7 +4487,7 @@
A81872240977D3C0005826D9 /* NameNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A81872190977D3C0005826D9 /* NameNodeList.cpp */; };
A81872250977D3C0005826D9 /* ChildNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A818721A0977D3C0005826D9 /* ChildNodeList.cpp */; };
A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8239DFE09B3CF8A00B60641 /* Logging.cpp */; };
- A8239E0109B3CF8A00B60641 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = A8239DFF09B3CF8A00B60641 /* Logging.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A8239E0109B3CF8A00B60641 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = A8239DFF09B3CF8A00B60641 /* Logging.h */; };
A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */ = {isa = PBXBuildFile; fileRef = A824B4640E2EF2EA0081A7B7 /* TextRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581E809D1508D000E61D7 /* SVGNames.cpp */; };
A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581EA09D1508D000E61D7 /* XLinkNames.cpp */; };
@@ -8037,6 +8039,8 @@
0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageIOS.mm; sourceTree = "<group>"; };
0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitPlaybackTargetAvailabilityEvent.cpp; sourceTree = "<group>"; };
0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitPlaybackTargetAvailabilityEvent.h; sourceTree = "<group>"; };
+ 0FDCD7F21D47E655009F08BC /* LogInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogInitialization.h; sourceTree = "<group>"; };
+ 0FDCD7F41D47E725009F08BC /* LogMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogMacros.h; sourceTree = "<group>"; };
0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCAAnimation.cpp; sourceTree = "<group>"; };
0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimingFunction.cpp; sourceTree = "<group>"; };
0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeMac.cpp; sourceTree = "<group>"; };
@@ -23203,6 +23207,8 @@
A7AD2F860EC89D07008AB002 /* LinkHash.h */,
C046E1AB1208A9FE00BA2CF7 /* LocalizedStrings.cpp */,
935207BD09BD410A00F2038D /* LocalizedStrings.h */,
+ 0FDCD7F21D47E655009F08BC /* LogInitialization.h */,
+ 0FDCD7F41D47E725009F08BC /* LogMacros.h */,
A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
A8239DFF09B3CF8A00B60641 /* Logging.h */,
7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */,
@@ -28114,6 +28120,7 @@
078E092617D14D1C00420AA1 /* RTCSessionDescription.h in Headers */,
078E094317D16E1C00420AA1 /* RTCSessionDescriptionDescriptor.h in Headers */,
078E094417D16E1C00420AA1 /* RTCSessionDescriptionRequest.h in Headers */,
+ 0FDCD7F31D47E655009F08BC /* LogInitialization.h in Headers */,
078E092A17D14D1C00420AA1 /* RTCStatsReport.h in Headers */,
078E094517D16E1C00420AA1 /* RTCStatsRequest.h in Headers */,
078E092C17D14D1C00420AA1 /* RTCStatsResponse.h in Headers */,
@@ -28231,6 +28238,7 @@
BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
FD45A94F175D3F3E00C21EC8 /* Shape.h in Headers */,
+ 0FDCD7F51D47E725009F08BC /* LogMacros.h in Headers */,
FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */,
FD45A952175D3F3E00C21EC8 /* ShapeOutsideInfo.h in Headers */,
FD1AF1501656F15100C6D4F7 /* ShapeValue.h in Headers */,
Added: trunk/Source/WebCore/platform/LogInitialization.h (0 => 203749)
--- trunk/Source/WebCore/platform/LogInitialization.h (rev 0)
+++ trunk/Source/WebCore/platform/LogInitialization.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2003, 2006, 2013, 2015, 2016 Apple Inc. 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. ``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
+ * 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.
+ */
+
+#pragma once
+
+#include <wtf/Assertions.h>
+#include <wtf/Forward.h>
+
+namespace WebCore {
+
+#if !LOG_DISABLED
+
+String logLevelString();
+bool isLogChannelEnabled(const String& name);
+WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
+WEBCORE_EXPORT void initializeLogChannelsIfNecessary();
+
+#endif // !LOG_DISABLED
+
+} // namespace WebCore
Added: trunk/Source/WebCore/platform/LogMacros.h (0 => 203749)
--- trunk/Source/WebCore/platform/LogMacros.h (rev 0)
+++ trunk/Source/WebCore/platform/LogMacros.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2015, 2016 Apple Inc. 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. ``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
+ * 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.
+ */
+
+#pragma once
+
+#include <functional>
+
+#if LOG_DISABLED
+
+#define LOG_RESULT(channel, function) ((void)0)
+#define LOG_WITH_STREAM(channel, commands) ((void)0)
+
+#else
+
+namespace WebCore {
+WEBCORE_EXPORT void logFunctionResult(WTFLogChannel*, std::function<const char*()>);
+}
+
+#define LOG_RESULT(channel, function) WebCore::logFunctionResult(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), function)
+
+#define LOG_WITH_STREAM(channel, commands) WebCore::logFunctionResult(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), \
+ [&]() { \
+ WebCore::TextStream stream(WebCore::TextStream::LineMode::SingleLine); \
+ commands; \
+ return stream.release().utf8().data(); \
+ });
+
+#endif // !LOG_DISABLED
Modified: trunk/Source/WebCore/platform/Logging.cpp (203748 => 203749)
--- trunk/Source/WebCore/platform/Logging.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/platform/Logging.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -25,6 +25,7 @@
#include "config.h"
#include "Logging.h"
+#include "LogInitialization.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/CString.h>
@@ -69,7 +70,7 @@
logChannelsNeedInitialization = true;
}
-void initializeLoggingChannelsIfNecessary()
+void initializeLogChannelsIfNecessary()
{
if (!logChannelsNeedInitialization)
return;
Modified: trunk/Source/WebCore/platform/Logging.h (203748 => 203749)
--- trunk/Source/WebCore/platform/Logging.h 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/platform/Logging.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006, 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2006, 2013, 2015, 2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,22 +23,16 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef Logging_h
-#define Logging_h
+#pragma once
-#include <functional>
+#include "LogMacros.h"
#include <wtf/Assertions.h>
#include <wtf/Forward.h>
namespace WebCore {
-#if LOG_DISABLED
+#if !LOG_DISABLED
-#define LOG_RESULT(channel, function) ((void)0)
-#define LOG_WITH_STREAM(channel, commands) ((void)0)
-
-#else
-
#ifndef LOG_CHANNEL_PREFIX
#define LOG_CHANNEL_PREFIX Log
#endif
@@ -95,29 +89,13 @@
WEBCORE_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
-#undef DECLARE_LOG_CHANNEL
-
String logLevelString();
bool isLogChannelEnabled(const String& name);
WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
-WEBCORE_EXPORT void initializeLoggingChannelsIfNecessary();
#ifndef NDEBUG
void registerNotifyCallback(const String& notifyID, std::function<void()> callback);
#endif
-void logFunctionResult(WTFLogChannel*, std::function<const char*()>);
-
-#define LOG_RESULT(channel, function) logFunctionResult(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), function)
-
-#define LOG_WITH_STREAM(channel, commands) logFunctionResult(&JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, channel), \
- [&]() { \
- TextStream stream(TextStream::LineMode::SingleLine); \
- commands; \
- return stream.release().utf8().data(); \
- });
-
#endif // !LOG_DISABLED
} // namespace WebCore
-
-#endif // Logging_h
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (203748 => 203749)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -32,7 +32,7 @@
#include "Internals.h"
#include "JSDocument.h"
#include "JSInternals.h"
-#include "Logging.h"
+#include "LogInitialization.h"
#include "Page.h"
#include "WheelEventTestTrigger.h"
#include <_javascript_Core/APICast.h>
@@ -107,10 +107,10 @@
#endif
}
-void initializeLoggingChannelsIfNecessary()
+void initializeLogChannelsIfNecessary()
{
#if !LOG_DISABLED
- WebCore::initializeLoggingChannelsIfNecessary();
+ WebCore::initializeLogChannelsIfNecessary();
#endif
}
Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.h (203748 => 203749)
--- trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebCore/testing/js/WebCoreTestSupport.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -53,7 +53,7 @@
void clearWheelEventTestTrigger(WebCore::Frame&) TEST_SUPPORT_EXPORT;
void setLogChannelToAccumulate(const WTF::String& name) TEST_SUPPORT_EXPORT;
-void initializeLoggingChannelsIfNecessary() TEST_SUPPORT_EXPORT;
+void initializeLogChannelsIfNecessary() TEST_SUPPORT_EXPORT;
void setAllowsAnySSLCertificate(bool) TEST_SUPPORT_EXPORT;
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (203748 => 203749)
--- trunk/Source/WebKit/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,26 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ Fix some issues with the LOG macros.
+
+ First, they were not usable outside the WebKit namespace in WebKit2 code. Fix by moving
+ its log channels outside of the namespace (they are protected by a unique prefix anyway).
+
+ Second, allow LOG_WITH_STREAM to be used in WebKit2 by moving that and a helper macro
+ into LogMacros.h, which is exported from WebCore as a private header.
+
+ Third, split the Logging.h header into two. Logging.h remains for framework-internal
+ log channels and log macros. Add LogInitialization.h which is external, and used to
+ initialize the channels.
+
+ Finally unify "initializeLogChannels" and "initializeLoggingChannels" terminology everywhere.
+
+ * WebCoreSupport/WebResourceLoadScheduler.cpp:
+
2016-07-14 Alex Christensen <[email protected]>
Use SocketProvider to create SocketStreamHandles
Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (203748 => 203749)
--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -24,11 +24,11 @@
#include "WebResourceLoadScheduler.h"
+#include "WebKitLogging.h"
#include <WebCore/Document.h>
#include <WebCore/DocumentLoader.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameLoader.h>
-#include <WebCore/Logging.h>
#include <WebCore/NetscapePlugInStreamLoader.h>
#include <WebCore/PingHandle.h>
#include <WebCore/PlatformStrategies.h>
Modified: trunk/Source/WebKit/mac/ChangeLog (203748 => 203749)
--- trunk/Source/WebKit/mac/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,29 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ Fix some issues with the LOG macros.
+
+ First, they were not usable outside the WebKit namespace in WebKit2 code. Fix by moving
+ its log channels outside of the namespace (they are protected by a unique prefix anyway).
+
+ Second, allow LOG_WITH_STREAM to be used in WebKit2 by moving that and a helper macro
+ into LogMacros.h, which is exported from WebCore as a private header.
+
+ Third, split the Logging.h header into two. Logging.h remains for framework-internal
+ log channels and log macros. Add LogInitialization.h which is external, and used to
+ initialize the channels.
+
+ Finally unify "initializeLogChannels" and "initializeLoggingChannels" terminology everywhere.
+
+ * Misc/WebKitLogging.h:
+ * Misc/WebKitLogging.m:
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
2016-07-21 Myles C. Maxfield <[email protected]>
Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (203748 => 203749)
--- trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -60,6 +60,7 @@
M(Progress) \
M(Redirect) \
M(RemoteInspector) \
+ M(ResourceLoading) \
M(TextInput) \
M(Timing) \
M(View) \
@@ -71,7 +72,7 @@
#undef DECLARE_LOG_CHANNEL
-void WebKitInitializeLoggingChannelsIfNecessary(void);
+void WebKitInitializeLogChannelsIfNecessary(void);
#endif // !LOG_DISABLED
void ReportDiscardedDelegateException(SEL delegateSelector, id exception);
Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.m (203748 => 203749)
--- trunk/Source/WebKit/mac/Misc/WebKitLogging.m 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/mac/Misc/WebKitLogging.m 2016-07-26 23:30:01 UTC (rev 203749)
@@ -44,7 +44,7 @@
static NSString * const defaultsDomain = @"WebKitLogging";
-void WebKitInitializeLoggingChannelsIfNecessary()
+void WebKitInitializeLogChannelsIfNecessary()
{
static bool haveInitializedLoggingChannels = false;
if (haveInitializedLoggingChannels)
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203748 => 203749)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-07-26 23:30:01 UTC (rev 203749)
@@ -151,7 +151,7 @@
#import <WebCore/JSElement.h>
#import <WebCore/JSNodeList.h>
#import <WebCore/JSNotification.h>
-#import <WebCore/Logging.h>
+#import <WebCore/LogInitialization.h>
#import <WebCore/MIMETypeRegistry.h>
#import <WebCore/MainFrame.h>
#import <WebCore/MemoryCache.h>
@@ -958,8 +958,8 @@
#endif
if (!didOneTimeInitialization) {
#if !LOG_DISABLED
- WebKitInitializeLoggingChannelsIfNecessary();
- WebCore::initializeLoggingChannelsIfNecessary();
+ WebKitInitializeLogChannelsIfNecessary();
+ WebCore::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
// Initialize our platform strategies first before invoking the rest
Modified: trunk/Source/WebKit/win/ChangeLog (203748 => 203749)
--- trunk/Source/WebKit/win/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/win/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,29 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ Fix some issues with the LOG macros.
+
+ First, they were not usable outside the WebKit namespace in WebKit2 code. Fix by moving
+ its log channels outside of the namespace (they are protected by a unique prefix anyway).
+
+ Second, allow LOG_WITH_STREAM to be used in WebKit2 by moving that and a helper macro
+ into LogMacros.h, which is exported from WebCore as a private header.
+
+ Third, split the Logging.h header into two. Logging.h remains for framework-internal
+ log channels and log macros. Add LogInitialization.h which is external, and used to
+ initialize the channels.
+
+ Finally unify "initializeLogChannels" and "initializeLoggingChannels" terminology everywhere.
+
+ * WebKitLogging.cpp:
+ * WebKitLogging.h:
+ * WebView.cpp:
+ (WebView::initWithFrame):
+
2016-07-23 Chris Dumez <[email protected]>
Unreviewed, fix Windows build after r203623.
Modified: trunk/Source/WebKit/win/WebKitLogging.cpp (203748 => 203749)
--- trunk/Source/WebKit/win/WebKitLogging.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/win/WebKitLogging.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -40,7 +40,7 @@
static const size_t logChannelCount = sizeof(logChannels) / sizeof(logChannels[0]);
-void WebKitInitializeLoggingChannelsIfNecessary()
+void WebKitInitializeLogChannelsIfNecessary()
{
static bool haveInitializedLoggingChannels = false;
if (haveInitializedLoggingChannels)
Modified: trunk/Source/WebKit/win/WebKitLogging.h (203748 => 203749)
--- trunk/Source/WebKit/win/WebKitLogging.h 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/win/WebKitLogging.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -69,7 +69,7 @@
#undef DECLARE_LOG_CHANNEL
-void WebKitInitializeLoggingChannelsIfNecessary(void);
+void WebKitInitializeLogChannelsIfNecessary(void);
#endif // !LOG_DISABLED
Modified: trunk/Source/WebKit/win/WebView.cpp (203748 => 203749)
--- trunk/Source/WebKit/win/WebView.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit/win/WebView.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -2905,7 +2905,7 @@
static bool didOneTimeInitialization;
if (!didOneTimeInitialization) {
#if !LOG_DISABLED
- initializeLoggingChannelsIfNecessary();
+ initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
// Initialize our platform strategies first before invoking the rest
Modified: trunk/Source/WebKit2/ChangeLog (203748 => 203749)
--- trunk/Source/WebKit2/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,39 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ Fix some issues with the LOG macros.
+
+ First, they were not usable outside the WebKit namespace in WebKit2 code. Fix by moving
+ its log channels outside of the namespace (they are protected by a unique prefix anyway).
+
+ Second, allow LOG_WITH_STREAM to be used in WebKit2 by moving that and a helper macro
+ into LogMacros.h, which is exported from WebCore as a private header.
+
+ Third, split the Logging.h header into two. Logging.h remains for framework-internal
+ log channels and log macros. Add LogInitialization.h which is external, and used to
+ initialize the channels.
+
+ Finally unify "initializeLogChannels" and "initializeLoggingChannels" terminology everywhere.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ * Platform/LogInitialization.h: Copied from Source/WebKit2/Platform/foundation/LoggingFoundation.mm.
+ * Platform/Logging.cpp:
+ (WebKit::initializeLogChannelsIfNecessary):
+ * Platform/Logging.h:
+ * Platform/foundation/LoggingFoundation.mm:
+ * Shared/WebKit2Initialize.cpp:
+ (WebKit::InitializeWebKit2):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _updateContentRectsWithState:]):
+ (-[WKWebView _navigationGestureDidBegin]):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::m_hiddenPageThrottlingTimer):
+ * WebKit2.xcodeproj/project.pbxproj:
+
2016-07-26 David Kilzer <[email protected]>
Networking process crash due to missing -[WebCoreAuthenticationClientAsChallengeSender performDefaultHandlingForAuthenticationChallenge:] implementation
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (203748 => 203749)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -51,7 +51,7 @@
#include "WebsiteDataType.h"
#include <WebCore/DNS.h>
#include <WebCore/DiagnosticLoggingClient.h>
-#include <WebCore/Logging.h>
+#include <WebCore/LogInitialization.h>
#include <WebCore/PlatformCookieJar.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/RuntimeApplicationChecks.h>
Copied: trunk/Source/WebKit2/Platform/LogInitialization.h (from rev 203748, trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm) (0 => 203749)
--- trunk/Source/WebKit2/Platform/LogInitialization.h (rev 0)
+++ trunk/Source/WebKit2/Platform/LogInitialization.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2010, 2013, 2016 Apple Inc. 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.
+ */
+
+#pragma once
+
+#include <wtf/text/WTFString.h>
+
+#if !LOG_DISABLED
+
+namespace WebKit {
+
+void initializeLogChannelsIfNecessary(void);
+String logLevelString();
+
+} // namespace WebKit
+
+#endif // !LOG_DISABLED
Modified: trunk/Source/WebKit2/Platform/Logging.cpp (203748 => 203749)
--- trunk/Source/WebKit2/Platform/Logging.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/Platform/Logging.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -26,13 +26,12 @@
#include "config.h"
#include "Logging.h"
+#include "LogInitialization.h"
#include <wtf/text/CString.h>
#if !LOG_DISABLED
-namespace WebKit {
-
#define DEFINE_LOG_CHANNEL(name) \
WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
WEBKIT2_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
@@ -42,6 +41,8 @@
WEBKIT2_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
};
+namespace WebKit {
+
const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
void initializeLogChannelsIfNecessary()
Modified: trunk/Source/WebKit2/Platform/Logging.h (203748 => 203749)
--- trunk/Source/WebKit2/Platform/Logging.h 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/Platform/Logging.h 2016-07-26 23:30:01 UTC (rev 203749)
@@ -26,6 +26,8 @@
#ifndef WebKitLogging_h
#define WebKitLogging_h
+#include <WebCore/LogMacros.h>
+#include <functional>
#include <wtf/Assertions.h>
#include <wtf/text/WTFString.h>
@@ -35,7 +37,9 @@
#define LOG_CHANNEL_PREFIX WebKit2Log
#endif
-namespace WebKit {
+#ifdef __cplusplus
+extern "C" {
+#endif
#define WEBKIT2_LOG_CHANNELS(M) \
M(ContextMenu) \
@@ -58,6 +62,7 @@
M(StorageAPI) \
M(TextInput) \
M(ViewGestures) \
+ M(VisibleRects) \
#define DECLARE_LOG_CHANNEL(name) \
extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
@@ -66,11 +71,10 @@
#undef DECLARE_LOG_CHANNEL
-void initializeLogChannelsIfNecessary(void);
-String logLevelString();
+#ifdef __cplusplus
+}
+#endif
-} // namespace WebKit
-
#endif // !LOG_DISABLED
#endif // Logging_h
Modified: trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm (203748 => 203749)
--- trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm 2016-07-26 23:30:01 UTC (rev 203749)
@@ -25,6 +25,7 @@
#include "config.h"
#include "Logging.h"
+#include "LogInitialization.h"
namespace WebKit {
Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (203748 => 203749)
--- trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -26,8 +26,8 @@
#include "config.h"
#include "WebKit2Initialize.h"
-#include "Logging.h"
-#include <WebCore/Logging.h>
+#include "LogInitialization.h"
+#include <WebCore/LogInitialization.h>
#include <runtime/InitializeThreading.h>
#include <wtf/MainThread.h>
#include <wtf/RunLoop.h>
@@ -55,7 +55,7 @@
RunLoop::initializeMainRunLoop();
#if !LOG_DISABLED
- WebCore::initializeLoggingChannelsIfNecessary();
+ WebCore::initializeLogChannelsIfNecessary();
WebKit::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203748 => 203749)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-07-26 23:30:01 UTC (rev 203749)
@@ -35,6 +35,7 @@
#import "DiagnosticLoggingClient.h"
#import "FindClient.h"
#import "LegacySessionStateCoding.h"
+#import "Logging.h"
#import "NavigationState.h"
#import "ObjCObjectGraph.h"
#import "RemoteLayerTreeScrollingPerformanceData.h"
@@ -89,6 +90,7 @@
#import <WebCore/PlatformScreen.h>
#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/Settings.h>
+#import <WebCore/TextStream.h>
#import <WebCore/WritingMode.h>
#import <wtf/HashMap.h>
#import <wtf/MathExtras.h>
@@ -2079,7 +2081,7 @@
}
}
#endif
-
+
[_contentView didUpdateVisibleRect:visibleRectInContentCoordinates
unobscuredRect:unobscuredRectInContentCoordinates
unobscuredRectInScrollViewCoordinates:unobscuredRect
@@ -2228,6 +2230,8 @@
_frozenVisibleContentRect = [self convertRect:fullViewRect toView:_contentView.get()];
_frozenUnobscuredContentRect = [self convertRect:unobscuredRect toView:_contentView.get()];
+
+ LOG_WITH_STREAM(VisibleRects, stream << "_navigationGestureDidBegin: freezing visibleContentRect " << _frozenVisibleContentRect.value() << " UnobscuredContentRect " << _frozenUnobscuredContentRect.value());
}
- (void)_navigationGestureDidEnd
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (203748 => 203749)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -35,7 +35,7 @@
#include "CustomProtocolManagerMessages.h"
#include "DownloadProxy.h"
#include "DownloadProxyMessages.h"
-#include "Logging.h"
+#include "LogInitialization.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkProcessMessages.h"
#include "NetworkProcessProxy.h"
@@ -63,7 +63,7 @@
#include <WebCore/ApplicationCacheStorage.h>
#include <WebCore/Language.h>
#include <WebCore/LinkHash.h>
-#include <WebCore/Logging.h>
+#include <WebCore/LogInitialization.h>
#include <WebCore/ResourceRequest.h>
#include <WebCore/SessionID.h>
#include <runtime/JSCInlines.h>
@@ -205,7 +205,7 @@
addLanguageChangeObserver(this, languageChanged);
#if !LOG_DISABLED
- WebCore::initializeLoggingChannelsIfNecessary();
+ WebCore::initializeLogChannelsIfNecessary();
WebKit::initializeLogChannelsIfNecessary();
#endif // !LOG_DISABLED
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (203748 => 203749)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-07-26 23:30:01 UTC (rev 203749)
@@ -105,6 +105,7 @@
0FCB4E6918BBE3D9000FCFC9 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */; };
0FCB4E6C18BBF26A000FCFC9 /* WKContentViewInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */; };
0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
+ 0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */; };
0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */; };
@@ -2065,6 +2066,7 @@
0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKTextInputWindowController.mm; sourceTree = "<group>"; };
0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInteraction.h; path = ios/WKContentViewInteraction.h; sourceTree = "<group>"; };
0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentViewInteraction.mm; path = ios/WKContentViewInteraction.mm; sourceTree = "<group>"; };
+ 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogInitialization.h; sourceTree = "<group>"; };
0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; sourceTree = "<group>"; };
0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDrawingAreaProxyMessages.h; sourceTree = "<group>"; };
0FF24A2F1879E4FE003ABF0C /* RemoteLayerTreeDrawingAreaProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteLayerTreeDrawingAreaProxy.messages.in; sourceTree = "<group>"; };
@@ -6541,6 +6543,7 @@
1A7E814E1152D2240003695B /* mac */,
CE1A0BCA1A48E6C60054EF74 /* spi */,
51B15A7D138439B200321AD8 /* unix */,
+ 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */,
51A7F2F4125BF8D4008AEB1D /* Logging.cpp */,
51A7F2F2125BF820008AEB1D /* Logging.h */,
C0E3AA451209E2BA00A49D01 /* Module.cpp */,
@@ -8059,6 +8062,7 @@
933DF82E1B3BC09000AEA9E3 /* WKImagePreviewViewController.h in Headers */,
9321D5861A38EE3C008052BE /* WKImmediateActionController.h in Headers */,
9321D58A1A38F196008052BE /* WKImmediateActionTypes.h in Headers */,
+ 0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */,
1C8E293912761E5B00BC7BD0 /* WKInspector.h in Headers */,
0F3C725B196F604E00AEDD0C /* WKInspectorHighlightView.h in Headers */,
A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */,
Modified: trunk/Tools/ChangeLog (203748 => 203749)
--- trunk/Tools/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Tools/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
@@ -1,3 +1,16 @@
+2016-07-26 Simon Fraser <[email protected]>
+
+ Allow LOG macros to be used outside the namespace, and other logging cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160216
+
+ Reviewed by Anders Carlsson.
+
+ initializeLoggingChannelsIfNecessary -> initializeLogChannelsIfNecessary
+
+ * DumpRenderTree/TestRunner.cpp:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebViewToConsistentStateBeforeTesting):
+
2016-07-26 David Kilzer <[email protected]>
Networking process crash due to missing -[WebCoreAuthenticationClientAsChallengeSender performDefaultHandlingForAuthenticationChallenge:] implementation
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (203748 => 203749)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-07-26 23:30:01 UTC (rev 203749)
@@ -38,7 +38,7 @@
#include <_javascript_Core/JSCTestRunnerUtils.h>
#include <_javascript_Core/JSObjectRef.h>
#include <_javascript_Core/JSRetainPtr.h>
-#include <WebCore/Logging.h>
+#include <WebCore/LogInitialization.h>
#include <cstring>
#include <locale.h>
#include <runtime/ArrayBufferView.h>
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203748 => 203749)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2016-07-26 23:30:01 UTC (rev 203749)
@@ -59,7 +59,7 @@
#import <_javascript_Core/HeapStatistics.h>
#import <_javascript_Core/LLIntData.h>
#import <_javascript_Core/Options.h>
-#import <WebCore/Logging.h>
+#import <WebCore/LogInitialization.h>
#import <WebKit/DOMElement.h>
#import <WebKit/DOMExtensions.h>
#import <WebKit/DOMRange.h>
@@ -1888,7 +1888,7 @@
[mainFrame _clearOpener];
resetAccumulatedLogs();
- WebCoreTestSupport::initializeLoggingChannelsIfNecessary();
+ WebCoreTestSupport::initializeLogChannelsIfNecessary();
}
#if PLATFORM(IOS)
