164565 2016-11-09 16:04:34 -0800 Simplify logic of SecurityOrigin::databaseIdentifier 2016-11-09 16:22:10 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1249557 0 achristensen 2016-11-09 16:04:34 -0800 Simplify logic of SecurityOrigin::databaseIdentifier 1249559 1 294302 achristensen 2016-11-09 16:07:45 -0800 Created attachment 294302 Patch 1249565 2 achristensen 2016-11-09 16:22:10 -0800 http://trac.webkit.org/changeset/208507 294302 2016-11-09 16:07:45 -0800 2016-11-09 16:19:42 -0800 Patch bug-164565-20161109160334.patch text/plain 4266 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODUwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTExLTA5ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2ltcGxpZnkg bG9naWMgb2YgU2VjdXJpdHlPcmlnaW46OmRhdGFiYXNlSWRlbnRpZmllcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0NTY1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGJlaGF2aW9y LgorCisgICAgICAgIFNlY3VyaXR5T3JpZ2lucyB3aXRoIHRoZSBmaWxlIHNjaGVtZSBuZWVkIGEg c3BlY2lhbCBkYXRhYmFzZSBpZGVudGlmaWVyIHRvIGJlIGJhY2t3YXJkcy1jb21wYXRpYmxlIHdp dGggZXhpc3Rpbmcgc3RvcmFnZS4KKyAgICAgICAgSW5zdGVhZCBvZiBkZXRlcm1pbmluZyB3aGV0 aGVyIHRoaXMgaXMgYSBmaWxlIFNlY3VyaXR5T3JpZ2luIGF0IHBhcnNpbmcgdGltZSBhbmQgb25s eSB1c2luZyB0aGF0IGluZm9ybWF0aW9uIHdoZW4KKyAgICAgICAgbWFraW5nIHRoZSBkYXRhYmFz ZSBpZGVudGlmaWVyLCBqdXN0IGRldGVybWluZSB3aGV0aGVyIHdlIG5lZWQgdGhpcyBxdWlyayB3 aGVuIG1ha2luZyB0aGUgZGF0YWJhc2UgaWRlbnRpZmllci4KKyAgICAgICAgSSdtIHBsYW5uaW5n IHRvIG1vdmUgdGhpcyBsb2dpYyB0byBTZWN1cml0eU9yaWdpbkRhdGEgaW4gYW5vdGhlciBwYXRj aC4KKworICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW46OlNlY3VyaXR5T3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OlNl Y3VyaXR5T3JpZ2luOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46 OmRhdGFiYXNlSWRlbnRpZmllcik6CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgor CiAyMDE2LTExLTA5ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IFNUUCBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlP cmlnaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmln aW4uY3BwCShyZXZpc2lvbiAyMDg1MDApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5 T3JpZ2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTEwLDcgKzExMCw2IEBAIFNlY3VyaXR5T3Jp Z2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBVUkwKICAgICAsIG1fZG9tYWluV2FzU2V0SW5ET00o ZmFsc2UpCiAgICAgLCBtX3N0b3JhZ2VCbG9ja2luZ1BvbGljeShBbGxvd0FsbFN0b3JhZ2UpCiAg ICAgLCBtX2VuZm9yY2VGaWxlUGF0aFNlcGFyYXRpb24oZmFsc2UpCi0gICAgLCBtX25lZWRzRGF0 YWJhc2VJZGVudGlmaWVyUXVpcmtGb3JGaWxlcyhmYWxzZSkKIHsKICAgICAvLyBkb2N1bWVudC5k b21haW4gc3RhcnRzIGFzIG1faG9zdCwgYnV0IGNhbiBiZSBzZXQgYnkgdGhlIERPTS4KICAgICBt X2RvbWFpbiA9IG1faG9zdDsKQEAgLTEzNSw3ICsxMzQsNiBAQCBTZWN1cml0eU9yaWdpbjo6U2Vj dXJpdHlPcmlnaW4oKQogICAgICwgbV9jYW5Mb2FkTG9jYWxSZXNvdXJjZXMoZmFsc2UpCiAgICAg LCBtX3N0b3JhZ2VCbG9ja2luZ1BvbGljeShBbGxvd0FsbFN0b3JhZ2UpCiAgICAgLCBtX2VuZm9y Y2VGaWxlUGF0aFNlcGFyYXRpb24oZmFsc2UpCi0gICAgLCBtX25lZWRzRGF0YWJhc2VJZGVudGlm aWVyUXVpcmtGb3JGaWxlcyhmYWxzZSkKIHsKIH0KIApAQCAtMTUxLDcgKzE0OSw2IEBAIFNlY3Vy aXR5T3JpZ2luOjpTZWN1cml0eU9yaWdpbihjb25zdCBTZWMKICAgICAsIG1fY2FuTG9hZExvY2Fs UmVzb3VyY2VzKG90aGVyLT5tX2NhbkxvYWRMb2NhbFJlc291cmNlcykKICAgICAsIG1fc3RvcmFn ZUJsb2NraW5nUG9saWN5KG90aGVyLT5tX3N0b3JhZ2VCbG9ja2luZ1BvbGljeSkKICAgICAsIG1f ZW5mb3JjZUZpbGVQYXRoU2VwYXJhdGlvbihvdGhlci0+bV9lbmZvcmNlRmlsZVBhdGhTZXBhcmF0 aW9uKQotICAgICwgbV9uZWVkc0RhdGFiYXNlSWRlbnRpZmllclF1aXJrRm9yRmlsZXMob3RoZXIt Pm1fbmVlZHNEYXRhYmFzZUlkZW50aWZpZXJRdWlya0ZvckZpbGVzKQogewogfQogCkBAIC0xNjAs MTkgKzE1Nyw4IEBAIFJlZjxTZWN1cml0eU9yaWdpbj4gU2VjdXJpdHlPcmlnaW46OmNyZWEKICAg ICBpZiAoUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBjYWNoZWRPcmlnaW4gPSBnZXRDYWNoZWRPcmln aW4odXJsKSkKICAgICAgICAgcmV0dXJuIGNhY2hlZE9yaWdpbi5yZWxlYXNlTm9uTnVsbCgpOwog Ci0gICAgaWYgKHNob3VsZFRyZWF0QXNVbmlxdWVPcmlnaW4odXJsKSkgewotICAgICAgICBSZWY8 U2VjdXJpdHlPcmlnaW4+IG9yaWdpbihhZG9wdFJlZigqbmV3IFNlY3VyaXR5T3JpZ2luKSk7Ci0K LSAgICAgICAgaWYgKHVybC5wcm90b2NvbElzKCJmaWxlIikpIHsKLSAgICAgICAgICAgIC8vIFVu Zm9ydHVuYXRlbHksIHdlIGNhbid0IHJlcHJlc2VudCBhbGwgdW5pcXVlIG9yaWdpbnMgZXhhY3Rs eQotICAgICAgICAgICAgLy8gdGhlIHNhbWUgd2F5IGJlY2F1c2Ugd2UgbmVlZCB0byBwcm9kdWNl IGEgcXVpcmt5IGRhdGFiYXNlCi0gICAgICAgICAgICAvLyBpZGVudGlmaWVyIGZvciBmaWxlIFVS THMgZHVlIHRvIHBlcnNpc3RlbnQgc3RvcmFnZSBpbiBzb21lCi0gICAgICAgICAgICAvLyBlbWJl ZGRlcnMgb2YgV2ViS2l0LgotICAgICAgICAgICAgb3JpZ2luLT5tX25lZWRzRGF0YWJhc2VJZGVu dGlmaWVyUXVpcmtGb3JGaWxlcyA9IHRydWU7Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4g b3JpZ2luOwotICAgIH0KKyAgICBpZiAoc2hvdWxkVHJlYXRBc1VuaXF1ZU9yaWdpbih1cmwpKQor ICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTZWN1cml0eU9yaWdpbik7CiAKICAgICBpZiAo c2hvdWxkVXNlSW5uZXJVUkwodXJsKSkKICAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgU2Vj dXJpdHlPcmlnaW4oZXh0cmFjdElubmVyVVJMKHVybCkpKTsKQEAgLTU2NCw3ICs1NTAsNyBAQCBT dHJpbmcgU2VjdXJpdHlPcmlnaW46OmRhdGFiYXNlSWRlbnRpZmllCiAgICAgLy8gc3RyaW5nIGJl Y2F1c2Ugb2YgYSBidWcgaW4gaG93IHdlIGhhbmRsZWQgdGhlIHNjaGVtZSBmb3IgZmlsZSBVUkxz LgogICAgIC8vIE5vdyB0aGF0IHdlJ3ZlIGZpeGVkIHRoYXQgYnVnLCB3ZSBzdGlsbCBuZWVkIHRv IHByb2R1Y2UgdGhpcyBzdHJpbmcKICAgICAvLyB0byBhdm9pZCBicmVha2luZyBleGlzdGluZyBw ZXJzaXN0ZW50IHN0YXRlLgotICAgIGlmIChtX25lZWRzRGF0YWJhc2VJZGVudGlmaWVyUXVpcmtG b3JGaWxlcykKKyAgICBpZiAoZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShtX3Byb3RvY29sLCAiZmls ZSIpKQogICAgICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJmaWxlX18wIik7CiAKICAgICBTdHJp bmdCdWlsZGVyIHN0cmluZ0J1aWxkZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3Vy aXR5T3JpZ2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9y aWdpbi5oCShyZXZpc2lvbiAyMDg1MDApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5 T3JpZ2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzMiw3ICsyMzIsNiBAQCBwcml2YXRlOgogICAg IGJvb2wgbV9jYW5Mb2FkTG9jYWxSZXNvdXJjZXM7CiAgICAgU3RvcmFnZUJsb2NraW5nUG9saWN5 IG1fc3RvcmFnZUJsb2NraW5nUG9saWN5OwogICAgIGJvb2wgbV9lbmZvcmNlRmlsZVBhdGhTZXBh cmF0aW9uOwotICAgIGJvb2wgbV9uZWVkc0RhdGFiYXNlSWRlbnRpZmllclF1aXJrRm9yRmlsZXM7 CiB9OwogCiAvLyBSZXR1cm5zIHRydWUgaWYgdGhlIE9yaWdpbiBoZWFkZXIgdmFsdWVzIHNlcmlh bGl6ZWQgZnJvbSB0aGVzZSB0d28gb3JpZ2lucyB3b3VsZCBiZSB0aGUgc2FtZS4K