<!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>[178545] trunk/Source</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/178545">178545</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-15 17:07:32 -0800 (Thu, 15 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Wire diagnostic logging messages through the UIProcess
https://bugs.webkit.org/show_bug.cgi?id=140486
Reviewed by Sam Weinig.
Wire diagnostic logging messages through the UIProcess.
Eventually, the corresponding bundle API should go away.
Source/WebCore:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
Add page/DiagnosticLoggingResultType.h to Windows project.
* WebCore.xcodeproj/project.pbxproj:
Add page/DiagnosticLoggingResultType.h to XCode project.
* html/HTMLMediaElement.cpp:
* loader/EmptyClients.h:
* loader/FrameLoader.cpp:
* page/DiagnosticLoggingClient.h:
* page/DiagnosticLoggingResultType.h: Copied from Source/WebCore/page/DiagnosticLoggingClient.h.
Use new DiagnosticLoggingResultType enum instead of old
DiagnosticLoggingClient::LogType one.
Source/WebKit2:
* CMakeLists.txt:
Add UIProcess/WebPageDiagnosticLoggingClient.cpp to CMake.
* Shared/API/c/WKDiagnosticLoggingResultType.h:
Extract WKDiagnosticLoggingResultType enumeration from
WKBundlePageDiagnosticLoggingClient.h into its own header so that
it can be shared with the new WKPageDiagnosticLoggingClient.h.
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI):
(WebKit::toDiagnosticLoggingResultType):
Add WebCore::DiagnosticLoggingResultType <-> WKDiagnosticLoggingResultType
casting functions.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageDiagnosticLoggingClient):
* UIProcess/API/C/WKPage.h:
Add WKPage API so that the application can set the DiagnosticLoggingClient.
* UIProcess/API/C/WKPageDiagnosticLoggingClient.h: Added.
New WK2 diagnostic logging client that will eventually replace the existing
WKBundlePageDiagnosticLoggingClient.h injected bundle client.
* UIProcess/WebPageDiagnosticLoggingClient.cpp: Copied from Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp.
* UIProcess/WebPageDiagnosticLoggingClient.h: Copied from Source/WebCore/page/DiagnosticLoggingClient.h.
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
Handle new IPC messages for logging diagnostic messages.
* UIProcess/WebPageProxy.messages.in:
Add 3 IPC messages for logging diagnostic messages.
* WebKit2.xcodeproj/project.pbxproj:
Add new files to XCode project.
* WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
Remove WKDiagnosticLoggingResultType enum as it was moved to its own
header.
* WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp:
* WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h:
Use WebCore::DiagnosticLoggingResultType enum type instead of
WKDiagnosticLoggingResultType and call toAPI() to convert to
WKDiagnosticLoggingResultType type.
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
Send IPC to WebPageProxy in addition to calling the injected bundle client.
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:
Use new DiagnosticLoggingResultType enum instead of the old LogType one.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingClienth">trunk/Source/WebCore/page/DiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageh">trunk/Source/WebKit2/UIProcess/API/C/WKPage.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingResultTypeh">trunk/Source/WebCore/page/DiagnosticLoggingResultType.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDiagnosticLoggingResultTypeh">trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageDiagnosticLoggingClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageDiagnosticLoggingClientcpp">trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageDiagnosticLoggingClienth">trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/ChangeLog 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-01-15 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Wire diagnostic logging messages through the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=140486
+
+ Reviewed by Sam Weinig.
+
+ Wire diagnostic logging messages through the UIProcess.
+ Eventually, the corresponding bundle API should go away.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ Add page/DiagnosticLoggingResultType.h to Windows project.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Add page/DiagnosticLoggingResultType.h to XCode project.
+
+ * html/HTMLMediaElement.cpp:
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ * page/DiagnosticLoggingClient.h:
+ * page/DiagnosticLoggingResultType.h: Copied from Source/WebCore/page/DiagnosticLoggingClient.h.
+ Use new DiagnosticLoggingResultType enum instead of old
+ DiagnosticLoggingClient::LogType one.
+
</ins><span class="cx"> 2015-01-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Reduce LayoutRect::infiniteRect() usage.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -19069,6 +19069,7 @@
</span><span class="cx"> <ClInclude Include="..\page\DeviceClient.h" />
</span><span class="cx"> <ClInclude Include="..\page\DeviceController.h" />
</span><span class="cx"> <ClInclude Include="..\page\DiagnosticLoggingKeys.h" />
</span><ins>+ <ClInclude Include="..\page\DiagnosticLoggingResultType.h" />
</ins><span class="cx"> <ClInclude Include="..\page\DOMSelection.h" />
</span><span class="cx"> <ClInclude Include="..\page\DOMTimer.h" />
</span><span class="cx"> <ClInclude Include="..\page\DOMWindow.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -7590,6 +7590,9 @@
</span><span class="cx"> <ClInclude Include="..\page\DiagnosticLoggingKeys.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\page\DiagnosticLoggingResultType.h">
+ <Filter>page</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\page\DOMSelection.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -2549,6 +2549,7 @@
</span><span class="cx"> 835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 835D363619FF6193004C93AB /* StyleBuilderCustom.h */; };
</span><span class="cx"> 836FBCEA178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */; };
</span><span class="cx"> 836FBCEC178C117F00B21A15 /* SVGAnimatedProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */; };
</span><ins>+ 8372DB311A6780A800C697C5 /* DiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB301A6780A800C697C5 /* DiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; };
</span><span class="cx"> 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */; };
</span><span class="cx"> 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */; };
</span><span class="lines">@@ -9715,6 +9716,7 @@
</span><span class="cx"> 835D363619FF6193004C93AB /* StyleBuilderCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilderCustom.h; sourceTree = "<group>"; };
</span><span class="cx"> 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedProperty.cpp; sourceTree = "<group>"; };
</span><ins>+ 8372DB301A6780A800C697C5 /* DiagnosticLoggingResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticLoggingResultType.h; sourceTree = "<group>"; };
</ins><span class="cx"> 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilder.h; sourceTree = "<group>"; };
</span><span class="cx"> 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleBuilder.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 839AAFEA1A0C0C8D00605F99 /* HTMLWBRElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLWBRElement.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16572,6 +16574,7 @@
</span><span class="cx"> CCC2B51215F613060048CDD6 /* DeviceController.h */,
</span><span class="cx"> CD37B37415C1A7E1006DC898 /* DiagnosticLoggingKeys.cpp */,
</span><span class="cx"> CD37B37515C1A7E1006DC898 /* DiagnosticLoggingKeys.h */,
</span><ins>+ 8372DB301A6780A800C697C5 /* DiagnosticLoggingResultType.h */,
</ins><span class="cx"> 2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */,
</span><span class="cx"> 2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */,
</span><span class="cx"> BC5A86810C33676000EEA649 /* DOMSelection.cpp */,
</span><span class="lines">@@ -26072,6 +26075,7 @@
</span><span class="cx"> BC7FA62D0D1F0EFF00DB22A9 /* StaticNodeList.h in Headers */,
</span><span class="cx"> A5AFB350115151A700B045CB /* StepRange.h in Headers */,
</span><span class="cx"> 1AC2D845171734A100652FC0 /* Storage.h in Headers */,
</span><ins>+ 8372DB311A6780A800C697C5 /* DiagnosticLoggingResultType.h in Headers */,
</ins><span class="cx"> 51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */,
</span><span class="cx"> 51E0BABB0DA5547100A9E417 /* StorageEvent.h in Headers */,
</span><span class="cx"> C5EBDD84105EDDEC0056816F /* StorageEventDispatcher.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -1837,7 +1837,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!succeeded) {
</span><del>- diagnosticLoggingClient->logDiagnosticMessageWithResult(DiagnosticLoggingKeys::mediaLoadingFailedKey(), errorMessage, DiagnosticLoggingClient::Fail);
</del><ins>+ diagnosticLoggingClient->logDiagnosticMessageWithResult(DiagnosticLoggingKeys::mediaLoadingFailedKey(), errorMessage, DiagnosticLoggingResultFail);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -635,7 +635,7 @@
</span><span class="cx">
</span><span class="cx"> class EmptyDiagnosticLoggingClient : public DiagnosticLoggingClient {
</span><span class="cx"> virtual void logDiagnosticMessage(const String&, const String&) override { }
</span><del>- virtual void logDiagnosticMessageWithResult(const String&, const String&, LogResultType) override { }
</del><ins>+ virtual void logDiagnosticMessageWithResult(const String&, const String&, DiagnosticLoggingResultType) override { }
</ins><span class="cx"> virtual void logDiagnosticMessageWithValue(const String&, const String&, const String&) override { }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -2297,7 +2297,7 @@
</span><span class="cx"> if (!diagnosticLoggingClient)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- diagnosticLoggingClient->logDiagnosticMessageWithResult(DiagnosticLoggingKeys::pageLoadedKey(), emptyString(), error.isNull() ? DiagnosticLoggingClient::Pass : DiagnosticLoggingClient::Fail);
</del><ins>+ diagnosticLoggingClient->logDiagnosticMessageWithResult(DiagnosticLoggingKeys::pageLoadedKey(), emptyString(), error.isNull() ? DiagnosticLoggingResultPass : DiagnosticLoggingResultFail);
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingClient.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef DiagnosticLoggingClient_h
</span><span class="cx"> #define DiagnosticLoggingClient_h
</span><span class="cx">
</span><ins>+#include "DiagnosticLoggingResultType.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -33,13 +34,7 @@
</span><span class="cx"> class DiagnosticLoggingClient {
</span><span class="cx"> public:
</span><span class="cx"> virtual void logDiagnosticMessage(const String& message, const String& description) { UNUSED_PARAM(message); UNUSED_PARAM(description); }
</span><del>-
- enum LogResultType {
- Pass,
- Fail,
- Noop,
- };
- virtual void logDiagnosticMessageWithResult(const String& message, const String& description, LogResultType) { UNUSED_PARAM(message); UNUSED_PARAM(description); }
</del><ins>+ virtual void logDiagnosticMessageWithResult(const String& message, const String& description, DiagnosticLoggingResultType) { UNUSED_PARAM(message); UNUSED_PARAM(description); }
</ins><span class="cx"> virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value) { UNUSED_PARAM(message); UNUSED_PARAM(description); UNUSED_PARAM(value); }
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingResultTypehfromrev178544trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/DiagnosticLoggingResultType.h (from rev 178544, trunk/Source/WebCore/page/DiagnosticLoggingClient.h) (0 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingResultType.h (rev 0)
+++ trunk/Source/WebCore/page/DiagnosticLoggingResultType.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef DiagnosticLoggingResultType_h
+#define DiagnosticLoggingResultType_h
+
+namespace WebCore {
+
+enum DiagnosticLoggingResultType {
+ DiagnosticLoggingResultPass,
+ DiagnosticLoggingResultFail,
+ DiagnosticLoggingResultNoop,
+};
+
+} // namespace WebCore
+
+#endif // DiagnosticLoggingResultType_h
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -350,6 +350,7 @@
</span><span class="cx"> UIProcess/WebOpenPanelResultListenerProxy.cpp
</span><span class="cx"> UIProcess/WebOriginDataManagerProxy.cpp
</span><span class="cx"> UIProcess/WebPageContextMenuClient.cpp
</span><ins>+ UIProcess/WebPageDiagnosticLoggingClient.cpp
</ins><span class="cx"> UIProcess/WebPageGroup.cpp
</span><span class="cx"> UIProcess/WebPageProxy.cpp
</span><span class="cx"> UIProcess/WebPasteboardProxy.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2015-01-15 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Wire diagnostic logging messages through the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=140486
+
+ Reviewed by Sam Weinig.
+
+ Wire diagnostic logging messages through the UIProcess.
+ Eventually, the corresponding bundle API should go away.
+
+ * CMakeLists.txt:
+ Add UIProcess/WebPageDiagnosticLoggingClient.cpp to CMake.
+
+ * Shared/API/c/WKDiagnosticLoggingResultType.h:
+ Extract WKDiagnosticLoggingResultType enumeration from
+ WKBundlePageDiagnosticLoggingClient.h into its own header so that
+ it can be shared with the new WKPageDiagnosticLoggingClient.h.
+
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI):
+ (WebKit::toDiagnosticLoggingResultType):
+ Add WebCore::DiagnosticLoggingResultType <-> WKDiagnosticLoggingResultType
+ casting functions.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageDiagnosticLoggingClient):
+ * UIProcess/API/C/WKPage.h:
+ Add WKPage API so that the application can set the DiagnosticLoggingClient.
+
+ * UIProcess/API/C/WKPageDiagnosticLoggingClient.h: Added.
+ New WK2 diagnostic logging client that will eventually replace the existing
+ WKBundlePageDiagnosticLoggingClient.h injected bundle client.
+
+ * UIProcess/WebPageDiagnosticLoggingClient.cpp: Copied from Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp.
+ * UIProcess/WebPageDiagnosticLoggingClient.h: Copied from Source/WebCore/page/DiagnosticLoggingClient.h.
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ Handle new IPC messages for logging diagnostic messages.
+
+ * UIProcess/WebPageProxy.messages.in:
+ Add 3 IPC messages for logging diagnostic messages.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files to XCode project.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
+ Remove WKDiagnosticLoggingResultType enum as it was moved to its own
+ header.
+
+ * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h:
+ Use WebCore::DiagnosticLoggingResultType enum type instead of
+ WKDiagnosticLoggingResultType and call toAPI() to convert to
+ WKDiagnosticLoggingResultType type.
+
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
+ Send IPC to WebPageProxy in addition to calling the injected bundle client.
+
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h:
+ Use new DiagnosticLoggingResultType enum instead of the old LogType one.
+
</ins><span class="cx"> 2015-01-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Added availability annotations to modern Cocoa SPI.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDiagnosticLoggingResultTypehfromrev178544trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h (from rev 178544, trunk/Source/WebCore/page/DiagnosticLoggingClient.h) (0 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2015 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.
+ */
+
+#ifndef WKDiagnosticLoggingResultType_h
+#define WKDiagnosticLoggingResultType_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+ kWKDiagnosticLoggingResultPass = 0,
+ kWKDiagnosticLoggingResultFail = 1,
+ kWKDiagnosticLoggingResultNoop = 2,
+};
+typedef uint32_t WKDiagnosticLoggingResultType;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKDiagnosticLoggingResultType_h */
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "SameDocumentNavigationType.h"
</span><span class="cx"> #include "WKBase.h"
</span><span class="cx"> #include "WKContextMenuItemTypes.h"
</span><ins>+#include "WKDiagnosticLoggingResultType.h"
</ins><span class="cx"> #include "WKEvent.h"
</span><span class="cx"> #include "WKFindOptions.h"
</span><span class="cx"> #include "WKGeometry.h"
</span><span class="lines">@@ -50,6 +51,7 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include <WebCore/ContextMenuItem.h>
</span><ins>+#include <WebCore/DiagnosticLoggingResultType.h>
</ins><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="lines">@@ -825,6 +827,44 @@
</span><span class="cx"> return type;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline WKDiagnosticLoggingResultType toAPI(WebCore::DiagnosticLoggingResultType type)
+{
+ WKDiagnosticLoggingResultType wkType;
+
+ switch (type) {
+ case WebCore::DiagnosticLoggingResultPass:
+ wkType = kWKDiagnosticLoggingResultPass;
+ break;
+ case WebCore::DiagnosticLoggingResultFail:
+ wkType = kWKDiagnosticLoggingResultFail;
+ break;
+ case WebCore::DiagnosticLoggingResultNoop:
+ wkType = kWKDiagnosticLoggingResultNoop;
+ break;
+ }
+
+ return wkType;
+}
+
+inline WebCore::DiagnosticLoggingResultType toDiagnosticLoggingResultType(WKDiagnosticLoggingResultType wkType)
+{
+ WebCore::DiagnosticLoggingResultType type;
+
+ switch (wkType) {
+ case kWKDiagnosticLoggingResultPass:
+ type = WebCore::DiagnosticLoggingResultPass;
+ break;
+ case kWKDiagnosticLoggingResultFail:
+ type = WebCore::DiagnosticLoggingResultFail;
+ break;
+ case kWKDiagnosticLoggingResultNoop:
+ type = WebCore::DiagnosticLoggingResultNoop;
+ break;
+ }
+
+ return type;
+}
+
</ins><span class="cx"> inline WKLayoutMilestones toWKLayoutMilestones(WebCore::LayoutMilestones milestones)
</span><span class="cx"> {
</span><span class="cx"> unsigned wkMilestones = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -727,6 +727,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPageSetPageDiagnosticLoggingClient(WKPageRef pageRef, const WKPageDiagnosticLoggingClientBase* wkClient)
+{
+ toImpl(pageRef)->initializeDiagnosticLoggingClient(wkClient);
+}
+
</ins><span class="cx"> void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClientBase* wkClient)
</span><span class="cx"> {
</span><span class="cx"> class FindClient : public API::Client<WKPageFindClientBase>, public API::FindClient {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <WebKit/WKGeometry.h>
</span><span class="cx"> #include <WebKit/WKNativeEvent.h>
</span><span class="cx"> #include <WebKit/WKPageContextMenuClient.h>
</span><ins>+#include <WebKit/WKPageDiagnosticLoggingClient.h>
</ins><span class="cx"> #include <WebKit/WKPageFindClient.h>
</span><span class="cx"> #include <WebKit/WKPageFindMatchesClient.h>
</span><span class="cx"> #include <WebKit/WKPageFormClient.h>
</span><span class="lines">@@ -207,6 +208,7 @@
</span><span class="cx"> WK_EXPORT void WKPageSelectFindMatch(WKPageRef page, int32_t matchIndex);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPageSetPageContextMenuClient(WKPageRef page, const WKPageContextMenuClientBase* client);
</span><ins>+WK_EXPORT void WKPageSetPageDiagnosticLoggingClient(WKPageRef page, const WKPageDiagnosticLoggingClientBase* client);
</ins><span class="cx"> WK_EXPORT void WKPageSetPageFindClient(WKPageRef page, const WKPageFindClientBase* client);
</span><span class="cx"> WK_EXPORT void WKPageSetPageFindMatchesClient(WKPageRef page, const WKPageFindMatchesClientBase* client);
</span><span class="cx"> WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClientBase* client);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageDiagnosticLoggingClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h (0 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef WKPageDiagnosticLoggingClient_h
+#define WKPageDiagnosticLoggingClient_h
+
+#include <WebKit/WKBase.h>
+#include <WebKit/WKDiagnosticLoggingResultType.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void (*WKPageLogDiagnosticMessageCallback)(WKPageRef page, WKStringRef message, WKStringRef description, const void* clientInfo);
+typedef void (*WKPageLogDiagnosticMessageWithResultCallback)(WKPageRef page, WKStringRef message, WKStringRef description, WKDiagnosticLoggingResultType result, const void* clientInfo);
+typedef void (*WKPageLogDiagnosticMessageWithValueCallback)(WKPageRef page, WKStringRef message, WKStringRef description, WKStringRef value, const void* clientInfo);
+
+typedef struct WKPageDiagnosticLoggingClientBase {
+ int version;
+ const void * clientInfo;
+} WKPageDiagnosticLoggingClientBase;
+
+typedef struct WKPageDiagnosticLoggingClientV0 {
+ WKPageDiagnosticLoggingClientBase base;
+
+ // Version 0.
+ WKPageLogDiagnosticMessageCallback logDiagnosticMessage;
+ WKPageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
+ WKPageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
+} WKPageDiagnosticLoggingClientV0;
+
+enum { kWKPageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
+typedef struct WKPageDiagnosticLoggingClient {
+ int version;
+ const void * clientInfo;
+
+ // Version 0.
+ WKPageLogDiagnosticMessageCallback logDiagnosticMessage;
+ WKPageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
+ WKPageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
+} WKPageDiagnosticLoggingClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // WKPageDiagnosticLoggingClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageDiagnosticLoggingClientcppfromrev178544trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClientcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.cpp (from rev 178544, trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp) (0 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#include "config.h"
+#include "WebPageDiagnosticLoggingClient.h"
+
+#include "WKAPICast.h"
+#include "WebPageProxy.h"
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+
+void WebPageDiagnosticLoggingClient::logDiagnosticMessage(WebPageProxy* page, const String& message, const String& description)
+{
+ if (!m_client.logDiagnosticMessage)
+ return;
+
+ m_client.logDiagnosticMessage(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), m_client.base.clientInfo);
+}
+
+void WebPageDiagnosticLoggingClient::logDiagnosticMessageWithResult(WebPageProxy* page, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
+{
+ if (!m_client.logDiagnosticMessageWithResult)
+ return;
+
+ m_client.logDiagnosticMessageWithResult(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(result), m_client.base.clientInfo);
+}
+
+void WebPageDiagnosticLoggingClient::logDiagnosticMessageWithValue(WebPageProxy* page, const String& message, const String& description, const String& value)
+{
+ if (!m_client.logDiagnosticMessageWithValue)
+ return;
+
+ m_client.logDiagnosticMessageWithValue(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(value.impl()), m_client.base.clientInfo);
+}
+
+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageDiagnosticLoggingClienthfromrev178544trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.h (from rev 178544, trunk/Source/WebCore/page/DiagnosticLoggingClient.h) (0 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/WebPageDiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#ifndef WebPageDiagnosticLoggingClient_h
+#define WebPageDiagnosticLoggingClient_h
+
+#include "APIClient.h"
+#include "WKPage.h"
+#include <WebCore/DiagnosticLoggingResultType.h>
+#include <wtf/Forward.h>
+
+namespace API {
+
+template<> struct ClientTraits<WKPageDiagnosticLoggingClientBase> {
+ typedef std::tuple<WKPageDiagnosticLoggingClientV0> Versions;
+};
+
+} // namespace API
+
+namespace WebKit {
+
+class WebPageProxy;
+
+class WebPageDiagnosticLoggingClient : public API::Client<WKPageDiagnosticLoggingClientBase> {
+public:
+ void logDiagnosticMessage(WebPageProxy*, const String& message, const String& description);
+ void logDiagnosticMessageWithResult(WebPageProxy*, const String& message, const String& description, WebCore::DiagnosticLoggingResultType);
+ void logDiagnosticMessageWithValue(WebPageProxy*, const String& message, const String& description, const String& value);
+};
+
+} // namespace WebKit
+
+#endif // WebPageDiagnosticLoggingClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -550,6 +550,11 @@
</span><span class="cx"> m_findMatchesClient.initialize(client);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::initializeDiagnosticLoggingClient(const WKPageDiagnosticLoggingClientBase* client)
+{
+ m_diagnosticLoggingClient.initialize(client);
+}
+
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> void WebPageProxy::initializeContextMenuClient(const WKPageContextMenuClientBase* client)
</span><span class="cx"> {
</span><span class="lines">@@ -701,12 +706,13 @@
</span><span class="cx"> m_formClient = std::make_unique<API::FormClient>();
</span><span class="cx"> m_uiClient = std::make_unique<API::UIClient>();
</span><span class="cx"> #if PLATFORM(EFL)
</span><del>- m_uiPopupMenuClient.initialize(0);
</del><ins>+ m_uiPopupMenuClient.initialize(nullptr);
</ins><span class="cx"> #endif
</span><span class="cx"> m_findClient = std::make_unique<API::FindClient>();
</span><del>- m_findMatchesClient.initialize(0);
</del><ins>+ m_findMatchesClient.initialize(nullptr);
+ m_diagnosticLoggingClient.initialize(nullptr);
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- m_contextMenuClient.initialize(0);
</del><ins>+ m_contextMenuClient.initialize(nullptr);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_webProcessLifetimeTracker.pageWasInvalidated();
</span><span class="lines">@@ -4379,6 +4385,21 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(range);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::logDiagnosticMessage(const String& message, const String& description)
+{
+ m_diagnosticLoggingClient.logDiagnosticMessage(this, message, description);
+}
+
+void WebPageProxy::logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result)
+{
+ m_diagnosticLoggingClient.logDiagnosticMessageWithResult(this, message, description, static_cast<WebCore::DiagnosticLoggingResultType>(result));
+}
+
+void WebPageProxy::logDiagnosticMessageWithValue(const String& message, const String& description, const String& value)
+{
+ m_diagnosticLoggingClient.logDiagnosticMessageWithValue(this, message, description, value);
+}
+
</ins><span class="cx"> void WebPageProxy::rectForCharacterRangeCallback(const IntRect& rect, const EditingRange& actualRange, uint64_t callbackID)
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK(actualRange.isValid());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #include "WebFrameProxy.h"
</span><span class="cx"> #include "WebPageContextMenuClient.h"
</span><span class="cx"> #include "WebPageCreationParameters.h"
</span><ins>+#include "WebPageDiagnosticLoggingClient.h"
</ins><span class="cx"> #include "WebPreferences.h"
</span><span class="cx"> #include <WebCore/AlternativeTextClient.h> // FIXME: Needed by WebPageProxyMessages.h for DICTATION_ALTERNATIVES.
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="lines">@@ -311,6 +312,7 @@
</span><span class="cx"> API::FindClient& findClient() { return *m_findClient; }
</span><span class="cx"> void setFindClient(std::unique_ptr<API::FindClient>);
</span><span class="cx"> void initializeFindMatchesClient(const WKPageFindMatchesClientBase*);
</span><ins>+ void initializeDiagnosticLoggingClient(const WKPageDiagnosticLoggingClientBase*);
</ins><span class="cx"> void setFormClient(std::unique_ptr<API::FormClient>);
</span><span class="cx"> void setLoaderClient(std::unique_ptr<API::LoaderClient>);
</span><span class="cx"> void setPolicyClient(std::unique_ptr<API::PolicyClient>);
</span><span class="lines">@@ -1219,6 +1221,11 @@
</span><span class="cx"> void setCursor(const WebCore::Cursor&);
</span><span class="cx"> void setCursorHiddenUntilMouseMoves(bool);
</span><span class="cx">
</span><ins>+ // Diagnostic messages logging.
+ void logDiagnosticMessage(const String& message, const String& description);
+ void logDiagnosticMessageWithResult(const String& message, const String& description, uint32_t result);
+ void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value);
+
</ins><span class="cx"> void didReceiveEvent(uint32_t opaqueType, bool handled);
</span><span class="cx"> void stopResponsivenessTimer();
</span><span class="cx">
</span><span class="lines">@@ -1360,6 +1367,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<API::FindClient> m_findClient;
</span><span class="cx"> WebFindMatchesClient m_findMatchesClient;
</span><ins>+ WebPageDiagnosticLoggingClient m_diagnosticLoggingClient;
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> WebPageContextMenuClient m_contextMenuClient;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -222,6 +222,11 @@
</span><span class="cx"> CanUndoRedo(uint32_t action) -> (bool result)
</span><span class="cx"> ExecuteUndoRedo(uint32_t action) -> (bool result)
</span><span class="cx">
</span><ins>+ # Diagnostic messages logging
+ LogDiagnosticMessage(String message, String description)
+ LogDiagnosticMessageWithResult(String message, String description, uint32_t result)
+ LogDiagnosticMessageWithValue(String message, String description, String value)
+
</ins><span class="cx"> # Editor notifications
</span><span class="cx"> EditorStateChanged(struct WebKit::EditorState editorState)
</span><span class="cx"> CompositionWasCanceled(struct WebKit::EditorState editorState)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -1106,6 +1106,10 @@
</span><span class="cx"> 7CF47FFE17276AE3008ACB91 /* WKBundlePageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CF47FFC17276AE3008ACB91 /* WKBundlePageBannerMac.mm */; };
</span><span class="cx"> 7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7EC4F0F918E4A945008056AF /* NetworkProcessCocoa.mm */; };
</span><ins>+ 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */; };
+ 8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */; };
+ 8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 84477853176FCC0800CDC7BB /* InjectedBundleHitTestResultMediaType.h in Headers */ = {isa = PBXBuildFile; fileRef = 84477851176FCAC100CDC7BB /* InjectedBundleHitTestResultMediaType.h */; };
</span><span class="cx"> 868160D0187645570021E79D /* WindowServerConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 868160CF187645370021E79D /* WindowServerConnection.mm */; };
</span><span class="cx"> 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E67A21190F411800004AB7 /* ProcessThrottler.h */; };
</span><span class="lines">@@ -3215,6 +3219,10 @@
</span><span class="cx"> 7CF47FFC17276AE3008ACB91 /* WKBundlePageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKBundlePageBannerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageBannerMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 7EC4F0F918E4A945008056AF /* NetworkProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessCocoa.mm; path = NetworkProcess/cocoa/NetworkProcessCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
+ 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
+ 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
+ 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDiagnosticLoggingResultType.h; sourceTree = "<group>"; };
</ins><span class="cx"> 84477851176FCAC100CDC7BB /* InjectedBundleHitTestResultMediaType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleHitTestResultMediaType.h; sourceTree = "<group>"; };
</span><span class="cx"> 868160CD18763D4B0021E79D /* WindowServerConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WindowServerConnection.h; sourceTree = "<group>"; };
</span><span class="cx"> 868160CF187645370021E79D /* WindowServerConnection.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WindowServerConnection.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -6003,6 +6011,8 @@
</span><span class="cx"> 755422C018062BE40046F6A8 /* WebOriginDataManagerProxy.messages.in */,
</span><span class="cx"> 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */,
</span><span class="cx"> 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */,
</span><ins>+ 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */,
+ 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */,
</ins><span class="cx"> BC7B6205129A0A6700D174A4 /* WebPageGroup.cpp */,
</span><span class="cx"> BC7B6204129A0A6700D174A4 /* WebPageGroup.h */,
</span><span class="cx"> BC111B0B112F5E4F00337BAB /* WebPageProxy.cpp */,
</span><span class="lines">@@ -6141,6 +6151,7 @@
</span><span class="cx"> BCD597D4112B56DC00EC8C23 /* WKPage.cpp */,
</span><span class="cx"> BCD597D5112B56DC00EC8C23 /* WKPage.h */,
</span><span class="cx"> 1AB8A1F718400BB800E9AE69 /* WKPageContextMenuClient.h */,
</span><ins>+ 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */,
</ins><span class="cx"> 1AB8A1F318400B8F00E9AE69 /* WKPageFindClient.h */,
</span><span class="cx"> 1AB8A1F518400B9D00E9AE69 /* WKPageFindMatchesClient.h */,
</span><span class="cx"> 1AB8A1EF18400B0000E9AE69 /* WKPageFormClient.h */,
</span><span class="lines">@@ -6847,6 +6858,7 @@
</span><span class="cx"> BC4075DC124FF0270068F20A /* WKData.h */,
</span><span class="cx"> 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */,
</span><span class="cx"> 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */,
</span><ins>+ 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */,
</ins><span class="cx"> BC4075DD124FF0270068F20A /* WKDictionary.cpp */,
</span><span class="cx"> BC4075DE124FF0270068F20A /* WKDictionary.h */,
</span><span class="cx"> BC4075DF124FF0270068F20A /* WKErrorRef.cpp */,
</span><span class="lines">@@ -7378,6 +7390,7 @@
</span><span class="cx"> BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */,
</span><span class="cx"> 518E8F0816B2093700E91429 /* Download.h in Headers */,
</span><span class="cx"> 518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */,
</span><ins>+ 8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */,
</ins><span class="cx"> A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
</span><span class="cx"> 518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */,
</span><span class="cx"> 1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */,
</span><span class="lines">@@ -7576,6 +7589,7 @@
</span><span class="cx"> 33152976130D0CB200ED2483 /* SecurityOriginData.h in Headers */,
</span><span class="cx"> 514D9F5719119D35000063A7 /* ServicesController.h in Headers */,
</span><span class="cx"> 1AFDE65A1954A42B00C48FFA /* SessionState.h in Headers */,
</span><ins>+ 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */,
</ins><span class="cx"> 1A002D49196B345D00B9AD44 /* SessionStateCoding.h in Headers */,
</span><span class="cx"> 753E3E0E1887398900188496 /* SessionTracker.h in Headers */,
</span><span class="cx"> 1A6420E512DCE2FF00CAAE2C /* ShareableBitmap.h in Headers */,
</span><span class="lines">@@ -7846,6 +7860,7 @@
</span><span class="cx"> BC20528111C94284008F3375 /* WKBundlePage.h in Headers */,
</span><span class="cx"> 7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */,
</span><span class="cx"> 7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */,
</span><ins>+ 8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */,
</ins><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
</span><span class="cx"> 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
</span><span class="cx"> 1AB474E0184D446A0051B622 /* WKBundlePageEditorClient.h in Headers */,
</span><span class="lines">@@ -8995,6 +9010,7 @@
</span><span class="cx"> A115DC71191D82D700DA8072 /* _WKWebViewPrintFormatter.mm in Sources */,
</span><span class="cx"> 2D353B1219F8305D000EEACD /* ActionMenuHitTestResult.mm in Sources */,
</span><span class="cx"> A7D792D61767CB6E00881CBE /* ActivityAssertion.cpp in Sources */,
</span><ins>+ 8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */,
</ins><span class="cx"> BC64696F11DBE603006455B0 /* APIArray.cpp in Sources */,
</span><span class="cx"> 1AAB037C185F99D800EDF501 /* APIData.cpp in Sources */,
</span><span class="cx"> 1A1EF1991A1D5B420023200A /* APIDataCocoa.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -27,14 +27,8 @@
</span><span class="cx"> #define WKBundlePageDiagnosticLoggingClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><ins>+#include <WebKit/WKDiagnosticLoggingResultType.h>
</ins><span class="cx">
</span><del>-enum {
- kWKDiagnosticLoggingResultPass = 0,
- kWKDiagnosticLoggingResultFail = 1,
- kWKDiagnosticLoggingResultNoop = 2,
-};
-typedef uint32_t WKDiagnosticLoggingResultType;
-
</del><span class="cx"> typedef void (*WKBundlePageDiagnosticLoggingCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef success, const void* clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageLogDiagnosticMessageCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, const void* clientInfo);
</span><span class="cx"> typedef void (*WKBundlePageLogDiagnosticMessageWithResultCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKDiagnosticLoggingResultType result, const void* clientInfo);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -46,11 +46,11 @@
</span><span class="cx"> m_client.logDiagnosticMessage(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageWithResult(WebPage* page, const String& message, const String& description, WKDiagnosticLoggingResultType result)
</del><ins>+void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageWithResult(WebPage* page, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.logDiagnosticMessageWithResult)
</span><span class="cx"> return;
</span><del>- m_client.logDiagnosticMessageWithResult(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), result, m_client.base.clientInfo);
</del><ins>+ m_client.logDiagnosticMessageWithResult(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(result), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageWithValue(WebPage* page, const String& message, const String& description, const String& value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "APIClient.h"
</span><span class="cx"> #include "WKBundlePage.h"
</span><span class="cx"> #include <JavaScriptCore/JSBase.h>
</span><ins>+#include <WebCore/DiagnosticLoggingResultType.h>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx"> public:
</span><span class="cx"> void logDiagnosticMessageDeprecated(WebPage*, const String& message, const String& description, const String& success);
</span><span class="cx"> void logDiagnosticMessage(WebPage*, const String& message, const String& description);
</span><del>- void logDiagnosticMessageWithResult(WebPage*, const String& message, const String& description, WKDiagnosticLoggingResultType);
</del><ins>+ void logDiagnosticMessageWithResult(WebPage*, const String& message, const String& description, WebCore::DiagnosticLoggingResultType);
</ins><span class="cx"> void logDiagnosticMessageWithValue(WebPage*, const String& message, const String& description, const String& value);
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebDiagnosticLoggingClient.h"
</span><span class="cx">
</span><span class="cx"> #include "WebPage.h"
</span><ins>+#include "WebPageProxyMessages.h"
</ins><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -45,15 +46,19 @@
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // FIXME: Remove this injected bundle API.
</ins><span class="cx"> m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessage(&m_page, message, description);
</span><ins>+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessage(message, description));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDiagnosticLoggingClient::logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingClient::LogResultType result)
</del><ins>+void WebDiagnosticLoggingClient::logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // FIXME: Remove this injected bundle API.
</ins><span class="cx"> m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithResult(&m_page, message, description, result);
</span><ins>+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResult(message, description, result));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDiagnosticLoggingClient::logDiagnosticMessageWithValue(const String& message, const String& description, const String& value)
</span><span class="lines">@@ -61,7 +66,9 @@
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // FIXME: Remove this injected bundle API.
</ins><span class="cx"> m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithValue(&m_page, message, description, value);
</span><ins>+ m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h (178544 => 178545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2015-01-16 01:00:23 UTC (rev 178544)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.h 2015-01-16 01:07:32 UTC (rev 178545)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void logDiagnosticMessage(const String& message, const String& description) override;
</span><del>- virtual void logDiagnosticMessageWithResult(const String& message, const String& description, LogResultType) override;
</del><ins>+ virtual void logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType) override;
</ins><span class="cx"> virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value) override;
</span><span class="cx">
</span><span class="cx"> WebPage& m_page;
</span></span></pre>
</div>
</div>
</body>
</html>