115539 2013-05-02 17:26:21 -0700 [WK2][CustomProtocols] NSURLProtocolClient methods should be dispatched on NSURLConnection's resource loader run loop 2013-05-03 00:09:58 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes webkit-bug-importer oldest_to_newest 884036 0 aestes 2013-05-02 17:26:21 -0700 [WK2][CustomProtocols] NSURLProtocolClient methods should be dispatched on NSURLConnection's resource loader run loop 884037 1 aestes 2013-05-02 17:28:26 -0700 <rdar://problem/13695891> 884039 2 200378 aestes 2013-05-02 17:37:03 -0700 Created attachment 200378 Patch 884086 3 200378 ap 2013-05-02 23:01:41 -0700 Comment on attachment 200378 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200378&action=review > Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:205 > + RetainPtr<NSError> nsError(error.nsError()); I think that we prefer assignment syntax to initialization. > Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:220 > + RetainPtr<NSData> nsData([NSData dataWithBytes:(void*)data.data() length:data.size()]); This should be RetainPtr<NSData> nsData = adoptNS([[NSData alloc] initWithBytes:...]). No need to create an autoreleased object and thrash its refcount. > Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:233 > + RetainPtr<NSURLResponse> nsResponse(response.nsURLResponse()); I think that we prefer assignment syntax to initialization. > Source/WebKit2/Shared/Network/CustomProtocols/mac/CustomProtocolManagerMac.mm:269 > +void CustomProtocolManager::dispatchOnResourceLoaderRunLoop(void (^block)()) > +{ > + CFRunLoopPerformBlock([NSURLConnection resourceLoaderRunLoop], kCFRunLoopDefaultMode, block); > + CFRunLoopWakeUp([NSURLConnection resourceLoaderRunLoop]); > +} This looks like it should be a static function in .mm file. 884096 4 aestes 2013-05-03 00:09:58 -0700 Committed r149520: <http://trac.webkit.org/changeset/149520> 200378 2013-05-02 17:37:03 -0700 2013-05-02 23:01:41 -0700 Patch bug-115539-20130502173617.patch text/plain 6745 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjVmMGQzYmIxZTRiOGY5 ZGVkYmNhYTU5OWVjMjBiYWJlNjgzOTM3OS4uNjhjODI0MGUwMjkxYWQ1ZGE3MTQwZGJmMDZmYzQy ZTVkOTJmMzY2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEzLTA1LTAyICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXVtDdXN0b21Qcm90b2Nv bHNdIE5TVVJMUHJvdG9jb2xDbGllbnQgbWV0aG9kcyBzaG91bGQgYmUgZGlzcGF0Y2hlZCBvbiBO U1VSTENvbm5lY3Rpb24ncyByZXNvdXJjZSBsb2FkZXIgcnVuIGxvb3AKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTUzOQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IGNhbGxp bmcgTlNVUkxQcm90b2NvbENsaWVudCBtZXRob2RzIGZyb20gYSBkaWZmZXJlbnQKKyAgICAgICAg dGhyZWFkIHRoYW4gdGhlIG9uZSBydW5uaW5nIHRoZSBOU1VSTENvbm5lY3Rpb24gcnVuIGxvb3Ag aXMgdW5zYWZlLgorICAgICAgICBBbHRob3VnaCBJIGNhbid0IGNhcHR1cmUgaXQgcmVsaWFibHkg aW4gYSB0ZXN0IGNhc2UsIGRvaW5nIHNvIGNhbgorICAgICAgICBzb21ldGltZXMgcmVzdWx0IGlu IGEgbG9hZCB0aW1pbmcgb3V0IGJlY2F1c2UgdGhlIGNhbGwgdG8KKyAgICAgICAgLVtOU1VSTCBV UkxQcm90b2NvbERpZEZpbmlzaExvYWRpbmc6XSB3YXMgaWdub3JlZCBieSBOU1VSTENvbm5lY3Rp b24uCisKKyAgICAgICAgRml4IHRoaXMgYnkgZGlzcGF0Y2hpbmcgdGhlc2UgbWV0aG9kcyBvbiB0 aGUgTlNVUkxDb25uZWN0aW9uIHJlc291cmNlCisgICAgICAgIGxvYWQgcnVuIGxvb3AuIFRoaXMg bWF0Y2hlcyB3aGVyZSBOU1VSTFByb3RvY29sQ2xpZW50IG1ldGhvZHMgYXJlCisgICAgICAgIGRp c3BhdGNoZWQgYnkgdHlwaWNhbCBOU1VSTFByb3RvY29sIGltcGxlbWVudGF0aW9ucywgYW5kIGlu IG15IHRlc3RpbmcKKyAgICAgICAgdGhpcyBzb2x2ZXMgdGhlIHRpbWVvdXQgaXNzdWUuCisKKyAg ICAgICAgKiBTaGFyZWQvTmV0d29yay9DdXN0b21Qcm90b2NvbHMvQ3VzdG9tUHJvdG9jb2xNYW5h Z2VyLmg6IERlY2xhcmUKKyAgICAgICAgZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCgp LgorICAgICAgICAqIFNoYXJlZC9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9tYWMvQ3VzdG9tUHJv dG9jb2xNYW5hZ2VyTWFjLm1tOgorICAgICAgICBEZWNsYXJlICtbTlNVUkxDb25uZWN0aW9uIHJl c291cmNlTG9hZGVyUnVuTG9vcF0gb24gYSBjYXRlZ29yeSBvZgorICAgICAgICBOU1VSTENvbm5l Y3Rpb24uIEFsc28gaW5jbHVkZSB0aGUgaGVhZGVyIHRoYXQgZGVjbGFyZXMgaXQgaWYgaXQncyBw cmVzZW50LgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZEZhaWxX aXRoRXJyb3IpOiBDYWxsIHRoZQorICAgICAgICBOU1VSTFByb3RvY29sQ2xpZW50IG1ldGhvZCB2 aWEgZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCgpLgorICAgICAgICAoV2ViS2l0OjpD dXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZExvYWREYXRhKTogRGl0dG8uCisgICAgICAgIChXZWJL aXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKTogRGl0dG8uCisg ICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkRmluaXNoTG9hZGluZyk6 IERpdHRvLgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpc3BhdGNo T25SZXNvdXJjZUxvYWRlclJ1bkxvb3ApOgorICAgICAgICBEaXNwYXRjaCBhIGJsb2NrIG9uIHRo ZSBOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2UgbG9hZGVyIHJ1biBsb29wIGFuZAorICAgICAgICB0 aGVuIHdha2UgdXAgdGhlIHJ1biBsb29wLgorCiAyMDEzLTA1LTAxICBBbGV4ZXkgUHJvc2t1cnlh a292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNDk0MjIpOiAtW1dL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBsb2FkRmlsZVVSTDpyZXN0cmljdFRvRmlsZXNXaXRo aW46XQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJv dG9jb2xzL0N1c3RvbVByb3RvY29sTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL05l dHdvcmsvQ3VzdG9tUHJvdG9jb2xzL0N1c3RvbVByb3RvY29sTWFuYWdlci5oCmluZGV4IGIwZmUz YzNiOTdmOTM4ZTM5YjI3MmRhNWI3MmZmZDE4ZjQzZDhmMjMuLmRjNTI1NTg5ZjNjZGZkYTNlMGE2 MmMxMzhjNGM3MTczMzFiNTg2NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9O ZXR3b3JrL0N1c3RvbVByb3RvY29scy9DdXN0b21Qcm90b2NvbE1hbmFnZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9DdXN0b21Qcm90b2NvbHMvQ3VzdG9tUHJvdG9jb2xN YW5hZ2VyLmgKQEAgLTEwOCw2ICsxMDgsNyBAQCBwcml2YXRlOgogICAgIC8vIFdLQ3VzdG9tUHJv dG9jb2wgb2JqZWN0cyBjYW4gYmUgcmVtb3ZlZCBmcm9tIHRoZSBtX2N1c3RvbVByb3RvY29sTWFw IGZyb20gbXVsdGlwbGUgdGhyZWFkcy4KICAgICAvLyBXZSByZXR1cm4gYSBSZXRhaW5QdHIgaGVy ZSBiZWNhdXNlIGl0IGlzIHVuc2FmZSB0byByZXR1cm4gYSByYXcgcG9pbnRlciBzaW5jZSB0aGUg b2JqZWN0IG1pZ2h0IGltbWVkaWF0ZWx5IGJlIGRlc3Ryb3llZCBmcm9tIGEgZGlmZmVyZW50IHRo cmVhZC4KICAgICBSZXRhaW5QdHI8V0tDdXN0b21Qcm90b2NvbD4gcHJvdG9jb2xGb3JJRCh1aW50 NjRfdCBjdXN0b21Qcm90b2NvbElEKTsKKyAgICB2b2lkIGRpc3BhdGNoT25SZXNvdXJjZUxvYWRl clJ1bkxvb3Aodm9pZCAoXmJsb2NrKSgpKTsKICNlbmRpZgogfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvU2hhcmVkL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL21hYy9DdXN0b21Qcm90 b2NvbE1hbmFnZXJNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9DdXN0b21Q cm90b2NvbHMvbWFjL0N1c3RvbVByb3RvY29sTWFuYWdlck1hYy5tbQppbmRleCA0YjJhMzAzNWUz YTMyZTYzNzE3ZTA4ODU3NmFkMjRhNjc3YzAzNmIxLi4yNzk4YTA1Y2EwYTg3MDJhYzNjZGM5ZmE4 YmU3ZDRiNWE1MTE5NGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29y ay9DdXN0b21Qcm90b2NvbHMvbWFjL0N1c3RvbVByb3RvY29sTWFuYWdlck1hYy5tbQorKysgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvTmV0d29yay9DdXN0b21Qcm90b2NvbHMvbWFjL0N1c3RvbVBy b3RvY29sTWFuYWdlck1hYy5tbQpAQCAtNDMsNiArNDMsMTYgQEAKICNpbXBvcnQgIk5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjZW5kaWYKIAorI2lmZGVmIF9faGFzX2luY2x1 ZGUKKyNpZiBfX2hhc19pbmNsdWRlKDxGb3VuZGF0aW9uL05TVVJMQ29ubmVjdGlvblByaXZhdGUu aD4pCisjaW1wb3J0IDxGb3VuZGF0aW9uL05TVVJMQ29ubmVjdGlvblByaXZhdGUuaD4KKyNlbmRp ZgorI2VuZGlmCisKK0BpbnRlcmZhY2UgTlNVUkxDb25uZWN0aW9uIChEZXRhaWxzKQorKyAoQ0ZS dW5Mb29wUmVmKXJlc291cmNlTG9hZGVyUnVuTG9vcDsKK0BlbmQKKwogdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0xOTIsNyArMjAyLDEyIEBAIHZvaWQg Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRGYWlsV2l0aEVycm9yKHVpbnQ2NF90IGN1c3RvbVBy b3RvY29sSUQsIGNvbnN0IFdlCiAgICAgaWYgKCFwcm90b2NvbCkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgW1twcm90b2NvbC5nZXQoKSBjbGllbnRdIFVSTFByb3RvY29sOnByb3RvY29sLmdldCgp IGRpZEZhaWxXaXRoRXJyb3I6ZXJyb3IubnNFcnJvcigpXTsKKyAgICBSZXRhaW5QdHI8TlNFcnJv cj4gbnNFcnJvcihlcnJvci5uc0Vycm9yKCkpOworCisgICAgZGlzcGF0Y2hPblJlc291cmNlTG9h ZGVyUnVuTG9vcCheIHsKKyAgICAgICAgW1twcm90b2NvbC5nZXQoKSBjbGllbnRdIFVSTFByb3Rv Y29sOnByb3RvY29sLmdldCgpIGRpZEZhaWxXaXRoRXJyb3I6bnNFcnJvci5nZXQoKV07CisgICAg fSk7CisKICAgICByZW1vdmVDdXN0b21Qcm90b2NvbChwcm90b2NvbC5nZXQoKSk7CiB9CiAKQEAg LTIwMSw4ICsyMTYsMTIgQEAgdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZExvYWREYXRh KHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IENvcmVJUEMKICAgICBSZXRhaW5QdHI8 V0tDdXN0b21Qcm90b2NvbD4gcHJvdG9jb2wgPSBwcm90b2NvbEZvcklEKGN1c3RvbVByb3RvY29s SUQpOwogICAgIGlmICghcHJvdG9jb2wpCiAgICAgICAgIHJldHVybjsKLSAgICAKLSAgICBbW3By b3RvY29sLmdldCgpIGNsaWVudF0gVVJMUHJvdG9jb2w6cHJvdG9jb2wuZ2V0KCkgZGlkTG9hZERh dGE6W05TRGF0YSBkYXRhV2l0aEJ5dGVzOih2b2lkKilkYXRhLmRhdGEoKSBsZW5ndGg6ZGF0YS5z aXplKCldXTsKKworICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YShbTlNEYXRhIGRhdGFXaXRo Qnl0ZXM6KHZvaWQqKWRhdGEuZGF0YSgpIGxlbmd0aDpkYXRhLnNpemUoKV0pOworCisgICAgZGlz cGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCheIHsKKyAgICAgICAgW1twcm90b2NvbC5nZXQo KSBjbGllbnRdIFVSTFByb3RvY29sOnByb3RvY29sLmdldCgpIGRpZExvYWREYXRhOm5zRGF0YS5n ZXQoKV07CisgICAgfSk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRSZWNl aXZlUmVzcG9uc2UodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJRCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIHVpbnQzMl90IGNhY2hlU3RvcmFnZVBvbGljeSkKQEAg LTIxMCw4ICsyMjksMTIgQEAgdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZFJlY2VpdmVS ZXNwb25zZSh1aW50NjRfdCBjdXN0b21Qcm90b2NvbElELCBjb25zdAogICAgIFJldGFpblB0cjxX S0N1c3RvbVByb3RvY29sPiBwcm90b2NvbCA9IHByb3RvY29sRm9ySUQoY3VzdG9tUHJvdG9jb2xJ RCk7CiAgICAgaWYgKCFwcm90b2NvbCkKICAgICAgICAgcmV0dXJuOwotICAgIAotICAgIFtbcHJv dG9jb2wuZ2V0KCkgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSBkaWRSZWNlaXZl UmVzcG9uc2U6cmVzcG9uc2UubnNVUkxSZXNwb25zZSgpIGNhY2hlU3RvcmFnZVBvbGljeTpzdGF0 aWNfY2FzdDxOU1VSTENhY2hlU3RvcmFnZVBvbGljeT4oY2FjaGVTdG9yYWdlUG9saWN5KV07CisK KyAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gbnNSZXNwb25zZShyZXNwb25zZS5uc1VSTFJl c3BvbnNlKCkpOworCisgICAgZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCheIHsKKyAg ICAgICAgW1twcm90b2NvbC5nZXQoKSBjbGllbnRdIFVSTFByb3RvY29sOnByb3RvY29sLmdldCgp IGRpZFJlY2VpdmVSZXNwb25zZTpuc1Jlc3BvbnNlLmdldCgpIGNhY2hlU3RvcmFnZVBvbGljeTpz dGF0aWNfY2FzdDxOU1VSTENhY2hlU3RvcmFnZVBvbGljeT4oY2FjaGVTdG9yYWdlUG9saWN5KV07 CisgICAgfSk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRGaW5pc2hMb2Fk aW5nKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCkBAIC0yMTksOCArMjQyLDExIEBAIHZvaWQg Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IGN1c3RvbVBy b3RvY29sSUQpCiAgICAgUmV0YWluUHRyPFdLQ3VzdG9tUHJvdG9jb2w+IHByb3RvY29sID0gcHJv dG9jb2xGb3JJRChjdXN0b21Qcm90b2NvbElEKTsKICAgICBpZiAoIXByb3RvY29sKQogICAgICAg ICByZXR1cm47Ci0gICAgCi0gICAgW1twcm90b2NvbC5nZXQoKSBjbGllbnRdIFVSTFByb3RvY29s RGlkRmluaXNoTG9hZGluZzpwcm90b2NvbC5nZXQoKV07CisKKyAgICBkaXNwYXRjaE9uUmVzb3Vy Y2VMb2FkZXJSdW5Mb29wKF4geworICAgICAgICBbW3Byb3RvY29sLmdldCgpIGNsaWVudF0gVVJM UHJvdG9jb2xEaWRGaW5pc2hMb2FkaW5nOnByb3RvY29sLmdldCgpXTsKKyAgICB9KTsKKwogICAg IHJlbW92ZUN1c3RvbVByb3RvY29sKHByb3RvY29sLmdldCgpKTsKIH0KIApAQCAtMjM1LDYgKzI2 MSwxMiBAQCBSZXRhaW5QdHI8V0tDdXN0b21Qcm90b2NvbD4gQ3VzdG9tUHJvdG9jb2xNYW5hZ2Vy Ojpwcm90b2NvbEZvcklEKHVpbnQ2NF90IGN1c3RvbQogICAgIEFTU0VSVChpdC0+dmFsdWUpOwog ICAgIHJldHVybiBpdC0+dmFsdWU7CiB9CisgICAgCit2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdl cjo6ZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCh2b2lkICheYmxvY2spKCkpCit7Cisg ICAgQ0ZSdW5Mb29wUGVyZm9ybUJsb2NrKFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJS dW5Mb29wXSwga0NGUnVuTG9vcERlZmF1bHRNb2RlLCBibG9jayk7CisgICAgQ0ZSdW5Mb29wV2Fr ZVVwKFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSk7Cit9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdAogCg==