154746 2016-02-26 13:35:02 -0800 Add a toWebsiteDataType and reimplement toWebsiteDataTypes using it 2016-02-26 13:51:44 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1168655 0 andersca 2016-02-26 13:35:02 -0800 Add a toWebsiteDataType and reimplement toWebsiteDataTypes using it 1168656 1 272363 andersca 2016-02-26 13:35:23 -0800 Created attachment 272363 Patch 1168665 2 andersca 2016-02-26 13:51:44 -0800 Committed r197197: <http://trac.webkit.org/changeset/197197> 272363 2016-02-26 13:35:23 -0800 2016-02-26 13:42:45 -0800 Patch bug-154746-20160226133506.patch text/plain 5881 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzZlYzA0YWEyNWUwMzIw NjRlYzYzMzM4NTQ5MTEwMmRhMzMzMDgyMi4uMzljNTE5NmJjZTk2ZjI3MzZiNGJiZTE4NmU1YzFk NTczOTI4NTdhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE2LTAyLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGEgdG9XZWJz aXRlRGF0YVR5cGUgYW5kIHJlaW1wbGVtZW50IHRvV2Vic2l0ZURhdGFUeXBlcyB1c2luZyBpdAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0NzQ2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oOgorICAgICAgICAoV2Vi S2l0Ojp0b1dlYnNpdGVEYXRhVHlwZSk6CisgICAgICAgIChXZWJLaXQ6OnRvV2Vic2l0ZURhdGFU eXBlcyk6CisgICAgICAgIChXZWJLaXQ6OnRvV0tXZWJzaXRlRGF0YVR5cGVzKToKKworMjAxNi0w Mi0yNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEFk ZCBXVEY6Ok9wdGlvblNldCBhbmQgdXNlIGl0IGZvciB0aGUgd2Vic2l0ZSBkYXRhIHR5cGVzIGVu dW0KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDcz MwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi c2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaAppbmRleCA2ZGMzMThiNDZlYWE5NzY3 ZDc4NmI1YWY3N2NmMDcyZDc5NjQyY2U2Li41ZGRiYmU0NDM3YmI1YTg3Y2QxMWE2OTJmZjc3Mjc0 NTlmMTZkNzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgKQEAgLTMwLDYgKzMw LDcgQEAKICNpbXBvcnQgIkFQSVdlYnNpdGVEYXRhUmVjb3JkLmgiCiAjaW1wb3J0ICJXS09iamVj dC5oIgogI2ltcG9ydCA8d3RmL09wdGlvblNldC5oPgorI2ltcG9ydCA8d3RmL09wdGlvbmFsLmg+ CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC0zOSw0NiArNDAsNTIgQEAgaW5saW5lIFdLV2Vi c2l0ZURhdGFSZWNvcmQgKndyYXBwZXIoQVBJOjpXZWJzaXRlRGF0YVJlY29yZCYgd2Vic2l0ZURh dGFSZWNvcmQpCiAgICAgcmV0dXJuIChXS1dlYnNpdGVEYXRhUmVjb3JkICopd2Vic2l0ZURhdGFS ZWNvcmQud3JhcHBlcigpOwogfQogCi1zdGF0aWMgaW5saW5lIE9wdGlvblNldDxXZWJLaXQ6Oldl YnNpdGVEYXRhVHlwZT4gdG9XZWJzaXRlRGF0YVR5cGVzKE5TU2V0ICp3a1dlYnNpdGVEYXRhVHlw ZXMpCitzdGF0aWMgaW5saW5lIE9wdGlvbmFsPFdlYnNpdGVEYXRhVHlwZT4gdG9XZWJzaXRlRGF0 YVR5cGUoTlNTdHJpbmcgKndlYnNpdGVEYXRhVHlwZSkKIHsKLSAgICB1c2luZyBXZWJzaXRlRGF0 YVR5cGUgPSBXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZTsKLQotICAgIE9wdGlvblNldDxXZWJLaXQ6 OldlYnNpdGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBlczsKLQotICAgIGlmIChbd2tXZWJzaXRl RGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlQ29va2llc10pCi0gICAg ICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlOjpDb29raWVzOwotICAgIGlm IChbd2tXZWJzaXRlRGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlRGlz a0NhY2hlXSkKLSAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGU6OkRp c2tDYWNoZTsKLSAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVjdDpXS1dl YnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlXSkKLSAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBX ZWJzaXRlRGF0YVR5cGU6Ok1lbW9yeUNhY2hlOwotICAgIGlmIChbd2tXZWJzaXRlRGF0YVR5cGVz IGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlT2ZmbGluZVdlYkFwcGxpY2F0aW9uQ2Fj aGVdKQotICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZTo6T2ZmbGlu ZVdlYkFwcGxpY2F0aW9uQ2FjaGU7Ci0gICAgaWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMgY29udGFp bnNPYmplY3Q6V0tXZWJzaXRlRGF0YVR5cGVTZXNzaW9uU3RvcmFnZV0pCi0gICAgICAgIHdlYnNp dGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlOjpTZXNzaW9uU3RvcmFnZTsKLSAgICBpZiAo W3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09iamVjdDpXS1dlYnNpdGVEYXRhVHlwZUxvY2Fs U3RvcmFnZV0pCi0gICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlOjpM b2NhbFN0b3JhZ2U7Ci0gICAgaWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6 V0tXZWJzaXRlRGF0YVR5cGVXZWJTUUxEYXRhYmFzZXNdKQotICAgICAgICB3ZWJzaXRlRGF0YVR5 cGVzIHw9IFdlYnNpdGVEYXRhVHlwZTo6V2ViU1FMRGF0YWJhc2VzOwotICAgIGlmIChbd2tXZWJz aXRlRGF0YVR5cGVzIGNvbnRhaW5zT2JqZWN0OldLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0 YWJhc2VzXSkKLSAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGU6Oklu ZGV4ZWREQkRhdGFiYXNlczsKLSAgICBpZiAoW3drV2Vic2l0ZURhdGFUeXBlcyBjb250YWluc09i amVjdDpfV0tXZWJzaXRlRGF0YVR5cGVIU1RTQ2FjaGVdKQotICAgICAgICB3ZWJzaXRlRGF0YVR5 cGVzIHw9IFdlYnNpdGVEYXRhVHlwZTo6SFNUU0NhY2hlOwotICAgIGlmIChbd2tXZWJzaXRlRGF0 YVR5cGVzIGNvbnRhaW5zT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZU1lZGlhS2V5c10pCi0gICAg ICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlOjpNZWRpYUtleXM7Ci0gICAg aWYgKFt3a1dlYnNpdGVEYXRhVHlwZXMgY29udGFpbnNPYmplY3Q6X1dLV2Vic2l0ZURhdGFUeXBl U2VhcmNoRmllbGRSZWNlbnRTZWFyY2hlc10pCi0gICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0g V2Vic2l0ZURhdGFUeXBlOjpTZWFyY2hGaWVsZFJlY2VudFNlYXJjaGVzOworICAgIGlmIChbd2Vi c2l0ZURhdGFUeXBlIGlzRXF1YWxUb1N0cmluZzpXS1dlYnNpdGVEYXRhVHlwZUNvb2tpZXNdKQor ICAgICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBlOjpDb29raWVzOworICAgIGlmIChbd2Vic2l0 ZURhdGFUeXBlIGlzRXF1YWxUb1N0cmluZzpXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNoZV0pCisg ICAgICAgIHJldHVybiBXZWJzaXRlRGF0YVR5cGU6OkRpc2tDYWNoZTsKKyAgICBpZiAoW3dlYnNp dGVEYXRhVHlwZSBpc0VxdWFsVG9TdHJpbmc6V0tXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZV0p CisgICAgICAgIHJldHVybiBXZWJzaXRlRGF0YVR5cGU6Ok1lbW9yeUNhY2hlOworICAgIGlmIChb d2Vic2l0ZURhdGFUeXBlIGlzRXF1YWxUb1N0cmluZzpXS1dlYnNpdGVEYXRhVHlwZU9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlXSkKKyAgICAgICAgcmV0dXJuIFdlYnNpdGVEYXRhVHlwZTo6T2Zm bGluZVdlYkFwcGxpY2F0aW9uQ2FjaGU7CisgICAgaWYgKFt3ZWJzaXRlRGF0YVR5cGUgaXNFcXVh bFRvU3RyaW5nOldLV2Vic2l0ZURhdGFUeXBlU2Vzc2lvblN0b3JhZ2VdKQorICAgICAgICByZXR1 cm4gV2Vic2l0ZURhdGFUeXBlOjpTZXNzaW9uU3RvcmFnZTsKKyAgICBpZiAoW3dlYnNpdGVEYXRh VHlwZSBpc0VxdWFsVG9TdHJpbmc6V0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2VdKQorICAg ICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBlOjpMb2NhbFN0b3JhZ2U7CisgICAgaWYgKFt3ZWJz aXRlRGF0YVR5cGUgaXNFcXVhbFRvU3RyaW5nOldLV2Vic2l0ZURhdGFUeXBlV2ViU1FMRGF0YWJh c2VzXSkKKyAgICAgICAgcmV0dXJuIFdlYnNpdGVEYXRhVHlwZTo6V2ViU1FMRGF0YWJhc2VzOwor ICAgIGlmIChbd2Vic2l0ZURhdGFUeXBlIGlzRXF1YWxUb1N0cmluZzpXS1dlYnNpdGVEYXRhVHlw ZUluZGV4ZWREQkRhdGFiYXNlc10pCisgICAgICAgIHJldHVybiBXZWJzaXRlRGF0YVR5cGU6Oklu ZGV4ZWREQkRhdGFiYXNlczsKKyAgICBpZiAoW3dlYnNpdGVEYXRhVHlwZSBpc0VxdWFsVG9TdHJp bmc6X1dLV2Vic2l0ZURhdGFUeXBlSFNUU0NhY2hlXSkKKyAgICAgICAgcmV0dXJuIFdlYnNpdGVE YXRhVHlwZTo6SFNUU0NhY2hlOworICAgIGlmIChbd2Vic2l0ZURhdGFUeXBlIGlzRXF1YWxUb1N0 cmluZzpfV0tXZWJzaXRlRGF0YVR5cGVNZWRpYUtleXNdKQorICAgICAgICByZXR1cm4gV2Vic2l0 ZURhdGFUeXBlOjpNZWRpYUtleXM7CisgICAgaWYgKFt3ZWJzaXRlRGF0YVR5cGUgaXNFcXVhbFRv U3RyaW5nOl9XS1dlYnNpdGVEYXRhVHlwZVNlYXJjaEZpZWxkUmVjZW50U2VhcmNoZXNdKQorICAg ICAgICByZXR1cm4gV2Vic2l0ZURhdGFUeXBlOjpTZWFyY2hGaWVsZFJlY2VudFNlYXJjaGVzOwog I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIGlmIChbd2tXZWJzaXRlRGF0YVR5 cGVzIGNvbnRhaW5zT2JqZWN0Ol9XS1dlYnNpdGVEYXRhVHlwZVBsdWdJbkRhdGFdKQotICAgICAg ICB3ZWJzaXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZTo6UGx1Z0luRGF0YTsKKyAgICBp ZiAoW3dlYnNpdGVEYXRhVHlwZSBpc0VxdWFsVG9TdHJpbmc6X1dLV2Vic2l0ZURhdGFUeXBlUGx1 Z0luRGF0YV0pCisgICAgICAgIHJldHVybiBXZWJzaXRlRGF0YVR5cGU6OlBsdWdJbkRhdGE7CiAj ZW5kaWYKIAotICAgIHJldHVybiB3ZWJzaXRlRGF0YVR5cGVzOworICAgIHJldHVybiBOdWxsb3B0 OwogfQogCi1zdGF0aWMgaW5saW5lIFJldGFpblB0cjxOU1NldD4gdG9XS1dlYnNpdGVEYXRhVHlw ZXMoT3B0aW9uU2V0PFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlPiB3ZWJzaXRlRGF0YVR5cGVzKQor c3RhdGljIGlubGluZSBPcHRpb25TZXQ8V2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU+IHRvV2Vic2l0 ZURhdGFUeXBlcyhOU1NldCAqd2Vic2l0ZURhdGFUeXBlcykKIHsKLS8vICAgIHVzaW5nIFdlYnNp dGVEYXRhVHlwZXMgPSBXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZTsKKyAgICBPcHRpb25TZXQ8V2Vi S2l0OjpXZWJzaXRlRGF0YVR5cGU+IHJlc3VsdDsKKworICAgIGZvciAoTlNTdHJpbmcgKndlYnNp dGVEYXRhVHlwZSBpbiB3ZWJzaXRlRGF0YVR5cGVzKSB7CisgICAgICAgIGlmIChhdXRvIGRhdGFU eXBlID0gdG9XZWJzaXRlRGF0YVR5cGUod2Vic2l0ZURhdGFUeXBlKSkKKyAgICAgICAgICAgIHJl c3VsdCB8PSAqZGF0YVR5cGU7CisgICAgfQorCisgICAgcmV0dXJuIHJlc3VsdDsKK30KIAorc3Rh dGljIGlubGluZSBSZXRhaW5QdHI8TlNTZXQ+IHRvV0tXZWJzaXRlRGF0YVR5cGVzKE9wdGlvblNl dDxXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZT4gd2Vic2l0ZURhdGFUeXBlcykKK3sKICAgICBhdXRv IHdrV2Vic2l0ZURhdGFUeXBlcyA9IGFkb3B0TlMoW1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRd KTsKIAogICAgIGlmICh3ZWJzaXRlRGF0YVR5cGVzLmNvbnRhaW5zKFdlYnNpdGVEYXRhVHlwZTo6 Q29va2llcykpCg==