<!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>[178848] trunk/Source/WebKit2</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/178848">178848</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:55:00 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API
https://bugs.webkit.org/show_bug.cgi?id=140655
Reviewed by Anders Carlsson.
Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API.
Instead, introduce a new _WKDiagnosticLoggingResultType enum in
_WKDiagnosticLoggingDelegate.h.
A few defines mapping WKDiagnosticLoggingResultType enum and its values
to the new _WKDiagnosticLoggingResultType are temporarily added until
the client-side is transitioned.
* UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h:
* UIProcess/Cocoa/DiagnosticLoggingClient.mm:
(WebKit::toWKDiagnosticLoggingResultType):
(WebKit::DiagnosticLoggingClient::logDiagnosticMessageWithResult):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKDiagnosticLoggingDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaDiagnosticLoggingClientmm">trunk/Source/WebKit2/UIProcess/Cocoa/DiagnosticLoggingClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178847 => 178848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-21 18:52:00 UTC (rev 178847)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-21 18:55:00 UTC (rev 178848)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-21 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API
+ https://bugs.webkit.org/show_bug.cgi?id=140655
+
+ Reviewed by Anders Carlsson.
+
+ Stop using WKDiagnosticLoggingResultType.h C API header in Cocoa API.
+ Instead, introduce a new _WKDiagnosticLoggingResultType enum in
+ _WKDiagnosticLoggingDelegate.h.
+
+ A few defines mapping WKDiagnosticLoggingResultType enum and its values
+ to the new _WKDiagnosticLoggingResultType are temporarily added until
+ the client-side is transitioned.
+
+ * UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h:
+ * UIProcess/Cocoa/DiagnosticLoggingClient.mm:
+ (WebKit::toWKDiagnosticLoggingResultType):
+ (WebKit::DiagnosticLoggingClient::logDiagnosticMessageWithResult):
+
</ins><span class="cx"> 2015-01-21 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Use C++ lambdas in ProcessLauncher class
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKDiagnosticLoggingDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h (178847 => 178848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h 2015-01-21 18:52:00 UTC (rev 178847)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDiagnosticLoggingDelegate.h 2015-01-21 18:55:00 UTC (rev 178848)
</span><span class="lines">@@ -28,13 +28,24 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><del>-#import <WebKit/WKDiagnosticLoggingResultType.h>
</del><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, _WKDiagnosticLoggingResultType) {
+ _WKDiagnosticLoggingResultPass,
+ _WKDiagnosticLoggingResultFail,
+ _WKDiagnosticLoggingResultNoop,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+// FIXME: Remove these once the client-side has been ported.
+#define WKDiagnosticLoggingResultType _WKDiagnosticLoggingResultType
+#define kWKDiagnosticLoggingResultPass _WKDiagnosticLoggingResultPass
+#define kWKDiagnosticLoggingResultFail _WKDiagnosticLoggingResultFail
+#define kWKDiagnosticLoggingResultNoop _WKDiagnosticLoggingResultNoop
+
</ins><span class="cx"> @protocol _WKDiagnosticLoggingDelegate <NSObject>
</span><span class="cx"> @optional
</span><span class="cx">
</span><span class="cx"> - (void)_webView:(WKWebView *)webView logDiagnosticMessage:(NSString *)message description:(NSString *)description;
</span><del>-- (void)_webView:(WKWebView *)webView logDiagnosticMessageWithResult:(NSString *)message description:(NSString *)description result:(WKDiagnosticLoggingResultType)result;
</del><ins>+- (void)_webView:(WKWebView *)webView logDiagnosticMessageWithResult:(NSString *)message description:(NSString *)description result:(_WKDiagnosticLoggingResultType)result;
</ins><span class="cx"> - (void)_webView:(WKWebView *)webView logDiagnosticMessageWithValue:(NSString *)message description:(NSString *)description value:(NSString *) value;
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaDiagnosticLoggingClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/DiagnosticLoggingClient.mm (178847 => 178848)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/DiagnosticLoggingClient.mm 2015-01-21 18:52:00 UTC (rev 178847)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/DiagnosticLoggingClient.mm 2015-01-21 18:55:00 UTC (rev 178848)
</span><span class="lines">@@ -58,10 +58,22 @@
</span><span class="cx"> [m_delegate.get() _webView:m_webView logDiagnosticMessage:message description:description];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static _WKDiagnosticLoggingResultType toWKDiagnosticLoggingResultType(WebCore::DiagnosticLoggingResultType result)
+{
+ switch (result) {
+ case WebCore::DiagnosticLoggingResultPass:
+ return _WKDiagnosticLoggingResultPass;
+ case WebCore::DiagnosticLoggingResultFail:
+ return _WKDiagnosticLoggingResultFail;
+ case WebCore::DiagnosticLoggingResultNoop:
+ return _WKDiagnosticLoggingResultNoop;
+ }
+}
+
</ins><span class="cx"> void DiagnosticLoggingClient::logDiagnosticMessageWithResult(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& description, WebCore::DiagnosticLoggingResultType result)
</span><span class="cx"> {
</span><span class="cx"> if (m_delegateMethods.webviewLogDiagnosticMessageWithResult)
</span><del>- [m_delegate.get() _webView:m_webView logDiagnosticMessageWithResult:message description:description result:toAPI(result)];
</del><ins>+ [m_delegate.get() _webView:m_webView logDiagnosticMessageWithResult:message description:description result:toWKDiagnosticLoggingResultType(result)];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DiagnosticLoggingClient::logDiagnosticMessageWithValue(WebKit::WebPageProxy*, const WTF::String& message, const WTF::String& description, const WTF::String& value)
</span></span></pre>
</div>
</div>
</body>
</html>