[webkit-changes] [183013] trunk

Mon, 20 Apr 2015 09:13:33 -0700

Title: [183013] trunk
Revision
183013
Author
achristen...@apple.com
Date
2015-04-20 09:13:07 -0700 (Mon, 20 Apr 2015)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (183012 => 183013)


--- 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)
@@ -1,3 +1,15 @@
+2015-04-20  Alex Christensen  <achristen...@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:]):
+
 2015-04-18  Simon Fraser  <simon.fra...@apple.com>
 
         REGRESSION (r181656): Animated tiled layers are missing content

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.mm (183012 => 183013)


--- 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)
@@ -30,6 +30,7 @@
 
 #import "WKErrorInternal.h"
 #import "_WKUserContentFilterInternal.h"
+#import <string>
 
 @implementation _WKUserContentExtensionStore
 
@@ -53,9 +54,8 @@
         if (error) {
             auto rawHandler = (void (^)(_WKUserContentFilter *, NSError *))handler.get();
             
-            // FIXME: Pass real error.
-            auto error = createNSError(WKErrorUnknown);
-            rawHandler(nil, error.get());
+            auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension compilation failed: %s", error.message().c_str()]};
+            rawHandler(nil, [NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
             return;
         }
 
@@ -72,9 +72,8 @@
         if (error) {
             auto rawHandler = (void (^)(_WKUserContentFilter *, NSError *))handler.get();
 
-            // FIXME: Pass real error.
-            auto error = createNSError(WKErrorUnknown);
-            rawHandler(nil, error.get());
+            auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension lookup failed: %s", error.message().c_str()]};
+            rawHandler(nil, [NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
             return;
         }
 
@@ -91,9 +90,8 @@
         if (error) {
             auto rawHandler = (void (^)(NSError *))handler.get();
 
-            // FIXME: Pass real error.
-            auto error = createNSError(WKErrorUnknown);
-            rawHandler(error.get());
+            auto userInfo = @{NSHelpAnchorErrorKey: [NSString stringWithFormat:@"Extension removal failed: %s", error.message().c_str()]};
+            rawHandler([NSError errorWithDomain:@"ContentExtensionsDomain" code:error.value() userInfo:userInfo]);
             return;
         }

Modified: trunk/Tools/ChangeLog (183012 => 183013)


--- trunk/Tools/ChangeLog	2015-04-20 15:23:45 UTC (rev 183012)
+++ trunk/Tools/ChangeLog	2015-04-20 16:13:07 UTC (rev 183013)
@@ -1,3 +1,13 @@
+2015-04-20  Alex Christensen  <achristen...@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):
+
 2015-04-20  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Add a rule for NetworkCache to watchlist file

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/_WKUserContentExtensionStore.mm (183012 => 183013)


--- 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)
@@ -65,6 +65,7 @@
     
         EXPECT_NULL(filter);
         EXPECT_NOT_NULL(error);
+        EXPECT_STREQ("Extension compilation failed: Failed to parse the JSON String.", [[error helpAnchor] UTF8String]);
 
         doneCompiling = true;
     }];
@@ -101,6 +102,7 @@
     
         EXPECT_NULL(filter);
         EXPECT_NOT_NULL(error);
+        EXPECT_STREQ("Extension lookup failed: Unspecified error during lookup.", [[error helpAnchor] UTF8String]);
 
         doneLookingUp = true;
     }];
@@ -133,6 +135,7 @@
     __block bool doneRemoving = false;
     [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"DoesNotExist" completionHandler:^(NSError *error) {
         EXPECT_NOT_NULL(error);
+        EXPECT_STREQ("Extension removal failed: Unspecified error during remove.", [[error helpAnchor] UTF8String]);
 
         doneRemoving = true;
     }];

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to