170813 2017-04-13 10:46:12 -0700 Add additional information when logging URL disposition in WebLoaderStrategy::scheduleLoad 2017-04-18 15:28:16 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 krollin krollin achristensen commit-queue koivisto mcatanzaro oldest_to_newest 1297031 0 krollin 2017-04-13 10:46:12 -0700 There are a few logging statements in WebLoaderStrategy::scheduleLoad that report, for example, "URL will be loaded as data". These statements also log the address of the frame doing the loading and the identifier of the resource. For consistency with other logging and to make scripted analysis of the logs more robust, also include the pageID and frameID in the logging. 1297033 1 306996 krollin 2017-04-13 10:48:14 -0700 Created attachment 306996 Patch 1297978 2 306996 mcatanzaro 2017-04-17 12:43:08 -0700 Comment on attachment 306996 Patch PRIu64 is the best cross-platform way to print a uint64_t, so this looks right to me. It technically needs an owner to approve it, though. 1298442 3 krollin 2017-04-18 14:45:48 -0700 Adding Antti and Alex, who both did previous reviews on this code. 1298467 4 306996 commit-queue 2017-04-18 15:28:14 -0700 Comment on attachment 306996 Patch Clearing flags on attachment: 306996 Committed r215481: <http://trac.webkit.org/changeset/215481> 1298468 5 commit-queue 2017-04-18 15:28:16 -0700 All reviewed patches have been landed. Closing bug. 306996 2017-04-13 10:48:14 -0700 2017-04-18 15:28:14 -0700 Patch bug-170813-20170413104814.patch text/plain 6180 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1Mjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzQwOTllZTNhYjMxODYw ZmU3ODY3ZDViOWYyMWFjNzZiNzQ2MDNlZi4uZmM1MDY5ZDNkODZkYzI5YzRkZTczZWZiYWRjMzhh OWQ4MmViZmU4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTA0LTEzICBLZWl0 aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYWRkaXRpb25hbCBp bmZvcm1hdGlvbiB3aGVuIGxvZ2dpbmcgVVJMIGRpc3Bvc2l0aW9uIGluIFdlYkxvYWRlclN0cmF0 ZWd5OjpzY2hlZHVsZUxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MDgxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZXJlIGFyZSBhIGZldyBsb2dnaW5nIHN0YXRlbWVudHMgaW4gV2ViTG9hZGVy U3RyYXRlZ3k6OnNjaGVkdWxlTG9hZAorICAgICAgICB0aGF0IHJlcG9ydCwgZm9yIGV4YW1wbGUs ICJVUkwgd2lsbCBiZSBsb2FkZWQgYXMgZGF0YSIuIFRoZXNlCisgICAgICAgIHN0YXRlbWVudHMg YWxzbyBsb2cgdGhlIGFkZHJlc3Mgb2YgdGhlIGZyYW1lIGRvaW5nIHRoZSBsb2FkaW5nIGFuZCB0 aGUKKyAgICAgICAgaWRlbnRpZmllciBvZiB0aGUgcmVzb3VyY2UuIEZvciBjb25zaXN0ZW5jeSB3 aXRoIG90aGVyIGxvZ2dpbmcgYW5kIHRvCisgICAgICAgIG1ha2Ugc2NyaXB0ZWQgYW5hbHlzaXMg b2YgdGhlIGxvZ3MgbW9yZSByb2J1c3QsIGFsc28gaW5jbHVkZSB0aGUKKyAgICAgICAgcGFnZUlE IGFuZCBmcmFtZUlEIGluIHRoZSBsb2dnaW5nLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3 b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTG9hZGVyU3Ry YXRlZ3k6OnNjaGVkdWxlTG9hZCk6CisKIDIwMTctMDQtMTIgIEtlaXRoIFJvbGxpbiAgPGtyb2xs aW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzb21lIG1pc3NpbmcgTmV0d29ya1Jlc291cmNl TG9hZGVyIGxvZ2dpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0 d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05l dHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDdhOWI2ZjA4OWFjNzEyNmZmN2FmNzk2 OGFlYjVjZWMyYmIwZWJjOWQuLmJlMGIyZTJlZmZmZmJmNjNkYjZkOTQ3ZjJkOTgwZWMwZWRlMDA1 ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTmV0d29yay9XZWJMb2Fk ZXJTdHJhdGVneS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9OZXR3b3JrL1dl YkxvYWRlclN0cmF0ZWd5LmNwcApAQCAtMTU3LDcgKzE1Nyw3IEBAIHZvaWQgV2ViTG9hZGVyU3Ry YXRlZ3k6OnNjaGVkdWxlTG9hZChSZXNvdXJjZUxvYWRlciYgcmVzb3VyY2VMb2FkZXIsIENhY2hl ZFJlc291CiAgICAgLy8gdGhlbiB3ZSBzaG91bGQgcmVtZW1iZXIgdGhlIFJlc291cmNlTG9hZGVy IGluIG91ciByZWNvcmRzIGJ1dCBub3Qgc2NoZWR1bGUgaXQgaW4gdGhlIE5ldHdvcmtQcm9jZXNz LgogICAgIGlmIChyZXNvdXJjZUxvYWRlci5kb2N1bWVudExvYWRlcigpLT5zY2hlZHVsZUFyY2hp dmVMb2FkKHJlc291cmNlTG9hZGVyLCByZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkpKSB7CiAgICAg ICAgIExPRyhOZXR3b3JrU2NoZWR1bGluZywgIihXZWJQcm9jZXNzKSBXZWJMb2FkZXJTdHJhdGVn eTo6c2NoZWR1bGVMb2FkLCB1cmwgJyVzJyB3aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSBy ZXNvdXJjZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK LSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChyZXNvdXJjZUxvYWRlciwgInNjaGVkdWxl TG9hZDogVVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhbiBhcmNoaXZlIHJlc291cmNlIChmcmFtZSA9 ICVwLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwg aWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQocmVzb3VyY2VMb2Fk ZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGhhbmRsZWQgYXMgYW4gYXJjaGl2ZSByZXNv dXJjZSAoZnJhbWUgPSAlcCwgcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1lSUQgPSAlIiBQUkl1 NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCks IHRyYWNraW5nUGFyYW1ldGVycy5wYWdlSUQsIHRyYWNraW5nUGFyYW1ldGVycy5mcmFtZUlELCBp ZGVudGlmaWVyKTsKICAgICAgICAgbV93ZWJSZXNvdXJjZUxvYWRlcnMuc2V0KGlkZW50aWZpZXIs IFdlYlJlc291cmNlTG9hZGVyOjpjcmVhdGUocmVzb3VyY2VMb2FkZXIsIHRyYWNraW5nUGFyYW1l dGVycykpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTY1LDE0ICsxNjUsMTQgQEAgdm9p ZCBXZWJMb2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJj ZUxvYWRlciwgQ2FjaGVkUmVzb3UKIAogICAgIGlmIChyZXNvdXJjZUxvYWRlci5kb2N1bWVudExv YWRlcigpLT5hcHBsaWNhdGlvbkNhY2hlSG9zdCgpLm1heWJlTG9hZFJlc291cmNlKHJlc291cmNl TG9hZGVyLCByZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCksIHJlc291cmNlTG9hZGVyLnJlcXVlc3Qo KS51cmwoKSkpIHsKICAgICAgICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdlYlByb2Nlc3Mp IFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgbG9hZGVk IGZyb20gYXBwbGljYXRpb24gY2FjaGUuIiwgcmVzb3VyY2VMb2FkZXIudXJsKCkuc3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQocmVzb3VyY2VM b2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGxvYWRlZCBmcm9tIGFwcGxpY2F0aW9u IGNhY2hlIChmcmFtZSA9ICVwLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VM b2FkZXIuZnJhbWUoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQocmVzb3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGxvYWRlZCBmcm9t IGFwcGxpY2F0aW9uIGNhY2hlIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJh bWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VM b2FkZXIuZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCwgdHJhY2tpbmdQYXJhbWV0 ZXJzLmZyYW1lSUQsIGlkZW50aWZpZXIpOwogICAgICAgICBtX3dlYlJlc291cmNlTG9hZGVycy5z ZXQoaWRlbnRpZmllciwgV2ViUmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShyZXNvdXJjZUxvYWRlciwg dHJhY2tpbmdQYXJhbWV0ZXJzKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKICAgICBpZiAo cmVzb3VyY2VMb2FkZXIucmVxdWVzdCgpLnVybCgpLnByb3RvY29sSXNEYXRhKCkpIHsKICAgICAg ICAgTE9HKE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0ZWd5 OjpzY2hlZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgbG9hZGVkIGFzIGRhdGEuIiwgcmVzb3Vy Y2VMb2FkZXIudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQocmVzb3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJl IGxvYWRlZCBhcyBkYXRhIChmcmFtZSA9ICVwLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwg cmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQocmVzb3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGxv YWRlZCBhcyBkYXRhIChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9 ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIu ZnJhbWUoKSwgdHJhY2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZy YW1lSUQsIGlkZW50aWZpZXIpOwogICAgICAgICBzdGFydExvY2FsTG9hZChyZXNvdXJjZUxvYWRl cik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0xODAsNyArMTgwLDcgQEAgdm9pZCBXZWJM b2FkZXJTdHJhdGVneTo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRl ciwgQ2FjaGVkUmVzb3UKICNpZiBVU0UoUVVJQ0tfTE9PSykKICAgICBpZiAoaXNRdWlja0xvb2tQ cmV2aWV3VVJMKHJlc291cmNlTG9hZGVyLnJlcXVlc3QoKS51cmwoKSkpIHsKICAgICAgICAgTE9H KE5ldHdvcmtTY2hlZHVsaW5nLCAiKFdlYlByb2Nlc3MpIFdlYkxvYWRlclN0cmF0ZWd5OjpzY2hl ZHVsZUxvYWQsIHVybCAnJXMnIHdpbGwgYmUgaGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNvdXJj ZS4iLCByZXNvdXJjZUxvYWRlci51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICAg ICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRChyZXNvdXJjZUxvYWRlciwgInNjaGVkdWxlTG9hZDog VVJMIHdpbGwgYmUgaGFuZGxlZCBhcyBhIFF1aWNrTG9vayByZXNvdXJjZSAoZnJhbWUgPSAlcCwg cmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiKSIsIHJlc291cmNlTG9hZGVyLmZyYW1lKCksIGlkZW50 aWZpZXIpOworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKHJlc291cmNlTG9hZGVyLCAi c2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGFzIGEgUXVpY2tMb29rIHJlc291cmNl IChmcmFtZSA9ICVwLCBwYWdlSUQgPSAlIiBQUkl1NjQgIiwgZnJhbWVJRCA9ICUiIFBSSXU2NCAi LCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2FkZXIuZnJhbWUoKSwgdHJh Y2tpbmdQYXJhbWV0ZXJzLnBhZ2VJRCwgdHJhY2tpbmdQYXJhbWV0ZXJzLmZyYW1lSUQsIGlkZW50 aWZpZXIpOwogICAgICAgICBzdGFydExvY2FsTG9hZChyZXNvdXJjZUxvYWRlcik7CiAgICAgICAg IHJldHVybjsKICAgICB9CkBAIC0xOTEsNyArMTkxLDcgQEAgdm9pZCBXZWJMb2FkZXJTdHJhdGVn eTo6c2NoZWR1bGVMb2FkKFJlc291cmNlTG9hZGVyJiByZXNvdXJjZUxvYWRlciwgQ2FjaGVkUmVz b3UKICAgICAvLyBodHRwczovL2Jsb2dzLmdub21lLm9yZy9hbGV4bC8yMDEyLzAxLzI2L3Jlc291 cmNlcy1pbi1nbGliLwogICAgIGlmIChyZXNvdXJjZUxvYWRlci5yZXF1ZXN0KCkudXJsKCkucHJv dG9jb2xJcygicmVzb3VyY2UiKSkgewogICAgICAgICBMT0coTmV0d29ya1NjaGVkdWxpbmcsICIo V2ViUHJvY2VzcykgV2ViTG9hZGVyU3RyYXRlZ3k6OnNjaGVkdWxlTG9hZCwgdXJsICclcycgd2ls bCBiZSBoYW5kbGVkIGFzIGEgR1Jlc291cmNlLiIsIHJlc291cmNlTG9hZGVyLnVybCgpLnN0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKHJlc291 cmNlTG9hZGVyLCAic2NoZWR1bGVMb2FkOiBVUkwgd2lsbCBiZSBoYW5kbGVkIGFzIGEgR1Jlc291 cmNlIChmcmFtZSA9ICVwLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICIpIiwgcmVzb3VyY2VMb2Fk ZXIuZnJhbWUoKSwgaWRlbnRpZmllcik7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo cmVzb3VyY2VMb2FkZXIsICJzY2hlZHVsZUxvYWQ6IFVSTCB3aWxsIGJlIGhhbmRsZWQgYXMgYSBH UmVzb3VyY2UgKGZyYW1lID0gJXAsIHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIg UFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIikiLCByZXNvdXJjZUxvYWRlci5mcmFt ZSgpLCB0cmFja2luZ1BhcmFtZXRlcnMucGFnZUlELCB0cmFja2luZ1BhcmFtZXRlcnMuZnJhbWVJ RCwgaWRlbnRpZmllcik7CiAgICAgICAgIHN0YXJ0TG9jYWxMb2FkKHJlc291cmNlTG9hZGVyKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0K