41271 2010-06-27 23:49:59 -0700 Sketch out the InBodyMode for the tree builder 2010-06-28 00:18:40 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric oldest_to_newest 243571 0 abarth 2010-06-27 23:49:59 -0700 Sketch out the InBodyMode for the tree builder 243572 1 59874 abarth 2010-06-27 23:51:26 -0700 Created attachment 59874 Patch 243573 2 59874 eric 2010-06-27 23:53:53 -0700 Comment on attachment 59874 Patch This is not a long term solution, obviously. :) 243580 3 59874 commit-queue 2010-06-28 00:18:30 -0700 Comment on attachment 59874 Patch Clearing flags on attachment: 59874 Committed r61982: <http://trac.webkit.org/changeset/61982> 243581 4 commit-queue 2010-06-28 00:18:40 -0700 All reviewed patches have been landed. Closing bug. 59874 2010-06-27 23:51:26 -0700 2010-06-28 00:18:30 -0700 Patch bug-41271-20100627235125.patch text/plain 12091 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGRiNGQ1ZjEwMDViMjc5MDgyZGYyNTJkNzhmNzYzZDBhY2ViNGIwNS4uYTZhZTllOGE2MTc2OTFh ZDMwNmFhNTk1NTRkZTMxMWZkOTViOTcyYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNi0yNyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFNrZXRjaCBvdXQgdGhlIEluQm9keU1vZGUgZm9yIHRoZSB0 cmVlIGJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQxMjcxCisKKyAgICAgICAgVGhpcyBnaXZlcyB1cyBzb21lIGJhc2ljIGJlaGF2aW9yIGZv ciB0aGUgSW5Cb2R5TW9kZS4gIEkndmUgaW1wbGVtZW50ZWQKKyAgICAgICAgc29tZSBvZiB0aGUg ZWFzaWVyIGxvZ2ljLiAgVGhlIG1vcmUgY29tcGxpY2F0ZWQgbG9naWMgd2lsbCBiZSBpbgorICAg ICAgICBzdWJzZXF1ZW50IHBhdGNoZXMuCisKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRh Zyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWcpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjppbnNlcnRGb3JtYXRpbmdFbGVtZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUcmVlQnVpbGRlcjo6cmVjb25zdHJ1Y3RUaGVBY3Rp dmVGb3JtYXR0aW5nRWxlbWVudHMpOgorICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmg6 CisKIDIwMTAtMDYtMjUgIFl1em8gRnVqaXNoaW1hICA8eXV6b0Bnb29nbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IFNoaW5pY2hpcm8gSGFtYWppLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9o dG1sL0hUTUxUcmVlQnVpbGRlci5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNw cAppbmRleCBlNmFmYmUzMjQzMzI3ZjVhNTM5ODljMGVmYzY0MWNkMDJmYjdlOTRjLi40NTcxMjg5 NmViMGM4MWQ4MTFmNzE1ZmVjN2VkZjg4ZmU4ZTNkMjFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVy LmNwcApAQCAtMzUzLDcgKzM1MywxOTIgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NT dGFydFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgICAgICAvLyBGYWxsIHRocm91Z2gK ICAgICBjYXNlIEluQm9keU1vZGU6CiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0g SW5Cb2R5TW9kZSk7Ci0gICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gaHRtbFRhZykgeworICAgICAgICAgICAgaW5zZXJ0SFRNTFN0YXJ0VGFnSW5C b2R5KHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAo dG9rZW4ubmFtZSgpID09IGJhc2VUYWcgfHwgdG9rZW4ubmFtZSgpID09ICJjb21tYW5kIiB8fCB0 b2tlbi5uYW1lKCkgPT0gbGlua1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZyB8fCB0b2tl bi5uYW1lKCkgPT0gbm9mcmFtZXNUYWcgfHwgdG9rZW4ubmFtZSgpID09IHNjcmlwdFRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gc3R5bGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRpdGxlVGFnKSB7Cisg ICAgICAgICAgICBib29sIGRpZFByb2Nlc3MgPSBwcm9jZXNzU3RhcnRUYWdGb3JJbkhlYWQodG9r ZW4pOworICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChkaWRQcm9jZXNzLCBkaWRQcm9jZXNzKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgp ID09IGJvZHlUYWcpIHsKKyAgICAgICAgICAgIHBhcnNlRXJyb3IodG9rZW4pOworICAgICAgICAg ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAg ICAgICBpZiAodG9rZW4ubmFtZSgpID09IGZyYW1lc2V0VGFnKSB7CisgICAgICAgICAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gYWRkcmVzc1RhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYXJ0aWNsZVRh ZyB8fCB0b2tlbi5uYW1lKCkgPT0gYXNpZGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGJsb2NrcXVv dGVUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNlbnRlclRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gImRl dGFpbHMiIHx8IHRva2VuLm5hbWUoKSA9PSBkaXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGRpdlRh ZyB8fCB0b2tlbi5uYW1lKCkgPT0gZGxUYWcgfHwgdG9rZW4ubmFtZSgpID09IGZpZWxkc2V0VGFn IHx8IHRva2VuLm5hbWUoKSA9PSAiZmlndXJlIiB8fCB0b2tlbi5uYW1lKCkgPT0gZm9vdGVyVGFn IHx8IHRva2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcgfHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRh ZyB8fCB0b2tlbi5uYW1lKCkgPT0gbWVudVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gbmF2VGFnIHx8 IHRva2VuLm5hbWUoKSA9PSBvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gcFRhZyB8fCB0b2tlbi5u YW1lKCkgPT0gc2VjdGlvblRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdWxUYWcpIHsKKyAgICAgICAg ICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgp ID09IGgxVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBoMlRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gaDNU YWcgfHwgdG9rZW4ubmFtZSgpID09IGg0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBoNVRhZyB8fCB0 b2tlbi5uYW1lKCkgPT0gaDZUYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHByZVRhZyB8fCB0b2tlbi5uYW1l KCkgPT0gbGlzdGluZ1RhZykgeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAg ICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgbV90b2tlbml6ZXItPnNr aXBMZWFkaW5nTmV3TGluZUZvckxpc3RpbmcoKTsKKyAgICAgICAgICAgIG1fZnJhbWVzZXRPayA9 IGZhbHNlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tl bi5uYW1lKCkgPT0gZm9ybVRhZykgeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgbV9mb3JtRWxlbWVu dCA9IGN1cnJlbnRFbGVtZW50KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBsaVRhZykgeworICAgICAgICAgICAgbm90SW1wbGVt ZW50ZWQoKTsKKyAgICAgICAgICAgIGluc2VydEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gZGRUYWcgfHwg dG9rZW4ubmFtZSgpID09IGR0VGFnKSB7CisgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOwor ICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBwbGFpbnRleHRUYWcpIHsKKyAg ICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRv a2VuKTsKKyAgICAgICAgICAgIG1fdG9rZW5pemVyLT5zZXRTdGF0ZShIVE1MVG9rZW5pemVyOjpQ TEFJTlRFWFRTdGF0ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAg aWYgKHRva2VuLm5hbWUoKSA9PSBidXR0b25UYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxlbWVu dGVkKCk7CisgICAgICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50 cygpOworICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBtX2Zy YW1lc2V0T2sgPSBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAg ICBpZiAodG9rZW4ubmFtZSgpID09IGFUYWcpIHsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp OworICAgICAgICAgICAgaW5zZXJ0Rm9ybWF0aW5nRWxlbWVudCh0b2tlbik7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBiVGFnIHx8 IHRva2VuLm5hbWUoKSA9PSBiaWdUYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvZGVUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGVtVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBmb250VGFnIHx8IHRva2VuLm5h bWUoKSA9PSBpVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBzVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBz bWFsbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gc3RyaWtlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBz dHJvbmdUYWcgfHwgdG9rZW4ubmFtZSgpID09IHR0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSB1VGFn KSB7CisgICAgICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp OworICAgICAgICAgICAgaW5zZXJ0Rm9ybWF0aW5nRWxlbWVudCh0b2tlbik7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBub2JyVGFn KSB7CisgICAgICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygp OworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGluc2VydEZvcm1h dGluZ0VsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAg ICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYXBwbGV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBtYXJx dWVlVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBvYmplY3RUYWcpIHsKKyAgICAgICAgICAgIHJlY29u c3RydWN0VGhlQWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCk7CisgICAgICAgICAgICBpbnNlcnRF bGVtZW50KHRva2VuKTsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAg ICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQor ICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHRhYmxlVGFnKSB7CisgICAgICAgICAgICBub3RJ bXBsZW1lbnRlZCgpOworICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAg ICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKKyAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9 IEluVGFibGVNb2RlOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgICAgIGlm ICh0b2tlbi5uYW1lKCkgPT0gYXJlYVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gYmFzZWZvbnRUYWcg fHwgdG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIiB8fCB0b2tlbi5uYW1lKCkgPT0gYnJUYWcgfHwg dG9rZW4ubmFtZSgpID09IGVtYmVkVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBpbWdUYWcgfHwgdG9r ZW4ubmFtZSgpID09IGlucHV0VGFnIHx8IHRva2VuLm5hbWUoKSA9PSBrZXlnZW5UYWcgfHwgdG9r ZW4ubmFtZSgpID09IHdiclRhZykgeworICAgICAgICAgICAgcmVjb25zdHJ1Y3RUaGVBY3RpdmVG b3JtYXR0aW5nRWxlbWVudHMoKTsKKyAgICAgICAgICAgIGluc2VydFNlbGZDbG9zaW5nRWxlbWVu dCh0b2tlbik7CisgICAgICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IHBhcmFtVGFn IHx8IHRva2VuLm5hbWUoKSA9PSBzb3VyY2VUYWcgfHwgdG9rZW4ubmFtZSgpID09ICJ0cmFjayIp IHsKKyAgICAgICAgICAgIGluc2VydFNlbGZDbG9zaW5nRWxlbWVudCh0b2tlbik7CisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBoclRh ZykgeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgICAgIGluc2VydFNl bGZDbG9zaW5nRWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxz ZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFt ZSgpID09IGltYWdlVGFnKSB7CisgICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAg ICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICAvLyBBcHBhcmVudGx5IHdlJ3Jl IG5vdCBzdXBwb3NlZCB0byBhc2suCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBpc2luZGV4VGFnKSB7CisgICAgICAgICAgICBwYXJz ZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAg ICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSB0ZXh0YXJl YVRhZykgeworICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBt X3Rva2VuaXplci0+c2tpcExlYWRpbmdOZXdMaW5lRm9yTGlzdGluZygpOworICAgICAgICAgICAg bV90b2tlbml6ZXItPnNldFN0YXRlKEhUTUxUb2tlbml6ZXI6OlJDREFUQVN0YXRlKTsKKyAgICAg ICAgICAgIG1fb3JpZ2luYWxJbnNlcnRpb25Nb2RlID0gbV9pbnNlcnRpb25Nb2RlOworICAgICAg ICAgICAgbV9mcmFtZXNldE9rID0gZmFsc2U7CisgICAgICAgICAgICBtX2luc2VydGlvbk1vZGUg PSBUZXh0TW9kZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAo dG9rZW4ubmFtZSgpID09IHhtcFRhZykgeworICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICAgICAgICAgIHJlY29uc3RydWN0VGhlQWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzKCk7Cisg ICAgICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKKyAgICAgICAgICAgIGluc2VydEdlbmVy aWNSYXdUZXh0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBpZnJhbWVUYWcpIHsKKyAgICAgICAgICAgIG1f ZnJhbWVzZXRPayA9IGZhbHNlOworICAgICAgICAgICAgaW5zZXJ0R2VuZXJpY1Jhd1RleHRFbGVt ZW50KHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAo dG9rZW4ubmFtZSgpID09IG5vZW1iZWRUYWcpIHsKKyAgICAgICAgICAgIGluc2VydEdlbmVyaWNS YXdUZXh0RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBub3NjcmlwdFRhZyAmJiBpc1NjcmlwdGluZ0ZsYWdF bmFibGVkKG1fZG9jdW1lbnQtPmZyYW1lKCkpKSB7CisgICAgICAgICAgICBpbnNlcnRHZW5lcmlj UmF3VGV4dEVsZW1lbnQodG9rZW4pOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9Cisg ICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gc2VsZWN0VGFnKSB7CisgICAgICAgICAgICByZWNv bnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpOworICAgICAgICAgICAgaW5zZXJ0 RWxlbWVudCh0b2tlbik7CisgICAgICAgICAgICBtX2ZyYW1lc2V0T2sgPSBmYWxzZTsKKyAgICAg ICAgICAgIGlmIChtX2luc2VydGlvbk1vZGUgPT0gSW5UYWJsZU1vZGUgfHwgbV9pbnNlcnRpb25N b2RlID09IEluQ2FwdGlvbk1vZGUgfHwgbV9pbnNlcnRpb25Nb2RlID09IEluQ29sdW1uR3JvdXBN b2RlIHx8IG1faW5zZXJ0aW9uTW9kZSA9PSBJblRhYmxlQm9keU1vZGUgfHwgbV9pbnNlcnRpb25N b2RlID09IEluUm93TW9kZSB8fCBtX2luc2VydGlvbk1vZGUgPT0gSW5DZWxsTW9kZSkKKyAgICAg ICAgICAgICAgICBtX2luc2VydGlvbk1vZGUgPSBJblNlbGVjdEluVGFibGVNb2RlOworICAgICAg ICAgICAgZWxzZQorICAgICAgICAgICAgICAgIG1faW5zZXJ0aW9uTW9kZSA9IEluU2VsZWN0TW9k ZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFt ZSgpID09IG9wdGdyb3VwVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBvcHRpb25UYWcpIHsKKyAgICAg ICAgICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2 ZUZvcm1hdHRpbmdFbGVtZW50cygpOworICAgICAgICAgICAgaW5zZXJ0RWxlbWVudCh0b2tlbik7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKHRva2VuLm5hbWUo KSA9PSBycFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gcnRUYWcpIHsKKyAgICAgICAgICAgIG5vdElt cGxlbWVudGVkKCk7CisgICAgICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09ICJtYXRo IikgeworICAgICAgICAgICAgLy8gVGhpcyBpcyB0aGUgTWF0aE1MIGZvcmVpZ24gY29udGVudCBi cmFuY2ggcG9pbnQuCisgICAgICAgICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgICAgICB9Cisg ICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gInN2ZyIpIHsKKyAgICAgICAgICAgIC8vIFRoaXMg aXMgdGhlIFNWRyBmb3JlaWduIGNvbnRlbnQgYnJhbmNoIHBvaW50LgorICAgICAgICAgICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgfQorICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGNh cHRpb25UYWcgfHwgdG9rZW4ubmFtZSgpID09IGNvbFRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gY29s Z3JvdXBUYWcgfHwgdG9rZW4ubmFtZSgpID09IGZyYW1lVGFnIHx8IHRva2VuLm5hbWUoKSA9PSBo ZWFkVGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0Ym9keVRhZyB8fCB0b2tlbi5uYW1lKCkgPT0gdGRU YWcgfHwgdG9rZW4ubmFtZSgpID09IHRmb290VGFnIHx8IHRva2VuLm5hbWUoKSA9PSB0aFRhZyB8 fCB0b2tlbi5uYW1lKCkgPT0gdGhlYWRUYWcgfHwgdG9rZW4ubmFtZSgpID09IHRyVGFnKSB7Cisg ICAgICAgICAgICBwYXJzZUVycm9yKHRva2VuKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorICAgICAgICByZWNvbnN0cnVjdFRoZUFjdGl2ZUZvcm1hdHRpbmdFbGVtZW50cygpOwor ICAgICAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBJ bkhlYWROb3NjcmlwdE1vZGU6CiAgICAgICAgIEFTU0VSVChpbnNlcnRpb25Nb2RlKCkgPT0gSW5I ZWFkTm9zY3JpcHRNb2RlKTsKQEAgLTQyNiw2ICs2MTEsOCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRl cjo6cHJvY2Vzc0VuZFRhZyhBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIGNhc2UgSW5Cb2R5 TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkJvZHlNb2RlKTsKICAg ICAgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICAgICAgLy8gRklYTUU6IFRoaXMgaW1wbGVtZW50 YXRpb24gaXMgYSBjb21wbGV0ZWx5IHdyb25nIGJ1dCB1c2VmdWwgZm9yIHRlc3RpbmcuCisgICAg ICAgIG1fb3BlbkVsZW1lbnRzLnBvcCgpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEluSGVh ZE5vc2NyaXB0TW9kZToKICAgICAgICAgQVNTRVJUKGluc2VydGlvbk1vZGUoKSA9PSBJbkhlYWRO b3NjcmlwdE1vZGUpOwpAQCAtNjI0LDYgKzgxMSwxMiBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6 aW5zZXJ0U2VsZkNsb3NpbmdFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgLy8g aHR0cDovL3d3dy53aGF0d2cub3JnL3NwZWNzL3dlYi1hcHBzL2N1cnJlbnQtd29yay9tdWx0aXBh Z2UvdG9rZW5pemF0aW9uLmh0bWwjYWNrbm93bGVkZ2Utc2VsZi1jbG9zaW5nLWZsYWcKIH0KIAor dm9pZCBIVE1MVHJlZUJ1aWxkZXI6Omluc2VydEZvcm1hdGluZ0VsZW1lbnQoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKK3sKKyAgICBpbnNlcnRFbGVtZW50KHRva2VuKTsKKyAgICBtX2FjdGl2ZUZv cm1hdHRpbmdFbGVtZW50cy5hcHBlbmQoY3VycmVudEVsZW1lbnQoKSk7Cit9CisKIHZvaWQgSFRN TFRyZWVCdWlsZGVyOjppbnNlcnRHZW5lcmljUkNEQVRBRWxlbWVudChBdG9taWNIVE1MVG9rZW4m IHRva2VuKQogewogICAgIEFTU0VSVCh0b2tlbi50eXBlKCkgPT0gSFRNTFRva2VuOjpTdGFydFRh Zyk7CkBAIC02NTgsNiArODUxLDExIEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gSFRNTFRyZWVCdWls ZGVyOjpjcmVhdGVFbGVtZW50KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgcmV0dXJuIEhU TUxFbGVtZW50RmFjdG9yeTo6Y3JlYXRlSFRNTEVsZW1lbnQoUXVhbGlmaWVkTmFtZShudWxsQXRv bSwgdG9rZW4ubmFtZSgpLCB4aHRtbE5hbWVzcGFjZVVSSSksIG1fZG9jdW1lbnQsIDApOwogfQog Cit2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxl bWVudHMoKQoreworICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKIHZvaWQgSFRNTFRyZWVCdWls ZGVyOjpmaW5pc2hlZCgpCiB7CiAgICAgLy8gV2Ugc2hvdWxkIGNhbGwgbV9kb2N1bWVudC0+Zmlu aXNoZWRQYXJzaW5nKCkgaGVyZSwgZXhjZXB0CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRN TFRyZWVCdWlsZGVyLmggYi9XZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmgKaW5kZXggNWU4 MzY5NGY5MmE0YzM0NGZlMWJmM2VkMTJmM2MzYmMyNWQ4MTgxYi4uZTQwNDIxZWI0ZWRlODhlOTVi YWZlNjI4ZTdiOTlhZmE3ZmIyN2ZjYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVl QnVpbGRlci5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuaApAQCAtMTc5LDYg KzE3OSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBpbnNlcnRDb21tZW50KEF0b21pY0hUTUxUb2tl biYpOwogICAgIHZvaWQgaW5zZXJ0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lk IGluc2VydFNlbGZDbG9zaW5nRWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKKyAgICB2b2lkIGlu c2VydEZvcm1hdGluZ0VsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CiAgICAgdm9pZCBpbnNlcnRH ZW5lcmljUkNEQVRBRWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydEdl bmVyaWNSYXdUZXh0RWxlbWVudChBdG9taWNIVE1MVG9rZW4mKTsKICAgICB2b2lkIGluc2VydFNj cmlwdEVsZW1lbnQoQXRvbWljSFRNTFRva2VuJik7CkBAIC0xODcsMTEgKzE4OCwxNCBAQCBwcml2 YXRlOgogICAgIHZvaWQgaW5zZXJ0SFRNTFN0YXJ0VGFnSW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYp OwogCiAgICAgUGFzc1JlZlB0cjxFbGVtZW50PiBjcmVhdGVFbGVtZW50KEF0b21pY0hUTUxUb2tl biYpOworICAgIHZvaWQgcmVjb25zdHJ1Y3RUaGVBY3RpdmVGb3JtYXR0aW5nRWxlbWVudHMoKTsK IAogICAgIEVsZW1lbnQqIGN1cnJlbnRFbGVtZW50KCkgeyByZXR1cm4gbV9vcGVuRWxlbWVudHMu dG9wKCk7IH0KIAogICAgIFJlZlB0cjxFbGVtZW50PiBtX2hlYWRFbGVtZW50OworICAgIFJlZlB0 cjxFbGVtZW50PiBtX2Zvcm1FbGVtZW50OwogICAgIEVsZW1lbnRTdGFjayBtX29wZW5FbGVtZW50 czsKKyAgICBWZWN0b3I8RWxlbWVudCo+IG1fYWN0aXZlRm9ybWF0dGluZ0VsZW1lbnRzOwogICAg IGJvb2wgbV9mcmFtZXNldE9rOwogCiAgICAgLy8gRklYTUU6IEltcGxlbWVudCBlcnJvciByZXBv cnRpbmcuCg==