125959 2013-12-18 16:12:14 -0800 [Cocoa] Allow the web process plug-in to intercept resource requests 2017-03-25 19:22:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz oldest_to_newest 961158 0 mitz 2013-12-18 16:12:14 -0800 [Cocoa] Allow the web process plug-in to intercept resource requests 961161 1 219580 mitz 2013-12-18 16:17:03 -0800 Created attachment 219580 Add -webProcessPlugInBrowserContextController:frame:willSendRequest:redirectResponse: 961171 2 219580 andersca 2013-12-18 16:34:44 -0800 Comment on attachment 219580 Add -webProcessPlugInBrowserContextController:frame:willSendRequest:redirectResponse: View in context: https://bugs.webkit.org/attachment.cgi?id=219580&action=review > Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:144 > + if (loadDelegate) { > setUpPageLoaderClient(self, *_page); > - else > + setUpResourceLoadClient(self, *_page); I'd use an early return here to get rid of the ugly one-liner inside the brace. 1291293 3 mitz 2017-03-25 19:22:40 -0700 Committed <https://trac.webkit.org/r160809>. 219580 2013-12-18 16:17:03 -0800 2013-12-18 16:34:44 -0800 Add -webProcessPlugInBrowserContextController:frame:willSendRequest:redirectResponse: bug-125959-20131218161702.patch text/plain 5377 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDgwNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTEyLTE4ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBbGxvdyB0aGUgd2Vi IHByb2Nlc3MgcGx1Zy1pbiB0byBpbnRlcmNlcHQgcmVzb3VyY2UgcmVxdWVzdHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTk1OQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTG9hZERlbGVnYXRlLmg6IERl Y2xhcmVkIG5ldworICAgICAgICBkZWxlZ2F0ZSBtZXRob2QuCisgICAgICAgICogV2ViUHJvY2Vz cy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0 Q29udHJvbGxlci5tbToKKyAgICAgICAgKHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lKTogSW1wbGVt ZW50ZWQgdGhpcyBXS0J1bmRsZVBhZ2VSZXNvdXJjZUNsaWVudCBjYWxsYmFjayBieSBjYWxsaW5n CisgICAgICAgIHRoZSBsb2FkIGRlbGVnYXRlLgorICAgICAgICAoc2V0VXBSZXNvdXJjZUxvYWRD bGllbnQpOiBBZGRlZC4gSW5pdGlhbGl6ZXMgdGhlIHJlc291cmNlIGxvYWQgY2xpZW50IHdpdGgg dGhlIGFib3ZlCisgICAgICAgIGZ1bmN0aW9uLgorICAgICAgICAoLVtXS1dlYlByb2Nlc3NQbHVn SW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgc2V0TG9hZERlbGVnYXRlOl0pOiBBZGRlZCBjYWxs cyB0byBpbml0aWFsaXplCisgICAgICAgIGFuZCBjbGVhciB0aGUgcmVzb3VyY2UgbG9hZCBjbGll bnQuCisKIDIwMTMtMTItMTggIFlvbmdqdW4gWmhhbmcgIDx5b25nanVuX3poYW5nQGFwcGxlLmNv bT4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1 OTQxCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9D b2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nl c3NQbHVnSW5Mb2FkRGVsZWdhdGUuaAkocmV2aXNpb24gMTYwODA1KQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0lu TG9hZERlbGVnYXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDE1IEBACiAKIEBwcm90 b2NvbCBXS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUgPE5TT2JqZWN0PgogQG9wdGlvbmFs CisKKy8vIEZyYW1lIGxvYWRpbmcKKwogLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNv bnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xs ZXIqKWNvbnRyb2xsZXIgZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTooV0tXZWJQcm9j ZXNzUGx1Z0luRnJhbWUgKilmcmFtZTsKIC0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJD b250ZXh0Q29udHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9s bGVyKiljb250cm9sbGVyIGRpZEZpbmlzaExvYWRGb3JGcmFtZTooV0tXZWJQcm9jZXNzUGx1Z0lu RnJhbWUgKilmcmFtZTsKIC0gKHZvaWQpd2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29u dHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyKiljb250 cm9sbGVyIGdsb2JhbE9iamVjdElzQXZhaWxhYmxlRm9yRnJhbWU6KFdLV2ViUHJvY2Vzc1BsdWdJ bkZyYW1lICopZnJhbWUgaW5TY3JpcHRXb3JsZDooV0tXZWJQcm9jZXNzUGx1Z0luU2NyaXB0V29y bGQgKilzY3JpcHRXb3JsZDsKKworLy8gUmVzb3VyY2UgbG9hZGluZworCistIChOU1VSTFJlcXVl c3QgKil3ZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nl c3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGZyYW1lOihXS1dl YlByb2Nlc3NQbHVnSW5GcmFtZSAqKWZyYW1lIHdpbGxTZW5kUmVxdWVzdDooTlNVUkxSZXF1ZXN0 ICopcmVxdWVzdCByZWRpcmVjdFJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVkaXJlY3RSZXNw b25zZTsKKwogQGVuZApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlci5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1tCShy ZXZpc2lvbiAxNjA4MDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVu ZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyLm1t CSh3b3JraW5nIGNvcHkpCkBAIC0zNyw2ICszNyw3IEBACiAjaW1wb3J0ICJXS0RPTUludGVybmFs cy5oIgogI2ltcG9ydCAiV0tSZW1vdGVPYmplY3RSZWdpc3RyeUludGVybmFsLmgiCiAjaW1wb3J0 ICJXS1JldGFpblB0ci5oIgorI2ltcG9ydCAiV0tVUkxSZXF1ZXN0TlMuaCIKICNpbXBvcnQgIldL V2ViUHJvY2Vzc1BsdWdpbkZyYW1lSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLV2ViUHJvY2Vzc1Bs dWdJbkludGVybmFsLmgiCiAjaW1wb3J0ICJXS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGUu aCIKQEAgLTk5LDYgKzEwMCwzNiBAQCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VMb2FkZXJDbGllbnQo V0tXZWJQCiAgICAgcGFnZS5pbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVMb2FkZXJDbGllbnQoJmNs aWVudC5iYXNlKTsKIH0KIAorc3RhdGljIFdLVVJMUmVxdWVzdFJlZiB3aWxsU2VuZFJlcXVlc3RG b3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSwgV0tCdW5kbGVGcmFtZVJlZiBmcmFtZSwgdWlu dDY0X3QsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS1VSTFJlc3BvbnNlUmVmIHJlZGlyZWN0 UmVzcG9uc2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgV0tXZWJQcm9jZXNzUGx1 Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICpwbHVnaW5Db250ZXh0Q29udHJvbGxlciA9IChX S1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXIgKiljbGllbnRJbmZvOwor ICAgIGF1dG8gbG9hZERlbGVnYXRlID0gcGx1Z2luQ29udGV4dENvbnRyb2xsZXItPl9sb2FkRGVs ZWdhdGUuZ2V0KCk7CisKKyAgICBpZiAoW2xvYWREZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKHdlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6ZnJhbWU6 d2lsbFNlbmRSZXF1ZXN0OnJlZGlyZWN0UmVzcG9uc2U6KV0pIHsKKyAgICAgICAgTlNVUkxSZXF1 ZXN0ICpvcmlnaW5hbFJlcXVlc3QgPSB0b0ltcGwocmVxdWVzdCktPnJlc291cmNlUmVxdWVzdCgp Lm5zVVJMUmVxdWVzdChEb05vdFVwZGF0ZUhUVFBCb2R5KTsKKyAgICAgICAgUmV0YWluUHRyPE5T VVJMUmVxdWVzdD4gc3Vic3RpdHV0ZVJlcXVlc3QgPSBbbG9hZERlbGVnYXRlIHdlYlByb2Nlc3NQ bHVnSW5Ccm93c2VyQ29udGV4dENvbnRyb2xsZXI6cGx1Z2luQ29udGV4dENvbnRyb2xsZXIgZnJh bWU6d3JhcHBlcigqdG9JbXBsKGZyYW1lKSkgd2lsbFNlbmRSZXF1ZXN0Om9yaWdpbmFsUmVxdWVz dAorICAgICAgICAgICAgcmVkaXJlY3RSZXNwb25zZTp0b0ltcGwocmVkaXJlY3RSZXNwb25zZSkt PnJlc291cmNlUmVzcG9uc2UoKS5uc1VSTFJlc3BvbnNlKCldOworCisgICAgICAgIGlmIChzdWJz dGl0dXRlUmVxdWVzdCAhPSBvcmlnaW5hbFJlcXVlc3QpCisgICAgICAgICAgICByZXR1cm4gc3Vi c3RpdHV0ZVJlcXVlc3QgPyBXS1VSTFJlcXVlc3RDcmVhdGVXaXRoTlNVUkxSZXF1ZXN0KHN1YnN0 aXR1dGVSZXF1ZXN0LmdldCgpKSA6IG51bGxwdHI7CisgICAgfQorCisgICAgV0tSZXRhaW4ocmVx dWVzdCk7CisgICAgcmV0dXJuIHJlcXVlc3Q7Cit9CisKK3N0YXRpYyB2b2lkIHNldFVwUmVzb3Vy Y2VMb2FkQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAq Y29udGV4dENvbnRyb2xsZXIsIFdlYlBhZ2UmIHBhZ2UpCit7CisgICAgV0tCdW5kbGVQYWdlUmVz b3VyY2VMb2FkQ2xpZW50VjEgY2xpZW50OworICAgIG1lbXNldCgmY2xpZW50LCAwLCBzaXplb2Yo Y2xpZW50KSk7CisKKyAgICBjbGllbnQuYmFzZS52ZXJzaW9uID0gMTsKKyAgICBjbGllbnQuYmFz ZS5jbGllbnRJbmZvID0gY29udGV4dENvbnRyb2xsZXI7CisgICAgY2xpZW50LndpbGxTZW5kUmVx dWVzdEZvckZyYW1lID0gd2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWU7CisKKyAgICBwYWdlLmluaXRp YWxpemVJbmplY3RlZEJ1bmRsZVJlc291cmNlTG9hZENsaWVudCgmY2xpZW50LmJhc2UpOworfQor CiAtIChpZCA8V0tXZWJQcm9jZXNzUGx1Z0luTG9hZERlbGVnYXRlPilsb2FkRGVsZWdhdGUKIHsK ICAgICByZXR1cm4gX2xvYWREZWxlZ2F0ZS5nZXRBdXRvcmVsZWFzZWQoKTsKQEAgLTEwOCwxMCAr MTM5LDEzIEBAIC0gKHZvaWQpc2V0TG9hZERlbGVnYXRlOihpZCA8V0tXZWJQcm9jZXMKIHsKICAg ICBfbG9hZERlbGVnYXRlID0gbG9hZERlbGVnYXRlOwogCi0gICAgaWYgKGxvYWREZWxlZ2F0ZSkK KyAgICBpZiAobG9hZERlbGVnYXRlKSB7CiAgICAgICAgIHNldFVwUGFnZUxvYWRlckNsaWVudChz ZWxmLCAqX3BhZ2UpOwotICAgIGVsc2UKKyAgICAgICAgc2V0VXBSZXNvdXJjZUxvYWRDbGllbnQo c2VsZiwgKl9wYWdlKTsKKyAgICB9IGVsc2UgewogICAgICAgICBfcGFnZS0+aW5pdGlhbGl6ZUlu amVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KG51bGxwdHIpOworICAgICAgICBfcGFnZS0+aW5pdGlh bGl6ZUluamVjdGVkQnVuZGxlUmVzb3VyY2VMb2FkQ2xpZW50KG51bGxwdHIpOworICAgIH0KIH0K IAogLSAodm9pZClkZWFsbG9jCg==