<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203749] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203749">203749</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 16:30:01 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/WebCore:
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:
Source/WebKit:
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:
Source/WebKit/mac:
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:]):
Source/WebKit/win:
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):
Source/WebKit2:
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:
Tools:
initializeLoggingChannelsIfNecessary -> initializeLogChannelsIfNecessary
* DumpRenderTree/TestRunner.cpp:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebViewToConsistentStateBeforeTesting):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingcpp">trunk/Source/WebCore/platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLoggingh">trunk/Source/WebCore/platform/Logging.h</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupportcpp">trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingjsWebCoreTestSupporth">trunk/Source/WebCore/testing/js/WebCoreTestSupport.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingh">trunk/Source/WebKit/mac/Misc/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitLoggingm">trunk/Source/WebKit/mac/Misc/WebKitLogging.m</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebKitLoggingcpp">trunk/Source/WebKit/win/WebKitLogging.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitLoggingh">trunk/Source/WebKit/win/WebKitLogging.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingcpp">trunk/Source/WebKit2/Platform/Logging.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformLoggingh">trunk/Source/WebKit2/Platform/Logging.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformfoundationLoggingFoundationmm">trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebKit2Initializecpp">trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformLogInitializationh">trunk/Source/WebCore/platform/LogInitialization.h</a></li>
<li><a href="#trunkSourceWebCoreplatformLogMacrosh">trunk/Source/WebCore/platform/LogMacros.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformLogInitializationh">trunk/Source/WebKit2/Platform/LogInitialization.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-07-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> onpaymentauthorized callback not received when authorizing for a second time
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -543,6 +543,8 @@
</span><span class="cx"> 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
</span><span class="cx"> 0FDA7C261883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */; };
</span><span class="cx"> 0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */; };
</span><ins>+ 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, ); }; };
</ins><span class="cx"> 0FDF45A71BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */; };
</span><span class="cx"> 0FDF45A91BD1C82500E4FA8C /* TimingFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */; };
</span><span class="cx"> 0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */; };
</span><span class="lines">@@ -4485,7 +4487,7 @@
</span><span class="cx"> A81872240977D3C0005826D9 /* NameNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A81872190977D3C0005826D9 /* NameNodeList.cpp */; };
</span><span class="cx"> A81872250977D3C0005826D9 /* ChildNodeList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A818721A0977D3C0005826D9 /* ChildNodeList.cpp */; };
</span><span class="cx"> A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8239DFE09B3CF8A00B60641 /* Logging.cpp */; };
</span><del>- A8239E0109B3CF8A00B60641 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = A8239DFF09B3CF8A00B60641 /* Logging.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ A8239E0109B3CF8A00B60641 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = A8239DFF09B3CF8A00B60641 /* Logging.h */; };
</ins><span class="cx"> A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */ = {isa = PBXBuildFile; fileRef = A824B4640E2EF2EA0081A7B7 /* TextRun.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> A833C7CA0A2CF06B00D57664 /* SVGNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581E809D1508D000E61D7 /* SVGNames.cpp */; };
</span><span class="cx"> A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581EA09D1508D000E61D7 /* XLinkNames.cpp */; };
</span><span class="lines">@@ -8037,6 +8039,8 @@
</span><span class="cx"> 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DragImageIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitPlaybackTargetAvailabilityEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitPlaybackTargetAvailabilityEvent.h; sourceTree = "<group>"; };
</span><ins>+ 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>"; };
</ins><span class="cx"> 0FDF45A61BD1C6FD00E4FA8C /* PlatformCAAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformCAAnimation.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FDF45A81BD1C82500E4FA8C /* TimingFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimingFunction.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeMac.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -23203,6 +23207,8 @@
</span><span class="cx"> A7AD2F860EC89D07008AB002 /* LinkHash.h */,
</span><span class="cx"> C046E1AB1208A9FE00BA2CF7 /* LocalizedStrings.cpp */,
</span><span class="cx"> 935207BD09BD410A00F2038D /* LocalizedStrings.h */,
</span><ins>+ 0FDCD7F21D47E655009F08BC /* LogInitialization.h */,
+ 0FDCD7F41D47E725009F08BC /* LogMacros.h */,
</ins><span class="cx"> A8239DFE09B3CF8A00B60641 /* Logging.cpp */,
</span><span class="cx"> A8239DFF09B3CF8A00B60641 /* Logging.h */,
</span><span class="cx"> 7AE6C9391BE0C60100E19E03 /* MainThreadSharedTimer.cpp */,
</span><span class="lines">@@ -28114,6 +28120,7 @@
</span><span class="cx"> 078E092617D14D1C00420AA1 /* RTCSessionDescription.h in Headers */,
</span><span class="cx"> 078E094317D16E1C00420AA1 /* RTCSessionDescriptionDescriptor.h in Headers */,
</span><span class="cx"> 078E094417D16E1C00420AA1 /* RTCSessionDescriptionRequest.h in Headers */,
</span><ins>+ 0FDCD7F31D47E655009F08BC /* LogInitialization.h in Headers */,
</ins><span class="cx"> 078E092A17D14D1C00420AA1 /* RTCStatsReport.h in Headers */,
</span><span class="cx"> 078E094517D16E1C00420AA1 /* RTCStatsRequest.h in Headers */,
</span><span class="cx"> 078E092C17D14D1C00420AA1 /* RTCStatsResponse.h in Headers */,
</span><span class="lines">@@ -28231,6 +28238,7 @@
</span><span class="cx"> BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
</span><span class="cx"> A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,
</span><span class="cx"> FD45A94F175D3F3E00C21EC8 /* Shape.h in Headers */,
</span><ins>+ 0FDCD7F51D47E725009F08BC /* LogMacros.h in Headers */,
</ins><span class="cx"> FD45A95B175D41EE00C21EC8 /* ShapeInterval.h in Headers */,
</span><span class="cx"> FD45A952175D3F3E00C21EC8 /* ShapeOutsideInfo.h in Headers */,
</span><span class="cx"> FD1AF1501656F15100C6D4F7 /* ShapeValue.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLogInitializationh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/LogInitialization.h (0 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LogInitialization.h (rev 0)
+++ trunk/Source/WebCore/platform/LogInitialization.h 2016-07-26 23:30:01 UTC (rev 203749)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLogMacrosh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/LogMacros.h (0 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LogMacros.h (rev 0)
+++ trunk/Source/WebCore/platform/LogMacros.h 2016-07-26 23:30:01 UTC (rev 203749)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "LogInitialization.h"
</ins><span class="cx">
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -69,7 +70,7 @@
</span><span class="cx"> logChannelsNeedInitialization = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void initializeLoggingChannelsIfNecessary()
</del><ins>+void initializeLogChannelsIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> if (!logChannelsNeedInitialization)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Logging.h (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2013, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003, 2006, 2013, 2015, 2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,22 +23,16 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef Logging_h
-#define Logging_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><del>-#include <functional>
</del><ins>+#include "LogMacros.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-#if LOG_DISABLED
</del><ins>+#if !LOG_DISABLED
</ins><span class="cx">
</span><del>-#define LOG_RESULT(channel, function) ((void)0)
-#define LOG_WITH_STREAM(channel, commands) ((void)0)
-
-#else
-
</del><span class="cx"> #ifndef LOG_CHANNEL_PREFIX
</span><span class="cx"> #define LOG_CHANNEL_PREFIX Log
</span><span class="cx"> #endif
</span><span class="lines">@@ -95,29 +89,13 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
</span><span class="cx">
</span><del>-#undef DECLARE_LOG_CHANNEL
-
</del><span class="cx"> String logLevelString();
</span><span class="cx"> bool isLogChannelEnabled(const String& name);
</span><span class="cx"> WEBCORE_EXPORT void setLogChannelToAccumulate(const String& name);
</span><del>-WEBCORE_EXPORT void initializeLoggingChannelsIfNecessary();
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void registerNotifyCallback(const String& notifyID, std::function<void()> callback);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-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(); \
- });
-
</del><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // Logging_h
</del></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "Internals.h"
</span><span class="cx"> #include "JSDocument.h"
</span><span class="cx"> #include "JSInternals.h"
</span><del>-#include "Logging.h"
</del><ins>+#include "LogInitialization.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "WheelEventTestTrigger.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="lines">@@ -107,10 +107,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void initializeLoggingChannelsIfNecessary()
</del><ins>+void initializeLogChannelsIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- WebCore::initializeLoggingChannelsIfNecessary();
</del><ins>+ WebCore::initializeLogChannelsIfNecessary();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingjsWebCoreTestSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/js/WebCoreTestSupport.h (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void clearWheelEventTestTrigger(WebCore::Frame&) TEST_SUPPORT_EXPORT;
</span><span class="cx">
</span><span class="cx"> void setLogChannelToAccumulate(const WTF::String& name) TEST_SUPPORT_EXPORT;
</span><del>-void initializeLoggingChannelsIfNecessary() TEST_SUPPORT_EXPORT;
</del><ins>+void initializeLogChannelsIfNecessary() TEST_SUPPORT_EXPORT;
</ins><span class="cx"> void setAllowsAnySSLCertificate(bool) TEST_SUPPORT_EXPORT;
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-07-14 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use SocketProvider to create SocketStreamHandles
</span></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx">
</span><span class="cx"> #include "WebResourceLoadScheduler.h"
</span><span class="cx">
</span><ins>+#include "WebKitLogging.h"
</ins><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="cx"> #include <WebCore/FrameLoader.h>
</span><del>-#include <WebCore/Logging.h>
</del><span class="cx"> #include <WebCore/NetscapePlugInStreamLoader.h>
</span><span class="cx"> #include <WebCore/PingHandle.h>
</span><span class="cx"> #include <WebCore/PlatformStrategies.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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:]):
+
</ins><span class="cx"> 2016-07-21 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove support for deprecated SPI inlineMediaPlaybackRequiresPlaysInlineAttribute
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.h (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> M(Progress) \
</span><span class="cx"> M(Redirect) \
</span><span class="cx"> M(RemoteInspector) \
</span><ins>+ M(ResourceLoading) \
</ins><span class="cx"> M(TextInput) \
</span><span class="cx"> M(Timing) \
</span><span class="cx"> M(View) \
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="cx">
</span><del>-void WebKitInitializeLoggingChannelsIfNecessary(void);
</del><ins>+void WebKitInitializeLogChannelsIfNecessary(void);
</ins><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><span class="cx"> void ReportDiscardedDelegateException(SEL delegateSelector, id exception);
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitLoggingm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitLogging.m (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> static NSString * const defaultsDomain = @"WebKitLogging";
</span><span class="cx">
</span><del>-void WebKitInitializeLoggingChannelsIfNecessary()
</del><ins>+void WebKitInitializeLogChannelsIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> static bool haveInitializedLoggingChannels = false;
</span><span class="cx"> if (haveInitializedLoggingChannels)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> #import <WebCore/JSElement.h>
</span><span class="cx"> #import <WebCore/JSNodeList.h>
</span><span class="cx"> #import <WebCore/JSNotification.h>
</span><del>-#import <WebCore/Logging.h>
</del><ins>+#import <WebCore/LogInitialization.h>
</ins><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/MemoryCache.h>
</span><span class="lines">@@ -958,8 +958,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> if (!didOneTimeInitialization) {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- WebKitInitializeLoggingChannelsIfNecessary();
- WebCore::initializeLoggingChannelsIfNecessary();
</del><ins>+ WebKitInitializeLogChannelsIfNecessary();
+ WebCore::initializeLogChannelsIfNecessary();
</ins><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><span class="cx"> // Initialize our platform strategies first before invoking the rest
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2016-07-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix Windows build after r203623.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitLogging.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> static const size_t logChannelCount = sizeof(logChannels) / sizeof(logChannels[0]);
</span><span class="cx">
</span><del>-void WebKitInitializeLoggingChannelsIfNecessary()
</del><ins>+void WebKitInitializeLogChannelsIfNecessary()
</ins><span class="cx"> {
</span><span class="cx"> static bool haveInitializedLoggingChannels = false;
</span><span class="cx"> if (haveInitializedLoggingChannels)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitLogging.h (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="cx">
</span><del>-void WebKitInitializeLoggingChannelsIfNecessary(void);
</del><ins>+void WebKitInitializeLogChannelsIfNecessary(void);
</ins><span class="cx">
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2905,7 +2905,7 @@
</span><span class="cx"> static bool didOneTimeInitialization;
</span><span class="cx"> if (!didOneTimeInitialization) {
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- initializeLoggingChannelsIfNecessary();
</del><ins>+ initializeLogChannelsIfNecessary();
</ins><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><span class="cx"> // Initialize our platform strategies first before invoking the rest
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-07-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Networking process crash due to missing -[WebCoreAuthenticationClientAsChallengeSender performDefaultHandlingForAuthenticationChallenge:] implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #include "WebsiteDataType.h"
</span><span class="cx"> #include <WebCore/DNS.h>
</span><span class="cx"> #include <WebCore/DiagnosticLoggingClient.h>
</span><del>-#include <WebCore/Logging.h>
</del><ins>+#include <WebCore/LogInitialization.h>
</ins><span class="cx"> #include <WebCore/PlatformCookieJar.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/RuntimeApplicationChecks.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLogInitializationhfromrev203748trunkSourceWebKit2PlatformfoundationLoggingFoundationmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Platform/LogInitialization.h (from rev 203748, trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm) (0 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/LogInitialization.h (rev 0)
+++ trunk/Source/WebKit2/Platform/LogInitialization.h 2016-07-26 23:30:01 UTC (rev 203749)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,13 +26,12 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "LogInitialization.h"
</ins><span class="cx">
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx">
</span><del>-namespace WebKit {
-
</del><span class="cx"> #define DEFINE_LOG_CHANNEL(name) \
</span><span class="cx"> WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name) = { WTFLogChannelOff, #name };
</span><span class="cx"> WEBKIT2_LOG_CHANNELS(DEFINE_LOG_CHANNEL)
</span><span class="lines">@@ -42,6 +41,8 @@
</span><span class="cx"> WEBKIT2_LOG_CHANNELS(LOG_CHANNEL_ADDRESS)
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> const size_t logChannelCount = WTF_ARRAY_LENGTH(logChannels);
</span><span class="cx">
</span><span class="cx"> void initializeLogChannelsIfNecessary()
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/Logging.h (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WebKitLogging_h
</span><span class="cx"> #define WebKitLogging_h
</span><span class="cx">
</span><ins>+#include <WebCore/LogMacros.h>
+#include <functional>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -35,7 +37,9 @@
</span><span class="cx"> #define LOG_CHANNEL_PREFIX WebKit2Log
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-namespace WebKit {
</del><ins>+#ifdef __cplusplus
+extern "C" {
+#endif
</ins><span class="cx">
</span><span class="cx"> #define WEBKIT2_LOG_CHANNELS(M) \
</span><span class="cx"> M(ContextMenu) \
</span><span class="lines">@@ -58,6 +62,7 @@
</span><span class="cx"> M(StorageAPI) \
</span><span class="cx"> M(TextInput) \
</span><span class="cx"> M(ViewGestures) \
</span><ins>+ M(VisibleRects) \
</ins><span class="cx">
</span><span class="cx"> #define DECLARE_LOG_CHANNEL(name) \
</span><span class="cx"> extern WTFLogChannel JOIN_LOG_CHANNEL_WITH_PREFIX(LOG_CHANNEL_PREFIX, name);
</span><span class="lines">@@ -66,11 +71,10 @@
</span><span class="cx">
</span><span class="cx"> #undef DECLARE_LOG_CHANNEL
</span><span class="cx">
</span><del>-void initializeLogChannelsIfNecessary(void);
-String logLevelString();
</del><ins>+#ifdef __cplusplus
+}
+#endif
</ins><span class="cx">
</span><del>-} // namespace WebKit
-
</del><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span><span class="cx"> #endif // Logging_h
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformfoundationLoggingFoundationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/foundation/LoggingFoundation.mm (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "LogInitialization.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebKit2Initializecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebKit2Initialize.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKit2Initialize.h"
</span><span class="cx">
</span><del>-#include "Logging.h"
-#include <WebCore/Logging.h>
</del><ins>+#include "LogInitialization.h"
+#include <WebCore/LogInitialization.h>
</ins><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> RunLoop::initializeMainRunLoop();
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- WebCore::initializeLoggingChannelsIfNecessary();
</del><ins>+ WebCore::initializeLogChannelsIfNecessary();
</ins><span class="cx"> WebKit::initializeLogChannelsIfNecessary();
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "DiagnosticLoggingClient.h"
</span><span class="cx"> #import "FindClient.h"
</span><span class="cx"> #import "LegacySessionStateCoding.h"
</span><ins>+#import "Logging.h"
</ins><span class="cx"> #import "NavigationState.h"
</span><span class="cx"> #import "ObjCObjectGraph.h"
</span><span class="cx"> #import "RemoteLayerTreeScrollingPerformanceData.h"
</span><span class="lines">@@ -89,6 +90,7 @@
</span><span class="cx"> #import <WebCore/PlatformScreen.h>
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <WebCore/Settings.h>
</span><ins>+#import <WebCore/TextStream.h>
</ins><span class="cx"> #import <WebCore/WritingMode.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="cx"> #import <wtf/MathExtras.h>
</span><span class="lines">@@ -2079,7 +2081,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
</ins><span class="cx"> [_contentView didUpdateVisibleRect:visibleRectInContentCoordinates
</span><span class="cx"> unobscuredRect:unobscuredRectInContentCoordinates
</span><span class="cx"> unobscuredRectInScrollViewCoordinates:unobscuredRect
</span><span class="lines">@@ -2228,6 +2230,8 @@
</span><span class="cx">
</span><span class="cx"> _frozenVisibleContentRect = [self convertRect:fullViewRect toView:_contentView.get()];
</span><span class="cx"> _frozenUnobscuredContentRect = [self convertRect:unobscuredRect toView:_contentView.get()];
</span><ins>+
+ LOG_WITH_STREAM(VisibleRects, stream << "_navigationGestureDidBegin: freezing visibleContentRect " << _frozenVisibleContentRect.value() << " UnobscuredContentRect " << _frozenUnobscuredContentRect.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_navigationGestureDidEnd
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><del>-#include "Logging.h"
</del><ins>+#include "LogInitialization.h"
</ins><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #include <WebCore/ApplicationCacheStorage.h>
</span><span class="cx"> #include <WebCore/Language.h>
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><del>-#include <WebCore/Logging.h>
</del><ins>+#include <WebCore/LogInitialization.h>
</ins><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <runtime/JSCInlines.h>
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> addLanguageChangeObserver(this, languageChanged);
</span><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><del>- WebCore::initializeLoggingChannelsIfNecessary();
</del><ins>+ WebCore::initializeLogChannelsIfNecessary();
</ins><span class="cx"> WebKit::initializeLogChannelsIfNecessary();
</span><span class="cx"> #endif // !LOG_DISABLED
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> 0FCB4E6918BBE3D9000FCFC9 /* WKTextInputWindowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */; };
</span><span class="cx"> 0FCB4E6C18BBF26A000FCFC9 /* WKContentViewInteraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */; };
</span><span class="cx"> 0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
</span><ins>+ 0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */; };
</ins><span class="cx"> 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
</span><span class="cx"> 0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
</span><span class="cx"> 0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */; };
</span><span class="lines">@@ -2065,6 +2066,7 @@
</span><span class="cx"> 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKTextInputWindowController.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FCB4E6A18BBF26A000FCFC9 /* WKContentViewInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKContentViewInteraction.h; path = ios/WKContentViewInteraction.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKContentViewInteraction.mm; path = ios/WKContentViewInteraction.mm; sourceTree = "<group>"; };
</span><ins>+ 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogInitialization.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeDrawingAreaProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FF24A2F1879E4FE003ABF0C /* RemoteLayerTreeDrawingAreaProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteLayerTreeDrawingAreaProxy.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -6541,6 +6543,7 @@
</span><span class="cx"> 1A7E814E1152D2240003695B /* mac */,
</span><span class="cx"> CE1A0BCA1A48E6C60054EF74 /* spi */,
</span><span class="cx"> 51B15A7D138439B200321AD8 /* unix */,
</span><ins>+ 0FDCD7F61D47E92A009F08BC /* LogInitialization.h */,
</ins><span class="cx"> 51A7F2F4125BF8D4008AEB1D /* Logging.cpp */,
</span><span class="cx"> 51A7F2F2125BF820008AEB1D /* Logging.h */,
</span><span class="cx"> C0E3AA451209E2BA00A49D01 /* Module.cpp */,
</span><span class="lines">@@ -8059,6 +8062,7 @@
</span><span class="cx"> 933DF82E1B3BC09000AEA9E3 /* WKImagePreviewViewController.h in Headers */,
</span><span class="cx"> 9321D5861A38EE3C008052BE /* WKImmediateActionController.h in Headers */,
</span><span class="cx"> 9321D58A1A38F196008052BE /* WKImmediateActionTypes.h in Headers */,
</span><ins>+ 0FDCD7F71D47E92A009F08BC /* LogInitialization.h in Headers */,
</ins><span class="cx"> 1C8E293912761E5B00BC7BD0 /* WKInspector.h in Headers */,
</span><span class="cx"> 0F3C725B196F604E00AEDD0C /* WKInspectorHighlightView.h in Headers */,
</span><span class="cx"> A54293A4195A43DA002782C7 /* WKInspectorNodeSearchGestureRecognizer.h in Headers */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-26 23:15:14 UTC (rev 203748)
+++ trunk/Tools/ChangeLog 2016-07-26 23:30:01 UTC (rev 203749)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-26 Simon Fraser <simon.fraser@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2016-07-26 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Networking process crash due to missing -[WebCoreAuthenticationClientAsChallengeSender performDefaultHandlingForAuthenticationChallenge:] implementation
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSCTestRunnerUtils.h>
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> #include <JavaScriptCore/JSRetainPtr.h>
</span><del>-#include <WebCore/Logging.h>
</del><ins>+#include <WebCore/LogInitialization.h>
</ins><span class="cx"> #include <cstring>
</span><span class="cx"> #include <locale.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (203748 => 203749)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #import <JavaScriptCore/HeapStatistics.h>
</span><span class="cx"> #import <JavaScriptCore/LLIntData.h>
</span><span class="cx"> #import <JavaScriptCore/Options.h>
</span><del>-#import <WebCore/Logging.h>
</del><ins>+#import <WebCore/LogInitialization.h>
</ins><span class="cx"> #import <WebKit/DOMElement.h>
</span><span class="cx"> #import <WebKit/DOMExtensions.h>
</span><span class="cx"> #import <WebKit/DOMRange.h>
</span><span class="lines">@@ -1888,7 +1888,7 @@
</span><span class="cx"> [mainFrame _clearOpener];
</span><span class="cx">
</span><span class="cx"> resetAccumulatedLogs();
</span><del>- WebCoreTestSupport::initializeLoggingChannelsIfNecessary();
</del><ins>+ WebCoreTestSupport::initializeLogChannelsIfNecessary();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>