146852 2015-07-10 13:30:18 -0700 Cleanup: WebCore::Pair class should use RefPtr&& instead of PassRefPtr 2015-07-10 14:06:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 143191 1 dbates dbates commit-queue webkit-bug-importer oldest_to_newest 1108728 0 dbates 2015-07-10 13:30:18 -0700 We should use RefPtr&& instead of PassRefPtr in the class definition for WebCore::Pair. 1108729 1 256605 dbates 2015-07-10 13:32:01 -0700 Created attachment 256605 Patch 1108732 2 commit-queue 2015-07-10 13:34:00 -0700 Attachment 256605 did not pass style-queue: ERROR: Source/WebCore/css/Pair.h:62: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] ERROR: Source/WebCore/css/Pair.h:63: Should be indented on a separate line, with the colon or comma first on that line. [whitespace/indent] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1108733 3 256605 dbates 2015-07-10 13:35:35 -0700 Comment on attachment 256605 Patch Clearing flags on attachment: 256605 Committed r186685: <http://trac.webkit.org/changeset/186685> 1108734 4 dbates 2015-07-10 13:35:39 -0700 All reviewed patches have been landed. Closing bug. 1108739 5 256605 darin 2015-07-10 13:41:20 -0700 Comment on attachment 256605 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256605&action=review > Source/WebCore/css/Pair.h:62 > + Pair() : m_first(nullptr), m_second(nullptr) { } This nullptr stuff is not needed; RefPtr gets null automatically without explicit initialization. Should just be: Pair() { } Assuming we can’t omit this entirely. 1108743 6 webkit-bug-importer 2015-07-10 13:47:23 -0700 <rdar://problem/21772881> 1108757 7 dbates 2015-07-10 14:06:37 -0700 (In reply to comment #5) > Comment on attachment 256605 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=256605&action=review > > > Source/WebCore/css/Pair.h:62 > > + Pair() : m_first(nullptr), m_second(nullptr) { } > > This nullptr stuff is not needed; RefPtr gets null automatically without > explicit initialization. Should just be: > > Pair() { } > > Assuming we can’t omit this entirely. Filed bug #146856 to remove the default constructor. 256605 2015-07-10 13:32:01 -0700 2015-07-10 13:35:35 -0700 Patch bug-146852-20150710133059.patch text/plain 11124 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2Njc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjE5MTBiNzg4NmE3Mjk2 MzEwYzZkOTA0ODM3NmY0ZmU4ZmM5NTg1Mi4uMDYxOWI0YTRhNzkyODU3YzU1MGVjOWIwY2VjY2Nl ODc1ZDkzN2Q4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTA3LTEwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwOiBXZWJDb3Jl OjpQYWlyIGNsYXNzIHNob3VsZCB1c2UgUmVmUHRyJiYgaW5zdGVhZCBvZiBQYXNzUmVmUHRyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY4NTIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNzcy9DU1NQ YXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlUHJpbWl0aXZlVmFsdWVQYWlyKTog V3JpdGUgdXNpbmcgYSB2YXJpYWRpYyB0ZW1wbGF0ZSB0aGF0IGZvcndhcmRzIGl0cworICAgICAg ICBhcmd1bWVudHMgdG8gdGhlIGFwcHJvcHJpYXRlIFBhaXI6OmNyZWF0ZSBjb25zdHJ1Y3Rvci4K KyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2U0VmFsdWVzRmlsbFBvc2l0aW9uKTog VXNlIFJlZlB0ciYmIGluc3RlYWQgb2YgUGFzc1JlZlB0ci4gCisgICAgICAgIChXZWJDb3JlOjpD U1NQYXJzZXI6OnBhcnNlM1ZhbHVlc0ZpbGxQb3NpdGlvbik6IERpdHRvLgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUGFyc2VyOjpwYXJzZUZpbGxQb3NpdGlvbik6IFVzZSBXVEY6Om1vdmUoKSBpbnN0 ZWFkIG9mIFJlZlB0cjo6cmVsZWFzZSgpCisgICAgICAgIHNvIHRoYXQgd2UgcGFzcyBhIHJ2YWx1 ZSByZWZlcmVuY2UgdG8gUmVmUHRyLgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJz ZUZpbGxTaXplKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQm9y ZGVySW1hZ2VSZXBlYXQpOiBEaXR0by4KKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmg6CisgICAg ICAgICogY3NzL1BhaXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBhaXI6OmNyZWF0ZSk6IFVzZSBS ZWZQdHImJiBpbnN0ZWFkIG9mIFBhc3NSZWZQdHIuIAorICAgICAgICAoV2ViQ29yZTo6UGFpcjo6 c2V0Rmlyc3QpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlBhaXI6OnNldFNlY29uZCk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6UGFpcjo6UGFpcik6IERpdHRvLiBBbHNvIHN1YnN0aXR1 dGUgbnVsbHB0ciBmb3IgMCBpbiB0aGUgbWVtYmVyIGluaXRpYWxpemF0aW9uCisgICAgICAgIGxp c3Qgb2YgdGhlIGRlZmF1bHQgY29uc3RydWN0b3IuCisKIDIwMTUtMDctMTAgIENocmlzIEZsZWl6 YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogPGRldGFpbHM+IGVsZW1l bnQgc2hvdWxkIGFsbG93IGV4cGFuZC9jbG9zZSB0aHJvdWdoIEFYIEFQSQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT UGFyc2VyLmNwcAppbmRleCBhMjI0OGNhOWE2YWE0YjJmY2I4Y2Q2ZTgzYTU4ZmRlYjE5MjAzMWE3 Li5kM2I2NmU5MjYzYTdlN2Q4ZDNkMjFmOTU3ZDBiZTc0ZTFiZDIzZGIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUGFyc2VyLmNwcApAQCAtMTk5LDkgKzE5OSwxMCBAQCBzdGF0aWMgYm9vbCBoYXNQcmVmaXgo Y29uc3QgY2hhciogc3RyaW5nLCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IGNoYXIqIHByZWZpeCkK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IGNy ZWF0ZVByaW1pdGl2ZVZhbHVlUGFpcihQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBmaXJz dCwgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gc2Vjb25kKQordGVtcGxhdGU8dHlwZW5h bWUuLi4gQXJncz4KK3N0YXRpYyBSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IGNyZWF0ZVByaW1pdGl2 ZVZhbHVlUGFpcihBcmdzJiYuLi4gYXJncykKIHsKLSAgICByZXR1cm4gY3NzVmFsdWVQb29sKCku Y3JlYXRlVmFsdWUoUGFpcjo6Y3JlYXRlKGZpcnN0LCBzZWNvbmQpKTsKKyAgICByZXR1cm4gY3Nz VmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoUGFpcjo6Y3JlYXRlKHN0ZDo6Zm9yd2FyZDxBcmdzPihh cmdzKS4uLikpOwogfQogCiBjbGFzcyBBbmltYXRpb25QYXJzZUNvbnRleHQgewpAQCAtNDMxMSw3 ICs0MzEyLDcgQEAgc3RhdGljIGJvb2wgaXNGaWxsUG9zaXRpb25LZXl3b3JkKENTU1ZhbHVlSUQg dmFsdWUpCiAgICAgcmV0dXJuIHZhbHVlID09IENTU1ZhbHVlTGVmdCB8fCB2YWx1ZSA9PSBDU1NW YWx1ZVRvcCB8fCB2YWx1ZSA9PSBDU1NWYWx1ZUJvdHRvbSB8fCB2YWx1ZSA9PSBDU1NWYWx1ZVJp Z2h0IHx8IHZhbHVlID09IENTU1ZhbHVlQ2VudGVyOwogfQogCi12b2lkIENTU1BhcnNlcjo6cGFy c2U0VmFsdWVzRmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQ dHI8Q1NTVmFsdWU+JiB2YWx1ZTEsIFJlZlB0cjxDU1NWYWx1ZT4mIHZhbHVlMiwgUGFzc1JlZlB0 cjxDU1NQcmltaXRpdmVWYWx1ZT4gcGFyc2VkVmFsdWUxLCBQYXNzUmVmUHRyPENTU1ByaW1pdGl2 ZVZhbHVlPiBwYXJzZWRWYWx1ZTIpCit2b2lkIENTU1BhcnNlcjo6cGFyc2U0VmFsdWVzRmlsbFBv c2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8Q1NTVmFsdWU+JiB2 YWx1ZTEsIFJlZlB0cjxDU1NWYWx1ZT4mIHZhbHVlMiwgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVl PiYmIHBhcnNlZFZhbHVlMSwgUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiYmIHBhcnNlZFZhbHVl MikKIHsKICAgICAvLyBbIGxlZnQgfCByaWdodCBdIFsgPHBlcmNlbnRhZ2VdIHwgPGxlbmd0aD4g XSAmJiBbIHRvcCB8IGJvdHRvbSBdIFsgPHBlcmNlbnRhZ2U+IHwgPGxlbmd0aD4gXQogICAgIC8v IEluIHRoZSBjYXNlIG9mIDQgdmFsdWVzIDxwb3NpdGlvbj4gcmVxdWlyZXMgdGhlIHNlY29uZCB2 YWx1ZSB0byBiZSBhIGxlbmd0aCBvciBhIHBlcmNlbnRhZ2UuCkBAIC00MzUxLDE1ICs0MzUyLDE1 IEBAIHZvaWQgQ1NTUGFyc2VyOjpwYXJzZTRWYWx1ZXNGaWxsUG9zaXRpb24oQ1NTUGFyc2VyVmFs dWVMaXN0JiB2YWx1ZUxpc3QsIFJlZlB0cjxDCiAgICAgaWYgKGlzRmlsbFBvc2l0aW9uS2V5d29y ZCh2YWx1ZTQtPmdldFZhbHVlSUQoKSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHZhbHVlMSA9 IGNyZWF0ZVByaW1pdGl2ZVZhbHVlUGFpcihwYXJzZWRWYWx1ZTEsIHBhcnNlZFZhbHVlMik7Ci0g ICAgdmFsdWUyID0gY3JlYXRlUHJpbWl0aXZlVmFsdWVQYWlyKHZhbHVlMywgdmFsdWU0KTsKKyAg ICB2YWx1ZTEgPSBjcmVhdGVQcmltaXRpdmVWYWx1ZVBhaXIoV1RGOjptb3ZlKHBhcnNlZFZhbHVl MSksIFdURjo6bW92ZShwYXJzZWRWYWx1ZTIpKTsKKyAgICB2YWx1ZTIgPSBjcmVhdGVQcmltaXRp dmVWYWx1ZVBhaXIodmFsdWUzLmNvcHlSZWYoKSwgdmFsdWU0LmNvcHlSZWYoKSk7CiAKICAgICBp ZiAoaWRlbnQxID09IENTU1ZhbHVlVG9wIHx8IGlkZW50MSA9PSBDU1NWYWx1ZUJvdHRvbSkKICAg ICAgICAgdmFsdWUxLnN3YXAodmFsdWUyKTsKIAogICAgIHZhbHVlTGlzdC5uZXh0KCk7CiB9Ci12 b2lkIENTU1BhcnNlcjo6cGFyc2UzVmFsdWVzRmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlz dCYgdmFsdWVMaXN0LCBSZWZQdHI8Q1NTVmFsdWU+JiB2YWx1ZTEsIFJlZlB0cjxDU1NWYWx1ZT4m IHZhbHVlMiwgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gcGFyc2VkVmFsdWUxLCBQYXNz UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBwYXJzZWRWYWx1ZTIpCit2b2lkIENTU1BhcnNlcjo6 cGFyc2UzVmFsdWVzRmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBS ZWZQdHI8Q1NTVmFsdWU+JiB2YWx1ZTEsIFJlZlB0cjxDU1NWYWx1ZT4mIHZhbHVlMiwgUmVmUHRy PENTU1ByaW1pdGl2ZVZhbHVlPiYmIHBhcnNlZFZhbHVlMSwgUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPiYmIHBhcnNlZFZhbHVlMikKIHsKICAgICB1bnNpZ25lZCBjdW11bGF0aXZlRmxhZ3MgPSAw OwogICAgIEZpbGxQb3NpdGlvbkZsYWcgdmFsdWUzRmxhZyA9IEludmFsaWRGaWxsUG9zaXRpb247 CkBAIC00Mzk0LDcgKzQzOTUsNyBAQCB2b2lkIENTU1BhcnNlcjo6cGFyc2UzVmFsdWVzRmlsbFBv c2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8QwogICAgICAgICAg ICAgc3dhcE5lZWRlZCA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgdmFsdWUxID0gY3JlYXRl UHJpbWl0aXZlVmFsdWVQYWlyKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShm aXJzdFBvc2l0aW9uS2V5d29yZCksIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKDUwLCBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpKTsKLSAgICAgICAgdmFsdWUyID0gY3JlYXRl UHJpbWl0aXZlVmFsdWVQYWlyKHBhcnNlZFZhbHVlMiwgdmFsdWUzKTsKKyAgICAgICAgdmFsdWUy ID0gY3JlYXRlUHJpbWl0aXZlVmFsdWVQYWlyKFdURjo6bW92ZShwYXJzZWRWYWx1ZTIpLCB2YWx1 ZTMuY29weVJlZigpKTsKICAgICB9IGVsc2UgaWYgKGlkZW50MyA9PSBDU1NWYWx1ZUNlbnRlcikg ewogICAgICAgICBpZiAoaXNGaWxsUG9zaXRpb25LZXl3b3JkKGlkZW50MikpCiAgICAgICAgICAg ICByZXR1cm47CkBAIC00NDA0LDcgKzQ0MDUsNyBAQCB2b2lkIENTU1BhcnNlcjo6cGFyc2UzVmFs dWVzRmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8Qwog ICAgICAgICAgICAgc2Vjb25kUG9zaXRpb25LZXl3b3JkID0gQ1NTVmFsdWVMZWZ0OwogICAgICAg ICAgICAgc3dhcE5lZWRlZCA9IHRydWU7CiAgICAgICAgIH0KLSAgICAgICAgdmFsdWUxID0gY3Jl YXRlUHJpbWl0aXZlVmFsdWVQYWlyKHBhcnNlZFZhbHVlMSwgcGFyc2VkVmFsdWUyKTsKKyAgICAg ICAgdmFsdWUxID0gY3JlYXRlUHJpbWl0aXZlVmFsdWVQYWlyKFdURjo6bW92ZShwYXJzZWRWYWx1 ZTEpLCBwYXJzZWRWYWx1ZTIuY29weVJlZigpKTsKICAgICAgICAgdmFsdWUyID0gY3JlYXRlUHJp bWl0aXZlVmFsdWVQYWlyKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShzZWNv bmRQb3NpdGlvbktleXdvcmQpLCBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSg1MCwgQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgUmVm UHRyPENTU1ByaW1pdGl2ZVZhbHVlPiBmaXJzdFBvc2l0aW9uVmFsdWU7CkBAIC00NDMzLDggKzQ0 MzQsOCBAQCB2b2lkIENTU1BhcnNlcjo6cGFyc2UzVmFsdWVzRmlsbFBvc2l0aW9uKENTU1BhcnNl clZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8QwogICAgICAgICBpZiAoaXNWYWx1ZUNvbmZs aWN0aW5nV2l0aEN1cnJlbnRFZGdlKGlkZW50MSwgc2Vjb25kUG9zaXRpb25LZXl3b3JkKSkKICAg ICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB2YWx1ZTEgPSBjcmVhdGVQcmltaXRpdmVWYWx1 ZVBhaXIocGFyc2VkVmFsdWUxLCBmaXJzdFBvc2l0aW9uVmFsdWUpOwotICAgICAgICB2YWx1ZTIg PSBjcmVhdGVQcmltaXRpdmVWYWx1ZVBhaXIoY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmll clZhbHVlKHNlY29uZFBvc2l0aW9uS2V5d29yZCksIHNlY29uZFBvc2l0aW9uVmFsdWUpOworICAg ICAgICB2YWx1ZTEgPSBjcmVhdGVQcmltaXRpdmVWYWx1ZVBhaXIoV1RGOjptb3ZlKHBhcnNlZFZh bHVlMSksIGZpcnN0UG9zaXRpb25WYWx1ZS5jb3B5UmVmKCkpOworICAgICAgICB2YWx1ZTIgPSBj cmVhdGVQcmltaXRpdmVWYWx1ZVBhaXIoY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZh bHVlKHNlY29uZFBvc2l0aW9uS2V5d29yZCksIHNlY29uZFBvc2l0aW9uVmFsdWUuY29weVJlZigp KTsKICAgICB9CiAKICAgICBpZiAoaWRlbnQxID09IENTU1ZhbHVlVG9wIHx8IGlkZW50MSA9PSBD U1NWYWx1ZUJvdHRvbSB8fCBzd2FwTmVlZGVkKQpAQCAtNDUxNiw5ICs0NTE3LDkgQEAgdm9pZCBD U1NQYXJzZXI6OnBhcnNlRmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0 LCBSZWZQdHI8Q1NTVmFsdWUKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG51bWJlck9mVmFs dWVzID09IDMpCi0gICAgICAgIHBhcnNlM1ZhbHVlc0ZpbGxQb3NpdGlvbih2YWx1ZUxpc3QsIHZh bHVlMSwgdmFsdWUyLCBwYXJzZWRWYWx1ZTEucmVsZWFzZSgpLCBwYXJzZWRWYWx1ZTIucmVsZWFz ZSgpKTsKKyAgICAgICAgcGFyc2UzVmFsdWVzRmlsbFBvc2l0aW9uKHZhbHVlTGlzdCwgdmFsdWUx LCB2YWx1ZTIsIFdURjo6bW92ZShwYXJzZWRWYWx1ZTEpLCBXVEY6Om1vdmUocGFyc2VkVmFsdWUy KSk7CiAgICAgZWxzZQotICAgICAgICBwYXJzZTRWYWx1ZXNGaWxsUG9zaXRpb24odmFsdWVMaXN0 LCB2YWx1ZTEsIHZhbHVlMiwgcGFyc2VkVmFsdWUxLnJlbGVhc2UoKSwgcGFyc2VkVmFsdWUyLnJl bGVhc2UoKSk7CisgICAgICAgIHBhcnNlNFZhbHVlc0ZpbGxQb3NpdGlvbih2YWx1ZUxpc3QsIHZh bHVlMSwgdmFsdWUyLCBXVEY6Om1vdmUocGFyc2VkVmFsdWUxKSwgV1RGOjptb3ZlKHBhcnNlZFZh bHVlMikpOwogfQogCiB2b2lkIENTU1BhcnNlcjo6cGFyc2UyVmFsdWVzRmlsbFBvc2l0aW9uKENT U1BhcnNlclZhbHVlTGlzdCYgdmFsdWVMaXN0LCBSZWZQdHI8Q1NTVmFsdWU+JiB2YWx1ZTEsIFJl ZlB0cjxDU1NWYWx1ZT4mIHZhbHVlMikKQEAgLTQ2NDgsNyArNDY0OSw3IEBAIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VGaWxsU2l6ZShDU1NQcm9wZXJ0eUlEIHByb3BJZCwg Ym9vbCYgYWxsb3dDCiAKICAgICBpZiAoIXBhcnNlZFZhbHVlMikKICAgICAgICAgcmV0dXJuIHBh cnNlZFZhbHVlMTsKLSAgICByZXR1cm4gY3JlYXRlUHJpbWl0aXZlVmFsdWVQYWlyKHBhcnNlZFZh bHVlMS5yZWxlYXNlKCksIHBhcnNlZFZhbHVlMi5yZWxlYXNlKCkpOworICAgIHJldHVybiBjcmVh dGVQcmltaXRpdmVWYWx1ZVBhaXIoV1RGOjptb3ZlKHBhcnNlZFZhbHVlMSksIFdURjo6bW92ZShw YXJzZWRWYWx1ZTIpKTsKIH0KIAogYm9vbCBDU1NQYXJzZXI6OnBhcnNlRmlsbFByb3BlcnR5KENT U1Byb3BlcnR5SUQgcHJvcElkLCBDU1NQcm9wZXJ0eUlEJiBwcm9wSWQxLCBDU1NQcm9wZXJ0eUlE JiBwcm9wSWQyLApAQCAtODA2MCw3ICs4MDYxLDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQm9y ZGVySW1hZ2VSZXBlYXQoUmVmUHRyPENTU1ZhbHVlPiYgcmVzdWx0KQogICAgIH0gZWxzZQogICAg ICAgICBzZWNvbmRWYWx1ZSA9IGZpcnN0VmFsdWU7CiAKLSAgICByZXN1bHQgPSBjcmVhdGVQcmlt aXRpdmVWYWx1ZVBhaXIoZmlyc3RWYWx1ZSwgc2Vjb25kVmFsdWUpOworICAgIHJlc3VsdCA9IGNy ZWF0ZVByaW1pdGl2ZVZhbHVlUGFpcihXVEY6Om1vdmUoZmlyc3RWYWx1ZSksIFdURjo6bW92ZShz ZWNvbmRWYWx1ZSkpOwogICAgIHJldHVybiB0cnVlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmgK aW5kZXggNGU1MzAwOGZlNGNhM2ZiYzFlOTNmODgwZGIzNWY4NjIxYzc1MDFjZi4uOGUxZmMwNjEx YzI4ZjJjYTFkZjRmZmRjZjI2NTJiMWQxZjE3NjdiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU1BhcnNlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaApA QCAtMTY3LDggKzE2Nyw4IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhcnNlMlZhbHVlc0ZpbGxQb3Np dGlvbihDU1NQYXJzZXJWYWx1ZUxpc3QmLCBSZWZQdHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENTU1Zh bHVlPiYpOwogICAgIGJvb2wgaXNQb3RlbnRpYWxQb3NpdGlvblZhbHVlKENTU1BhcnNlclZhbHVl Jik7CiAgICAgdm9pZCBwYXJzZUZpbGxQb3NpdGlvbihDU1NQYXJzZXJWYWx1ZUxpc3QmLCBSZWZQ dHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENTU1ZhbHVlPiYpOwotICAgIHZvaWQgcGFyc2UzVmFsdWVz RmlsbFBvc2l0aW9uKENTU1BhcnNlclZhbHVlTGlzdCYsIFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQ dHI8Q1NTVmFsdWU+JiwgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4sIFBhc3NSZWZQdHI8 Q1NTUHJpbWl0aXZlVmFsdWU+KTsKLSAgICB2b2lkIHBhcnNlNFZhbHVlc0ZpbGxQb3NpdGlvbihD U1NQYXJzZXJWYWx1ZUxpc3QmLCBSZWZQdHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENTU1ZhbHVlPiYs IFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+LCBQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZh bHVlPik7CisgICAgdm9pZCBwYXJzZTNWYWx1ZXNGaWxsUG9zaXRpb24oQ1NTUGFyc2VyVmFsdWVM aXN0JiwgUmVmUHRyPENTU1ZhbHVlPiYsIFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+JiYsIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4mJik7CisgICAgdm9pZCBw YXJzZTRWYWx1ZXNGaWxsUG9zaXRpb24oQ1NTUGFyc2VyVmFsdWVMaXN0JiwgUmVmUHRyPENTU1Zh bHVlPiYsIFJlZlB0cjxDU1NWYWx1ZT4mLCBSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+JiYsIFJl ZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4mJik7CiAKICAgICB2b2lkIHBhcnNlRmlsbFJlcGVhdChS ZWZQdHI8Q1NTVmFsdWU+JiwgUmVmUHRyPENTU1ZhbHVlPiYpOwogICAgIFBhc3NSZWZQdHI8Q1NT VmFsdWU+IHBhcnNlRmlsbFNpemUoQ1NTUHJvcGVydHlJRCwgYm9vbCAmYWxsb3dDb21tYSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvUGFpci5oIGIvU291cmNlL1dlYkNvcmUvY3Nz L1BhaXIuaAppbmRleCAyYzZjZDAxZTc2NWUwZWJmNTc4NWU3Yjk5MGVkNzQ4Y2Y5OGZkY2YwLi5m NWI1ZDFmMjU5ZTc3MjNlMWI1MDg2NmZkODEwNTkwNzkzYmYzMWM5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvUGFpci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9QYWlyLmgKQEAg LTEsNiArMSw2IEBACiAvKgogICogKEMpIDE5OTktMjAwMyBMYXJzIEtub2xsIChrbm9sbEBrZGUu b3JnKQotICogQ29weXJpZ2h0IChDKSAyMDA0LCAyMDA1LCAyMDA2IEFwcGxlIEluYy4KKyAqIENv cHlyaWdodCAoQykgMjAwNCwgMjAwNSwgMjAwNiwgMjAxNSBBcHBsZSBJbmMuCiAgKgogICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMKQEAgLTM4LDE3ICszOCwxNyBAQCBwdWJsaWM6CiAgICAgewogICAgICAgICByZXR1 cm4gYWRvcHRSZWYoKm5ldyBQYWlyKTsKICAgICB9Ci0gICAgc3RhdGljIFJlZjxQYWlyPiBjcmVh dGUoUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZmlyc3QsIFBhc3NSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IHNlY29uZCkKKyAgICBzdGF0aWMgUmVmPFBhaXI+IGNyZWF0ZShSZWZQdHI8 Q1NTUHJpbWl0aXZlVmFsdWU+JiYgZmlyc3QsIFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4mJiBz ZWNvbmQpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBQYWlyKGZpcnN0LCBz ZWNvbmQpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUGFpcihXVEY6Om1vdmUoZmly c3QpLCBXVEY6Om1vdmUoc2Vjb25kKSkpOwogICAgIH0KICAgICB2aXJ0dWFsIH5QYWlyKCkgeyB9 CiAKICAgICBDU1NQcmltaXRpdmVWYWx1ZSogZmlyc3QoKSBjb25zdCB7IHJldHVybiBtX2ZpcnN0 LmdldCgpOyB9CiAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHNlY29uZCgpIGNvbnN0IHsgcmV0dXJu IG1fc2Vjb25kLmdldCgpOyB9CiAKLSAgICB2b2lkIHNldEZpcnN0KFBhc3NSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IGZpcnN0KSB7IG1fZmlyc3QgPSBmaXJzdDsgfQotICAgIHZvaWQgc2V0U2Vj b25kKFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHNlY29uZCkgeyBtX3NlY29uZCA9IHNl Y29uZDsgfQorICAgIHZvaWQgc2V0Rmlyc3QoUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiYmIGZp cnN0KSB7IG1fZmlyc3QgPSBXVEY6Om1vdmUoZmlyc3QpOyB9CisgICAgdm9pZCBzZXRTZWNvbmQo UmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiYmIHNlY29uZCkgeyBtX3NlY29uZCA9IFdURjo6bW92 ZShzZWNvbmQpOyB9CiAKICAgICBTdHJpbmcgY3NzVGV4dCgpIGNvbnN0CiAgICAgewpAQCAtNTks OSArNTksOCBAQCBwdWJsaWM6CiAgICAgYm9vbCBlcXVhbHMoY29uc3QgUGFpciYgb3RoZXIpIGNv bnN0IHsgcmV0dXJuIGNvbXBhcmVDU1NWYWx1ZVB0cihtX2ZpcnN0LCBvdGhlci5tX2ZpcnN0KSAm JiBjb21wYXJlQ1NTVmFsdWVQdHIobV9zZWNvbmQsIG90aGVyLm1fc2Vjb25kKTsgfQogCiBwcml2 YXRlOgotICAgIFBhaXIoKSA6IG1fZmlyc3QoMCksIG1fc2Vjb25kKDApIHsgfQotICAgIFBhaXIo UGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZmlyc3QsIFBhc3NSZWZQdHI8Q1NTUHJpbWl0 aXZlVmFsdWU+IHNlY29uZCkKLSAgICAgICAgOiBtX2ZpcnN0KGZpcnN0KSwgbV9zZWNvbmQoc2Vj b25kKSB7IH0KKyAgICBQYWlyKCkgOiBtX2ZpcnN0KG51bGxwdHIpLCBtX3NlY29uZChudWxscHRy KSB7IH0KKyAgICBQYWlyKFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4mJiBmaXJzdCwgUmVmUHRy PENTU1ByaW1pdGl2ZVZhbHVlPiYmIHNlY29uZCkgOiBtX2ZpcnN0KFdURjo6bW92ZShmaXJzdCkp LCBtX3NlY29uZChXVEY6Om1vdmUoc2Vjb25kKSkgeyB9CiAKICAgICBzdGF0aWMgU3RyaW5nIGdl bmVyYXRlQ1NTU3RyaW5nKGNvbnN0IFN0cmluZyYgZmlyc3QsIGNvbnN0IFN0cmluZyYgc2Vjb25k KQogICAgIHsK