120536 2013-08-30 10:02:54 -0700 [Mac] No need for Pasteboard::getDataSelection 2013-08-30 11:01:37 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin commit-queue oldest_to_newest 923035 0 darin 2013-08-30 10:02:54 -0700 [Mac] No need for Pasteboard::getDataSelection 923038 1 210126 darin 2013-08-30 10:04:45 -0700 Created attachment 210126 Patch 923084 2 210126 commit-queue 2013-08-30 11:01:34 -0700 Comment on attachment 210126 Patch Clearing flags on attachment: 210126 Committed r154900: <http://trac.webkit.org/changeset/154900> 923085 3 commit-queue 2013-08-30 11:01:37 -0700 All reviewed patches have been landed. Closing bug. 210126 2013-08-30 10:04:45 -0700 2013-08-30 11:01:34 -0700 Patch bug-120536-20130830100444.patch text/plain 10011 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzg3MDI5YjAwZGIwOTI1 MjJmMTMzMzM1NDJjMmUwMmQyNWM1MmRiZS4uYTVlNjQ1OGY0Y2VmNjM1MmU4MTFjMTlmOGVlN2Uw ZTgwYWQ0MTczNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA4LTMwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBObyBuZWVkIGZvciBQ YXN0ZWJvYXJkOjpnZXREYXRhU2VsZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA1MzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmg6IEFkZGVkIHNvbWUgTWFjLW9u bHkgcHJpdmF0ZSBtZW1iZXIgZnVuY3Rpb25zLgorCisgICAgICAgICogZWRpdGluZy9tYWMvRWRp dG9yTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzZWxlY3Rpb25JbldlYkFyY2hp dmVGb3JtYXQpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6YWRqdXN0ZWRTZWxl Y3Rpb25SYW5nZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6YXR0cmlidXRlZFN0cmluZ0Zv clJhbmdlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpkYXRhSW5SVEZERm9ybWF0KTogQWRk ZWQuCisgICAgICAgIChXZWJDb3JlOjpkYXRhSW5SVEZGb3JtYXQpOiBBZGRlZC4KKyAgICAgICAg KFdlYkNvcmU6OkVkaXRvcjo6ZGF0YVNlbGVjdGlvbkZvclBhc3RlYm9hcmQpOiBNb3ZlZCB0aGUg aW1wbGVtZW50YXRpb24KKyAgICAgICAgb2YgUGFzdGVib2FyZDo6Z2V0RGF0YVNlbGVjdGlvbiBo ZXJlLCByZWZhY3RvcmluZyB0byBzaGFyZSBjb2RlIHdpdGggdGhlCisgICAgICAgIHdyaXRlU2Vs ZWN0aW9uVG9QYXN0ZWJvYXJkIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjp3 cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZCk6IFJlZmFjdG9yZWQgdG8gc2hhcmUgY29kZQorICAg ICAgICB3aXRoIHRoZSBuZXcgZnVuY3Rpb24gYWJvdmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Q YXN0ZWJvYXJkLmg6IFJlbW92ZWQgZ2V0RGF0YVNlbGVjdGlvbi4gT25lIGxlc3MgbGF5ZXJpbmcg dmlvbGF0aW9uLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOiBEaXR0 by4KKwogMjAxMy0wOC0zMCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292 QGludGVsLmNvbT4KIAogICAgICAgICBTaW1wbGVDbGFzc1ZlY3RvclRyYWl0cyBzaGFsbCBiZSB1 c2VkIGZvciBSdWxlRGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0 b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmgKaW5kZXggYjBlZWNmNDhlMGUz NWVlYjlkOWVlNDI0NmRmMTk1YjUwNDYyYjk3ZC4uZjMzNWE1YzA5NjRkNzk0YTYzYzdjMmRmMWMz Yzk5MjFlNDdiZTY2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3Iu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCkBAIC00MTUsNiArNDE1LDEx IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgRWRpdG9yKEZyYW1lJik7CiAKKyNp ZiBQTEFURk9STShNQUMpCisgICAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IHNlbGVjdGlvbklu V2ViQXJjaGl2ZUZvcm1hdCgpOworICAgIFBhc3NSZWZQdHI8UmFuZ2U+IGFkanVzdGVkU2VsZWN0 aW9uUmFuZ2UoKTsKKyNlbmRpZgorCiAgICAgRnJhbWUmIG1fZnJhbWU7CiAjaWYgRU5BQkxFKERF TEVUSU9OX1VJKQogICAgIE93blB0cjxEZWxldGVCdXR0b25Db250cm9sbGVyPiBtX2RlbGV0ZUJ1 dHRvbkNvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9F ZGl0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JNYWMubW0KaW5k ZXggM2YyMWEwNDcwOTI0M2QyOTEwNTNjMmVkNTk3MjM0ZTE1NDVjNWViYy4uMDMwNjVjYzA3YWRl MDZmZWIxMzBlYzMwZjg5YmI4ZTYzMmNmNGUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFj L0VkaXRvck1hYy5tbQpAQCAtMjY4LDIyICsyNjgsNzYgQEAgU3RyaW5nIEVkaXRvcjo6c3RyaW5n U2VsZWN0aW9uRm9yUGFzdGVib2FyZFdpdGhJbWFnZUFsdFRleHQoKQogICAgIHJldHVybiB0ZXh0 OwogfQogCitQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gRWRpdG9yOjpzZWxlY3Rpb25JbldlYkFy Y2hpdmVGb3JtYXQoKQoreworICAgIFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBhcmNoaXZlID0g TGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRlRnJvbVNlbGVjdGlvbigmbV9mcmFtZSk7CisgICAgcmV0 dXJuIGFyY2hpdmUgPyBTaGFyZWRCdWZmZXI6OndyYXBDRkRhdGEoYXJjaGl2ZS0+cmF3RGF0YVJl cHJlc2VudGF0aW9uKCkuZ2V0KCkpIDogMDsKK30KKworUGFzc1JlZlB0cjxSYW5nZT4gRWRpdG9y OjphZGp1c3RlZFNlbGVjdGlvblJhbmdlKCkKK3sKKyAgICAvLyBGSVhNRTogV2h5IGRvIHdlIG5l ZWQgdG8gYWRqdXN0IHRoZSBzZWxlY3Rpb24gdG8gaW5jbHVkZSB0aGUgYW5jaG9yIHRhZyBpdCdz IGluPworICAgIC8vIFdob2V2ZXIgd3JvdGUgdGhpcyBjb2RlIG9yaWdpbmFsbHkgZm9yZ290IHRv IGxlYXZlIHVzIGEgY29tbWVudCBleHBsYWluaW5nIHRoZSByYXRpb25hbGUuCisgICAgUmVmUHRy PFJhbmdlPiByYW5nZSA9IHNlbGVjdGVkUmFuZ2UoKTsKKyAgICBOb2RlKiBjb21tb25BbmNlc3Rv ciA9IHJhbmdlLT5jb21tb25BbmNlc3RvckNvbnRhaW5lcihJR05PUkVfRVhDRVBUSU9OKTsKKyAg ICBBU1NFUlQoY29tbW9uQW5jZXN0b3IpOworICAgIE5vZGUqIGVuY2xvc2luZ0FuY2hvciA9IGVu Y2xvc2luZ05vZGVXaXRoVGFnKGZpcnN0UG9zaXRpb25Jbk5vZGUoY29tbW9uQW5jZXN0b3IpLCBI VE1MTmFtZXM6OmFUYWcpOworICAgIGlmIChlbmNsb3NpbmdBbmNob3IgJiYgY29tcGFyZVBvc2l0 aW9ucyhmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUocmFuZ2UtPnN0YXJ0UG9zaXRpb24oKS5h bmNob3JOb2RlKCkpLCByYW5nZS0+c3RhcnRQb3NpdGlvbigpKSA+PSAwKQorICAgICAgICByYW5n ZS0+c2V0U3RhcnQoZW5jbG9zaW5nQW5jaG9yLCAwLCBJR05PUkVfRVhDRVBUSU9OKTsKKyAgICBy ZXR1cm4gcmFuZ2U7Cit9CisKK3N0YXRpYyBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRT dHJpbmdGb3JSYW5nZShSYW5nZSYgcmFuZ2UpCit7CisgICAgcmV0dXJuIFthZG9wdE5TKFtbV2Vi SFRNTENvbnZlcnRlciBhbGxvY10gaW5pdFdpdGhET01SYW5nZTpraXQoJnJhbmdlKV0pIGF0dHJp YnV0ZWRTdHJpbmddOworfQorCitzdGF0aWMgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGRhdGFJ blJURkRGb3JtYXQoTlNBdHRyaWJ1dGVkU3RyaW5nICpzdHJpbmcpCit7CisgICAgTlNVSW50ZWdl ciBsZW5ndGggPSBbc3RyaW5nIGxlbmd0aF07CisgICAgcmV0dXJuIGxlbmd0aCA/IFNoYXJlZEJ1 ZmZlcjo6d3JhcE5TRGF0YShbc3RyaW5nIFJURkRGcm9tUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgbGVu Z3RoKSBkb2N1bWVudEF0dHJpYnV0ZXM6bmlsXSkgOiAwOworfQorCitzdGF0aWMgUGFzc1JlZlB0 cjxTaGFyZWRCdWZmZXI+IGRhdGFJblJURkZvcm1hdChOU0F0dHJpYnV0ZWRTdHJpbmcgKnN0cmlu ZykKK3sKKyAgICBOU1VJbnRlZ2VyIGxlbmd0aCA9IFtzdHJpbmcgbGVuZ3RoXTsKKyAgICByZXR1 cm4gbGVuZ3RoID8gU2hhcmVkQnVmZmVyOjp3cmFwTlNEYXRhKFtzdHJpbmcgUlRGRnJvbVJhbmdl Ok5TTWFrZVJhbmdlKDAsIGxlbmd0aCkgZG9jdW1lbnRBdHRyaWJ1dGVzOm5pbF0pIDogMDsKK30K KwogUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IEVkaXRvcjo6ZGF0YVNlbGVjdGlvbkZvclBhc3Rl Ym9hcmQoY29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkVHlwZSkKIHsKLSAgICByZXR1cm4gUGFzdGVi b2FyZDo6Z2V0RGF0YVNlbGVjdGlvbigmbV9mcmFtZSwgcGFzdGVib2FyZFR5cGUpOworICAgIC8v IEZJWE1FOiBUaGUgaW50ZXJmYWNlIHRvIHRoaXMgZnVuY3Rpb24gaXMgYXdrd2FyZC4gV2UnZCBw cm9iYWJseSBiZSBiZXR0ZXIgb2ZmIHdpdGggdGhyZWUgc2VwYXJhdGUgZnVuY3Rpb25zLgorICAg IC8vIEFzIG9mIHRoaXMgd3JpdGluZywgdGhpcyBpcyBvbmx5IHVzZWQgaW4gV2ViS2l0MiB0byBp bXBsZW1lbnQgdGhlIG1ldGhvZCAtW1dLVmlldyB3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZDp0 eXBlczpdLAorICAgIC8vIHdoaWNoIGlzIG9ubHkgdXNlZCB0byBzdXBwb3J0IE9TIFggc2Vydmlj ZXMuCisKKyAgICAvLyBGSVhNRTogRG9lcyB0aGlzIGZ1bmN0aW9uIHJlYWxseSBuZWVkIHRvIHVz ZSBhZGp1c3RlZFNlbGVjdGlvblJhbmdlKCk/IEJlY2F1c2Ugd3JpdGVTZWxlY3Rpb25Ub1Bhc3Rl Ym9hcmQoKSBqdXN0IHVzZXMgc2VsZWN0ZWRSYW5nZSgpLgorCisgICAgaWYgKHBhc3RlYm9hcmRU eXBlID09IFdlYkFyY2hpdmVQYm9hcmRUeXBlKQorICAgICAgICByZXR1cm4gc2VsZWN0aW9uSW5X ZWJBcmNoaXZlRm9ybWF0KCk7CisKKyAgICBpZiAocGFzdGVib2FyZFR5cGUgPT0gU3RyaW5nKE5T UlRGRFBib2FyZFR5cGUpKQorICAgICAgIHJldHVybiBkYXRhSW5SVEZERm9ybWF0KGF0dHJpYnV0 ZWRTdHJpbmdGb3JSYW5nZSgqYWRqdXN0ZWRTZWxlY3Rpb25SYW5nZSgpKSk7CisKKyAgICBpZiAo cGFzdGVib2FyZFR5cGUgPT0gU3RyaW5nKE5TUlRGUGJvYXJkVHlwZSkpIHsKKyAgICAgICAgTlNB dHRyaWJ1dGVkU3RyaW5nKiBhdHRyaWJ1dGVkU3RyaW5nID0gYXR0cmlidXRlZFN0cmluZ0ZvclJh bmdlKCphZGp1c3RlZFNlbGVjdGlvblJhbmdlKCkpOworICAgICAgICAvLyBGSVhNRTogV2h5IGlz IHRoaXMgYXR0YWNobWVudCBjaGFyYWN0ZXIgc3RyaXBwaW5nIG5lZWRlZCBoZXJlLCBidXQgbm90 IG5lZWRlZCBpbiB3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZD8KKyAgICAgICAgaWYgKFthdHRy aWJ1dGVkU3RyaW5nIGNvbnRhaW5zQXR0YWNobWVudHNdKQorICAgICAgICAgICAgYXR0cmlidXRl ZFN0cmluZyA9IGF0dHJpYnV0ZWRTdHJpbmdCeVN0cmlwcGluZ0F0dGFjaG1lbnRDaGFyYWN0ZXJz KGF0dHJpYnV0ZWRTdHJpbmcpOworICAgICAgICByZXR1cm4gZGF0YUluUlRGRm9ybWF0KGF0dHJp YnV0ZWRTdHJpbmcpOworICAgIH0KKworICAgIHJldHVybiAwOwogfQogCiB2b2lkIEVkaXRvcjo6 d3JpdGVTZWxlY3Rpb25Ub1Bhc3RlYm9hcmQoUGFzdGVib2FyZCYgcGFzdGVib2FyZCkKIHsKKyAg ICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBhdHRyaWJ1dGVkU3RyaW5n Rm9yUmFuZ2UoKnNlbGVjdGVkUmFuZ2UoKSk7CisKICAgICBQYXN0ZWJvYXJkV2ViQ29udGVudCBj b250ZW50OwogICAgIGNvbnRlbnQuY2FuU21hcnRDb3B5T3JEZWxldGUgPSBjYW5TbWFydENvcHlP ckRlbGV0ZSgpOwotICAgIGlmIChSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gd2ViQXJjaGl2ZSA9 IExlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24oJm1fZnJhbWUpKQotICAgICAg ICBjb250ZW50LmRhdGFJbldlYkFyY2hpdmVGb3JtYXQgPSBTaGFyZWRCdWZmZXI6OndyYXBDRkRh dGEod2ViQXJjaGl2ZS0+cmF3RGF0YVJlcHJlc2VudGF0aW9uKCkuZ2V0KCkpOwotICAgIGlmIChO U0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBbYWRvcHROUyhbW1dlYkhUTUxD b252ZXJ0ZXIgYWxsb2NdIGluaXRXaXRoRE9NUmFuZ2U6a2l0KHNlbGVjdGVkUmFuZ2UoKS5nZXQo KSldKSBhdHRyaWJ1dGVkU3RyaW5nXSkgewotICAgICAgICBpZiAoW2F0dHJpYnV0ZWRTdHJpbmcg Y29udGFpbnNBdHRhY2htZW50c10pCi0gICAgICAgICAgICBjb250ZW50LmRhdGFJblJURkRGb3Jt YXQgPSBTaGFyZWRCdWZmZXI6OndyYXBOU0RhdGEoW2F0dHJpYnV0ZWRTdHJpbmcgUlRGREZyb21S YW5nZTpOU01ha2VSYW5nZSgwLCBbYXR0cmlidXRlZFN0cmluZyBsZW5ndGhdKSBkb2N1bWVudEF0 dHJpYnV0ZXM6bmlsXSk7Ci0gICAgICAgIGNvbnRlbnQuZGF0YUluUlRGRm9ybWF0ID0gU2hhcmVk QnVmZmVyOjp3cmFwTlNEYXRhKFthdHRyaWJ1dGVkU3RyaW5nIFJURkZyb21SYW5nZTpOU01ha2VS YW5nZSgwLCBbYXR0cmlidXRlZFN0cmluZyBsZW5ndGhdKSBkb2N1bWVudEF0dHJpYnV0ZXM6bmls XSk7Ci0gICAgfQorICAgIGNvbnRlbnQuZGF0YUluV2ViQXJjaGl2ZUZvcm1hdCA9IHNlbGVjdGlv bkluV2ViQXJjaGl2ZUZvcm1hdCgpOworICAgIGNvbnRlbnQuZGF0YUluUlRGREZvcm1hdCA9IFth dHRyaWJ1dGVkU3RyaW5nIGNvbnRhaW5zQXR0YWNobWVudHNdID8gZGF0YUluUlRGREZvcm1hdChh dHRyaWJ1dGVkU3RyaW5nKSA6IDA7CisgICAgY29udGVudC5kYXRhSW5SVEZGb3JtYXQgPSBkYXRh SW5SVEZGb3JtYXQoYXR0cmlidXRlZFN0cmluZyk7CiAgICAgY29udGVudC5kYXRhSW5TdHJpbmdG b3JtYXQgPSBzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkV2l0aEltYWdlQWx0VGV4dCgpOwog ICAgIGNsaWVudCgpLT5nZXRDbGllbnRQYXN0ZWJvYXJkRGF0YUZvclJhbmdlKHNlbGVjdGVkUmFu Z2UoKS5nZXQoKSwgY29udGVudC5jbGllbnRUeXBlcywgY29udGVudC5jbGllbnREYXRhKTsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCmluZGV4IDU5Njg4MGUzZDYxNGRjNjA3NWVl N2FjMDE3OTlhNTMyODQ3YTQ0ZTMuLjdhZjhhNGM5MzkyMTAwMGIxY2FiMDg4YzFiMWFjMWE4NDMx NjNkMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3RlYm9hcmQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKQEAgLTU1LDcgKzU1LDYg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAjaWYgUExBVEZPUk0oTUFDKQogI2lmIFBMQVRGT1JN KElPUykKLS8vIEZJWE1FOiBUaGlzIGlzIG9ubHkgdGVtcG9yYXJ5IHVudGlsIFBhc3RlYm9hcmQg aXMgcmVmYWN0b3JlZCBmb3IgaU9TLgogZXh0ZXJuIE5TU3RyaW5nICpXZWJBcmNoaXZlUGJvYXJk VHlwZTsKICNlbHNlCiBleHRlcm4gY29uc3QgY2hhciogV2ViQXJjaGl2ZVBib2FyZFR5cGU7CkBA IC0xMDMsNyArMTAyLDYgQEAgcHVibGljOgogICAgIFN0cmluZyBuYW1lKCkgY29uc3QgeyByZXR1 cm4gbV9wYXN0ZWJvYXJkTmFtZTsgfQogCiAgICAgZXhwbGljaXQgUGFzdGVib2FyZChjb25zdCBT dHJpbmcmIHBhc3RlYm9hcmROYW1lKTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxTaGFyZWRCdWZm ZXI+IGdldERhdGFTZWxlY3Rpb24oRnJhbWUqLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRUeXBl KTsgLy8gRklYTUU6IExheWVyaW5nIHZpb2xhdGlvbi4KICNlbmRpZgogCiAjaWYgUExBVEZPUk0o R1RLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRN YWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQppbmRl eCAwZmU4NWI1NTI4MmY0NzU2ZjY5NWEyNTRlYjk3OTM0YjM0MmFiMzg1Li5jYzU3NTIzZWEzN2Rh ZWM1NTkwYTYxMmQ5ODkyNjY2NzJmNzUzZWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvUGFzdGVib2FyZE1hYy5tbQpAQCAtMTM4LDM5ICsxMzgsNiBAQCB2b2lkIFBhc3RlYm9h cmQ6OmNsZWFyKCkKICAgICBtX2NoYW5nZUNvdW50ID0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBh c3RlYm9hcmRTdHJhdGVneSgpLT5zZXRUeXBlcyhWZWN0b3I8U3RyaW5nPigpLCBtX3Bhc3RlYm9h cmROYW1lKTsKIH0KIAotUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IFBhc3RlYm9hcmQ6OmdldERh dGFTZWxlY3Rpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRUeXBlKQot ewotICAgIGlmIChwYXN0ZWJvYXJkVHlwZSA9PSBXZWJBcmNoaXZlUGJvYXJkVHlwZSkgewotICAg ICAgICBSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gYXJjaGl2ZSA9IExlZ2FjeVdlYkFyY2hpdmU6 OmNyZWF0ZUZyb21TZWxlY3Rpb24oZnJhbWUpOwotICAgICAgICBSZXRhaW5QdHI8Q0ZEYXRhUmVm PiBkYXRhID0gYXJjaGl2ZSA/IGFyY2hpdmUtPnJhd0RhdGFSZXByZXNlbnRhdGlvbigpIDogMDsK LSAgICAgICAgcmV0dXJuIFNoYXJlZEJ1ZmZlcjo6d3JhcE5TRGF0YSgoTlNEYXRhICopZGF0YS5n ZXQoKSk7Ci0gICAgfQotCi0gICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IGZyYW1lLT5lZGl0b3Io KS5zZWxlY3RlZFJhbmdlKCk7Ci0gICAgTm9kZSogY29tbW9uQW5jZXN0b3IgPSByYW5nZS0+Y29t bW9uQW5jZXN0b3JDb250YWluZXIoSUdOT1JFX0VYQ0VQVElPTik7Ci0gICAgQVNTRVJUKGNvbW1v bkFuY2VzdG9yKTsKLSAgICBOb2RlKiBlbmNsb3NpbmdBbmNob3IgPSBlbmNsb3NpbmdOb2RlV2l0 aFRhZyhmaXJzdFBvc2l0aW9uSW5Ob2RlKGNvbW1vbkFuY2VzdG9yKSwgSFRNTE5hbWVzOjphVGFn KTsKLSAgICBpZiAoZW5jbG9zaW5nQW5jaG9yICYmIGNvbXBhcmVQb3NpdGlvbnMoZmlyc3RQb3Np dGlvbkluT3JCZWZvcmVOb2RlKHJhbmdlLT5zdGFydFBvc2l0aW9uKCkuYW5jaG9yTm9kZSgpKSwg cmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSkgPj0gMCkKLSAgICAgICAgcmFuZ2UtPnNldFN0YXJ0KGVu Y2xvc2luZ0FuY2hvciwgMCwgSUdOT1JFX0VYQ0VQVElPTik7Ci0gICAgCi0gICAgTlNBdHRyaWJ1 dGVkU3RyaW5nKiBhdHRyaWJ1dGVkU3RyaW5nID0gbmlsOwotICAgIFJldGFpblB0cjxXZWJIVE1M Q29udmVydGVyPiBjb252ZXJ0ZXIgPSBhZG9wdE5TKFtbV2ViSFRNTENvbnZlcnRlciBhbGxvY10g aW5pdFdpdGhET01SYW5nZTpraXQocmFuZ2UuZ2V0KCkpXSk7Ci0gICAgaWYgKGNvbnZlcnRlcikK LSAgICAgICAgYXR0cmlidXRlZFN0cmluZyA9IFtjb252ZXJ0ZXIuZ2V0KCkgYXR0cmlidXRlZFN0 cmluZ107Ci0gICAgCi0gICAgaWYgKHBhc3RlYm9hcmRUeXBlID09IFN0cmluZyhOU1JURkRQYm9h cmRUeXBlKSkgewotICAgICAgICBOU0RhdGEgKlJURkREYXRhID0gW2F0dHJpYnV0ZWRTdHJpbmcg UlRGREZyb21SYW5nZTpOU01ha2VSYW5nZSgwLCBbYXR0cmlidXRlZFN0cmluZyBsZW5ndGhdKSBk b2N1bWVudEF0dHJpYnV0ZXM6bmlsXTsKLSAgICAgICAgcmV0dXJuIFNoYXJlZEJ1ZmZlcjo6d3Jh cE5TRGF0YSgoTlNEYXRhICopUlRGRERhdGEpOwotICAgIH0KLSAgICBpZiAocGFzdGVib2FyZFR5 cGUgPT0gU3RyaW5nKE5TUlRGUGJvYXJkVHlwZSkpIHsKLSAgICAgICAgaWYgKFthdHRyaWJ1dGVk U3RyaW5nIGNvbnRhaW5zQXR0YWNobWVudHNdKQotICAgICAgICAgICAgYXR0cmlidXRlZFN0cmlu ZyA9IGF0dHJpYnV0ZWRTdHJpbmdCeVN0cmlwcGluZ0F0dGFjaG1lbnRDaGFyYWN0ZXJzKGF0dHJp YnV0ZWRTdHJpbmcpOwotICAgICAgICBOU0RhdGEgKlJURkRhdGEgPSBbYXR0cmlidXRlZFN0cmlu ZyBSVEZGcm9tUmFuZ2U6TlNNYWtlUmFuZ2UoMCwgW2F0dHJpYnV0ZWRTdHJpbmcgbGVuZ3RoXSkg ZG9jdW1lbnRBdHRyaWJ1dGVzOm5pbF07Ci0gICAgICAgIHJldHVybiBTaGFyZWRCdWZmZXI6Ondy YXBOU0RhdGEoKE5TRGF0YSAqKVJURkRhdGEpOwotICAgIH0KLSAgICByZXR1cm4gMDsKLX0KLQog dm9pZCBQYXN0ZWJvYXJkOjpzZXRUeXBlcyhjb25zdCBQYXN0ZWJvYXJkV2ViQ29udGVudCYgY29u dGVudCkKIHsKICAgICBWZWN0b3I8U3RyaW5nPiB0eXBlczsK