159345 2016-07-01 05:23:05 -0700 Make ResourceLoaderOptions derive from FetchOptions 2016-07-01 10:03:59 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 151937 1 youennf youennf achristensen cdumez commit-queue japhet oldest_to_newest 1207072 0 youennf 2016-07-01 05:23:05 -0700 The goal is to remove loader options by corresponding fetch options (requestOriginPolicy by fetch mode for instance). Code would look nicer if ResourceLoaderOptions was inherited from FetchOptions. 1207076 1 282541 youennf 2016-07-01 05:33:52 -0700 Created attachment 282541 Patch 1207146 2 282541 achristensen 2016-07-01 09:31:03 -0700 Comment on attachment 282541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=282541&action=review > Source/WebCore/Modules/fetch/FetchLoader.cpp:85 > + // FIXME: Pass directly all fetch options to loader options. Why not do this now? 1207162 3 youennf 2016-07-01 09:43:39 -0700 (In reply to comment #2) > Comment on attachment 282541 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=282541&action=review > > > Source/WebCore/Modules/fetch/FetchLoader.cpp:85 > > + // FIXME: Pass directly all fetch options to loader options. > > Why not do this now? We could do so. I plan to make some refactoring to progressively use more fetch options in ResourceLoader. This may make updating fetch tests while not everything is in place thus making some fetch tests changing of failure and so on. For instance, cross-origin fetch option is currently not supported and it is best to keep this option as SameOrigin until things get properly fixed. 1207173 4 282541 commit-queue 2016-07-01 10:03:55 -0700 Comment on attachment 282541 Patch Clearing flags on attachment: 282541 Committed r202741: <http://trac.webkit.org/changeset/202741> 1207174 5 commit-queue 2016-07-01 10:03:59 -0700 All reviewed patches have been landed. Closing bug. 282541 2016-07-01 05:33:52 -0700 2016-07-01 10:03:55 -0700 Patch bug-159345-20160701143329.patch text/plain 7106 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjAyNzI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWY1ZjczNDc3MjBjMjdj NmUyN2ZlYThmMDk0MWUxYmMxZDgxYTYyNC4uYWNlNzVhOWVkMWM4MjAxMWMwZDkyYWM4NDBjODA1 ZWI0Nzk0MTcyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA3LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBNYWtlIFJlc291cmNlTG9h ZGVyT3B0aW9ucyBkZXJpdmUgZnJvbSBGZXRjaE9wdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTM0NQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAg ICAgICAqIE1vZHVsZXMvZmV0Y2gvRmV0Y2hMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RmV0Y2hMb2FkZXI6OnN0YXJ0KToKKyAgICAgICAgKiBsb2FkZXIvQ3Jvc3NPcmlnaW5QcmVmbGln aHRDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNyb3NzT3JpZ2luUHJlZmxpZ2h0Q2hl Y2tlcjo6c3RhcnRQcmVmbGlnaHQpOgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRlck9w dGlvbnMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyT3B0aW9uczo6ZmV0Y2hP cHRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZGVyT3B0aW9u czo6c2V0RmV0Y2hPcHRpb25zKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3Vy Y2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3VicmVzb3VyY2VMb2FkZXI6OndpbGxT ZW5kUmVxdWVzdEludGVybmFsKToKKyAgICAgICAgKiBsb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5o OiBSZW1vdmluZyBzZWN1cml0eU9yaWdpbiBmaWVsZCAobGVmdCBvdmVyIGZyb20gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1OTIyMSkKKwogMjAxNi0wNy0wMSAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubmZAZ21haWwuY29tPgogCiAgICAgICAgIEFkZCBhIHJ1bnRpbWUg ZmxhZyBmb3IgRE9NIGl0ZXJhdG9ycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9mZXRjaC9GZXRjaExvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0Zl dGNoTG9hZGVyLmNwcAppbmRleCBkZjRhN2U3Njc1YmQwNmYxYWNlNjIwNjgxNjgxMDJkMTg4ODcx YjJjLi42ZTc5ZTU0ZWE3NmMzNzRhMDk5MTEzMzhmMTljZDk2ZWQzM2FhOTQyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoTG9hZGVyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL2ZldGNoL0ZldGNoTG9hZGVyLmNwcApAQCAtNzMsNyArNzMsNiBA QCB2b2lkIEZldGNoTG9hZGVyOjpzdGFydChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0 LCBCbG9iJiBibG9iKQogCiB2b2lkIEZldGNoTG9hZGVyOjpzdGFydChTY3JpcHRFeGVjdXRpb25D b250ZXh0JiBjb250ZXh0LCBjb25zdCBGZXRjaFJlcXVlc3QmIHJlcXVlc3QpCiB7Ci0gICAgLy8g RklYTUU6IENvbXB1dGUgbG9hZGluZyBvcHRpb25zIGFjY29yZGluZyBmZXRjaCBvcHRpb25zLgog ICAgIFRocmVhZGFibGVMb2FkZXJPcHRpb25zIG9wdGlvbnM7CiAgICAgb3B0aW9ucy5zZXRTZW5k TG9hZENhbGxiYWNrcyhTZW5kQ2FsbGJhY2tzKTsKICAgICBvcHRpb25zLnNldFNuaWZmQ29udGVu dChEb05vdFNuaWZmQ29udGVudCk7CkBAIC04Miw3ICs4MSw5IEBAIHZvaWQgRmV0Y2hMb2FkZXI6 OnN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZldGNoUmVxdWVz dCYgcmVxCiAgICAgb3B0aW9ucy5zZXRBbGxvd0NyZWRlbnRpYWxzKEFsbG93U3RvcmVkQ3JlZGVu dGlhbHMpOwogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gRGVueUNyb3Nz T3JpZ2luUmVxdWVzdHM7CiAgICAgb3B0aW9ucy5jb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNl bWVudCA9IENvbnRlbnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50OjpEb05vdEVuZm9yY2U7Ci0g ICAgb3B0aW9ucy5zZXRGZXRjaE9wdGlvbnMocmVxdWVzdC5mZXRjaE9wdGlvbnMoKSk7CisKKyAg ICAvLyBGSVhNRTogUGFzcyBkaXJlY3RseSBhbGwgZmV0Y2ggb3B0aW9ucyB0byBsb2FkZXIgb3B0 aW9ucy4KKyAgICBvcHRpb25zLnJlZGlyZWN0ID0gcmVxdWVzdC5mZXRjaE9wdGlvbnMoKS5yZWRp cmVjdDsKIAogICAgIG1fbG9hZGVyID0gVGhyZWFkYWJsZUxvYWRlcjo6Y3JlYXRlKCZjb250ZXh0 LCB0aGlzLCByZXF1ZXN0LmludGVybmFsUmVxdWVzdCgpLCBvcHRpb25zKTsKICAgICBtX2lzU3Rh cnRlZCA9IG1fbG9hZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nyb3Nz T3JpZ2luUHJlZmxpZ2h0Q2hlY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NP cmlnaW5QcmVmbGlnaHRDaGVja2VyLmNwcAppbmRleCBiOGY4YzMwM2E4MjkzYmRmY2I0MTliNjJh MWY2ZmMxMzA3MTM3NWZlLi43ZWE0ZDdlZTg5YzlkOTQxNzZiNTU2YzY2MjJmNDNmMmQxNzZlZmJi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5QcmVmbGlnaHRD aGVja2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvQ3Jvc3NPcmlnaW5QcmVmbGln aHRDaGVja2VyLmNwcApAQCAtMTA5LDcgKzEwOSw3IEBAIHZvaWQgQ3Jvc3NPcmlnaW5QcmVmbGln aHRDaGVja2VyOjpzdGFydFByZWZsaWdodCgpCiAgICAgLy8gS2VlcCBidWZmZXJpbmcgdGhlIGRh dGEgZm9yIHRoZSBwcmVmbGlnaHQgcmVxdWVzdC4KICAgICBvcHRpb25zLnNldERhdGFCdWZmZXJp bmdQb2xpY3koQnVmZmVyRGF0YSk7CiAKLSAgICBvcHRpb25zLmZldGNoT3B0aW9ucygpLnJlZGly ZWN0ID0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDo6TWFudWFsOworICAgIG9wdGlvbnMucmVkaXJl Y3QgPSBGZXRjaE9wdGlvbnM6OlJlZGlyZWN0OjpNYW51YWw7CiAKICAgICBDYWNoZWRSZXNvdXJj ZVJlcXVlc3QgcHJlZmxpZ2h0UmVxdWVzdChjcmVhdGVBY2Nlc3NDb250cm9sUHJlZmxpZ2h0UmVx dWVzdChtX3JlcXVlc3QsIG1fbG9hZGVyLnNlY3VyaXR5T3JpZ2luKCkpLCBvcHRpb25zKTsKICAg ICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5yZXNvdXJjZVRp bWluZ0VuYWJsZWQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWRlck9wdGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRlck9w dGlvbnMuaAppbmRleCAxMjY3YjMxYThkMmUzMmQ2NmEyZGQ0OWQxZTEyYjY5MWM1NzBlNDA1Li44 NTc4ODMyMTlmZDJiZjFjZmU0YmM1MmRmZTkxYTIyNTU2ZTE3Y2EwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZGVyT3B0aW9ucy5oCkBAIC0yOCwxNCArMjgsMTMgQEAK ICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkg T0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lmbmRlZiBSZXNvdXJjZUxvYWRlck9wdGlvbnNfaAot I2RlZmluZSBSZXNvdXJjZUxvYWRlck9wdGlvbnNfaAorI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRl ICJGZXRjaE9wdGlvbnMuaCIKICNpbmNsdWRlICJSZXNvdXJjZUhhbmRsZVR5cGVzLmgiCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKLSAgICAKKwogZW51bSBTZW5kQ2FsbGJhY2tQb2xpY3kgewogICAg IFNlbmRDYWxsYmFja3MsCiAgICAgRG9Ob3RTZW5kQ2FsbGJhY2tzCkBAIC04Miw3ICs4MSw3IEBA IGVudW0gY2xhc3MgQ2FjaGluZ1BvbGljeSA6IHVpbnQ4X3QgewogICAgIERpc2FsbG93Q2FjaGlu ZwogfTsKIAotc3RydWN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyB7CitzdHJ1Y3QgUmVzb3VyY2VM b2FkZXJPcHRpb25zIDogcHVibGljIEZldGNoT3B0aW9ucyB7CiAgICAgUmVzb3VyY2VMb2FkZXJP cHRpb25zKCkKICAgICAgICAgOiBtX3NlbmRMb2FkQ2FsbGJhY2tzKERvTm90U2VuZENhbGxiYWNr cykKICAgICAgICAgLCBtX3NuaWZmQ29udGVudChEb05vdFNuaWZmQ29udGVudCkKQEAgLTEzNiw5 ICsxMzUsNiBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkZXJPcHRpb25zIHsKICAgICB2b2lkIHNldERl ZmVyc0xvYWRpbmdQb2xpY3koRGVmZXJzTG9hZGluZ1BvbGljeSBkZWZlcnNMb2FkaW5nUG9saWN5 KSB7IG1fZGVmZXJzTG9hZGluZ1BvbGljeSA9IGRlZmVyc0xvYWRpbmdQb2xpY3k7IH0KICAgICBD YWNoaW5nUG9saWN5IGNhY2hpbmdQb2xpY3koKSBjb25zdCB7IHJldHVybiBtX2NhY2hpbmdQb2xp Y3k7IH0KICAgICB2b2lkIHNldENhY2hpbmdQb2xpY3koQ2FjaGluZ1BvbGljeSBjYWNoaW5nUG9s aWN5KSB7IG1fY2FjaGluZ1BvbGljeSA9IGNhY2hpbmdQb2xpY3k7IH0KLSAgICBjb25zdCBGZXRj aE9wdGlvbnMmIGZldGNoT3B0aW9ucygpIGNvbnN0IHsgcmV0dXJuIG1fZmV0Y2hPcHRpb25zOyB9 Ci0gICAgRmV0Y2hPcHRpb25zJiBmZXRjaE9wdGlvbnMoKSB7IHJldHVybiBtX2ZldGNoT3B0aW9u czsgfQotICAgIHZvaWQgc2V0RmV0Y2hPcHRpb25zKGNvbnN0IEZldGNoT3B0aW9ucyYgZmV0Y2hP cHRpb25zKSB7IG1fZmV0Y2hPcHRpb25zID0gZmV0Y2hPcHRpb25zOyB9CiAKICAgICB1bnNpZ25l ZCBtX3NlbmRMb2FkQ2FsbGJhY2tzIDogMTsKICAgICB1bnNpZ25lZCBtX3NuaWZmQ29udGVudCA6 IDE7CkBAIC0xNTIsOSArMTQ4LDYgQEAgc3RydWN0IFJlc291cmNlTG9hZGVyT3B0aW9ucyB7CiAg ICAgQ29udGVudFNlY3VyaXR5UG9saWN5SW1wb3NpdGlvbiBtX2NvbnRlbnRTZWN1cml0eVBvbGlj eUltcG9zaXRpb24geyBDb250ZW50U2VjdXJpdHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNo ZWNrIH07CiAgICAgRGVmZXJzTG9hZGluZ1BvbGljeSBtX2RlZmVyc0xvYWRpbmdQb2xpY3kgeyBE ZWZlcnNMb2FkaW5nUG9saWN5OjpBbGxvd0RlZmVyc0xvYWRpbmcgfTsKICAgICBDYWNoaW5nUG9s aWN5IG1fY2FjaGluZ1BvbGljeSB7IENhY2hpbmdQb2xpY3k6OkFsbG93Q2FjaGluZyB9OwotICAg IEZldGNoT3B0aW9ucyBtX2ZldGNoT3B0aW9uczsKIH07CiAKLX0gLy8gbmFtZXNwYWNlIFdlYkNv cmUgICAgCi0KLSNlbmRpZiAvLyBSZXNvdXJjZUxvYWRlck9wdGlvbnNfaAorfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1N1YnJlc291cmNl TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAK aW5kZXggZDRmN2VlMDFmNTViZjYyZjcwOWI3NzlhYjBlZTZmYzMwMmYyMjEzNS4uYmQ5OTM0ZDFi YWM0ODlmMzUyYTQzZTZmMzQxOGU4OTM4YjIxODNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0xNzUsOCArMTc1LDggQEAgdm9pZCBTdWJyZXNv dXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJuYWwoUmVzb3VyY2VSZXF1ZXN0JiBuZXdS ZXF1ZXN0LCBjb24KIAogICAgIEFTU0VSVCghbmV3UmVxdWVzdC5pc051bGwoKSk7CiAgICAgaWYg KCFyZWRpcmVjdFJlc3BvbnNlLmlzTnVsbCgpKSB7Ci0gICAgICAgIGlmIChvcHRpb25zKCkuZmV0 Y2hPcHRpb25zKCkucmVkaXJlY3QgIT0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDo6Rm9sbG93KSB7 Ci0gICAgICAgICAgICBpZiAob3B0aW9ucygpLmZldGNoT3B0aW9ucygpLnJlZGlyZWN0ID09IEZl dGNoT3B0aW9uczo6UmVkaXJlY3Q6OkVycm9yKSB7CisgICAgICAgIGlmIChvcHRpb25zKCkucmVk aXJlY3QgIT0gRmV0Y2hPcHRpb25zOjpSZWRpcmVjdDo6Rm9sbG93KSB7CisgICAgICAgICAgICBp ZiAob3B0aW9ucygpLnJlZGlyZWN0ID09IEZldGNoT3B0aW9uczo6UmVkaXJlY3Q6OkVycm9yKSB7 CiAgICAgICAgICAgICAgICAgY2FuY2VsKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVM b2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmgKaW5kZXgg ZTM0M2VkMzMzYWFkMTZkMTEyZmZkNGNiZDE1NGY2MmQ2NjVkMDhjOC4uMzRjMDdhZDFlM2JhYWUx MGI1ZWU4Yzk3NGNlMjIyMGRjNmU3ZjhkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1RocmVhZGFibGVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFk YWJsZUxvYWRlci5oCkBAIC03Myw3ICs3Myw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAg ICAgUHJlZmxpZ2h0UG9saWN5IHByZWZsaWdodFBvbGljeSB7IENvbnNpZGVyUHJlZmxpZ2h0IH07 CiAgICAgICAgIENyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSBjcm9zc09yaWdpblJlcXVlc3RQb2xp Y3kgeyBEZW55Q3Jvc3NPcmlnaW5SZXF1ZXN0cyB9OwogICAgICAgICBDb250ZW50U2VjdXJpdHlQ b2xpY3lFbmZvcmNlbWVudCBjb250ZW50U2VjdXJpdHlQb2xpY3lFbmZvcmNlbWVudCB7IENvbnRl bnRTZWN1cml0eVBvbGljeUVuZm9yY2VtZW50OjpFbmZvcmNlQ29ubmVjdFNyY0RpcmVjdGl2ZSB9 OwotICAgICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luOwogICAgICAg ICBTdHJpbmcgaW5pdGlhdG9yOyAvLyBUaGlzIGNhbm5vdCBiZSBhbiBBdG9taWNTdHJpbmcsIGFz IGlzb2xhdGVkQ29weSgpIHdvdWxkbid0IGNyZWF0ZSBhbiBvYmplY3QgdGhhdCdzIHNhZmUgZm9y IHBhc3NpbmcgdG8gYW5vdGhlciB0aHJlYWQuCiAgICAgfTsKIAo=