<!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>[183013] 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/183013">183013</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 09:13:07 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly report errors from _WKUserContentExtensionStore.
https://bugs.webkit.org/show_bug.cgi?id=143808
Reviewed by Darin Adler.
Source/WebKit2:
* UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm:
(-[_WKUserContentExtensionStore compileContentExtensionForIdentifier:encodedContentExtension:completionHandler:]):
(-[_WKUserContentExtensionStore lookupContentExtensionForIdentifier:completionHandler:]):
(-[_WKUserContentExtensionStore removeContentExtensionForIdentifier:completionHandler:]):
Tools:
* TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm:
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKUserContentExtensionStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2Cocoa_WKUserContentExtensionStoremm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183012 => 183013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-20 15:23:45 UTC (rev 183012)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-20 16:13:07 UTC (rev 183013)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-20 Alex Christensen <achristensen@webkit.org>
+
+ Properly report errors from _WKUserContentExtensionStore.
+ https://bugs.webkit.org/show_bug.cgi?id=143808
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm:
+ (-[_WKUserContentExtensionStore compileContentExtensionForIdentifier:encodedContentExtension:completionHandler:]):
+ (-[_WKUserContentExtensionStore lookupContentExtensionForIdentifier:completionHandler:]):
+ (-[_WKUserContentExtensionStore removeContentExtensionForIdentifier:completionHandler:]):
+
</ins><span class="cx"> 2015-04-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r181656): Animated tiled layers are missing content
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKUserContentExtensionStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm (183012 => 183013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm 2015-04-20 15:23:45 UTC (rev 183012)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm 2015-04-20 16:13:07 UTC (rev 183013)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WKErrorInternal.h"
</span><span class="cx"> #import "_WKUserContentFilterInternal.h"
</span><ins>+#import <string>
</ins><span class="cx">
</span><span class="cx"> @implementation _WKUserContentExtensionStore
</span><span class="cx">
</span><span class="lines">@@ -53,9 +54,8 @@
</span><span class="cx"> if (error) {
</span><span class="cx"> auto rawHandler = (void (^)(_WKUserContentFilter *, NSError *))handler.get();
</span><span class="cx">
</span><del>- // FIXME: Pass real error.
- auto error = createNSError(WKErrorUnknown);
- rawHandler(nil, error.get());
</del><ins>+ auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension compilation failed: %s", error.message().c_str()]};
+ rawHandler(nil, [NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -72,9 +72,8 @@
</span><span class="cx"> if (error) {
</span><span class="cx"> auto rawHandler = (void (^)(_WKUserContentFilter *, NSError *))handler.get();
</span><span class="cx">
</span><del>- // FIXME: Pass real error.
- auto error = createNSError(WKErrorUnknown);
- rawHandler(nil, error.get());
</del><ins>+ auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension lookup failed: %s", error.message().c_str()]};
+ rawHandler(nil, [NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,9 +90,8 @@
</span><span class="cx"> if (error) {
</span><span class="cx"> auto rawHandler = (void (^)(NSError *))handler.get();
</span><span class="cx">
</span><del>- // FIXME: Pass real error.
- auto error = createNSError(WKErrorUnknown);
- rawHandler(error.get());
</del><ins>+ auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension removal failed: %s", error.message().c_str()]};
+ rawHandler([NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183012 => 183013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-20 15:23:45 UTC (rev 183012)
+++ trunk/Tools/ChangeLog 2015-04-20 16:13:07 UTC (rev 183013)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-20 Alex Christensen <achristensen@webkit.org>
+
+ Properly report errors from _WKUserContentExtensionStore.
+ https://bugs.webkit.org/show_bug.cgi?id=143808
+
+ Reviewed by Darin Adler.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm:
+ (TEST_F):
+
</ins><span class="cx"> 2015-04-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add a rule for NetworkCache to watchlist file
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2Cocoa_WKUserContentExtensionStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm (183012 => 183013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm 2015-04-20 15:23:45 UTC (rev 183012)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm 2015-04-20 16:13:07 UTC (rev 183013)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx">
</span><span class="cx"> EXPECT_NULL(filter);
</span><span class="cx"> EXPECT_NOT_NULL(error);
</span><ins>+ EXPECT_STREQ("Extension compilation failed: Failed to parse the JSON String.", [[error helpAnchor] UTF8String]);
</ins><span class="cx">
</span><span class="cx"> doneCompiling = true;
</span><span class="cx"> }];
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx">
</span><span class="cx"> EXPECT_NULL(filter);
</span><span class="cx"> EXPECT_NOT_NULL(error);
</span><ins>+ EXPECT_STREQ("Extension lookup failed: Unspecified error during lookup.", [[error helpAnchor] UTF8String]);
</ins><span class="cx">
</span><span class="cx"> doneLookingUp = true;
</span><span class="cx"> }];
</span><span class="lines">@@ -133,6 +135,7 @@
</span><span class="cx"> __block bool doneRemoving = false;
</span><span class="cx"> [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"DoesNotExist" completionHandler:^(NSError *error) {
</span><span class="cx"> EXPECT_NOT_NULL(error);
</span><ins>+ EXPECT_STREQ("Extension removal failed: Unspecified error during remove.", [[error helpAnchor] UTF8String]);
</ins><span class="cx">
</span><span class="cx"> doneRemoving = true;
</span><span class="cx"> }];
</span></span></pre>
</div>
</div>
</body>
</html>