136664 2014-09-08 21:45:38 -0700 Minor refactor in CSSComputedStyleDeclaration 2014-09-08 23:36:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue oldest_to_newest 1034056 0 simon.fraser 2014-09-08 21:45:38 -0700 Minor refactor in CSSComputedStyleDeclaration 1034057 1 237838 simon.fraser 2014-09-08 21:47:58 -0700 Created attachment 237838 Patch 1034077 2 237838 commit-queue 2014-09-08 23:36:48 -0700 Comment on attachment 237838 Patch Clearing flags on attachment: 237838 Committed r173421: <http://trac.webkit.org/changeset/173421> 1034078 3 commit-queue 2014-09-08 23:36:50 -0700 All reviewed patches have been landed. Closing bug. 237838 2014-09-08 21:47:58 -0700 2014-09-08 23:36:48 -0700 Patch bug-136664-20140908214753.patch text/plain 8550 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTczNDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg3NDMyMGFhYjAxZGUw NDZiZDgxMzI2YjRmN2ZiZTM2ZmY0YzlhMS4uYzIwZDVhNjljYWJiN2VlYzY3NzhlM2M0NDZlZjUx YjU2M2FkNDA2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA5LTA4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pbm9yIHJlZmFj dG9yIGluIENTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM2NjY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlICJpZiAobGVuZ3RoLmlzUGVyY2VudE5vdENh bGN1bGF0ZWQoKSkgY3JlYXRlVmFsdWUoKSBlbHNlIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUoKSIK KyAgICAgICAgcGF0dGVybiBvY2N1cnJlZCBhIG51bWJlciBvZiB0aW1lcyBoZXJlLCBzbyBmYWN0 b3IgaW50byBwZXJjZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1ZSgpLgorCisgICAgICAgICogY3Nz L0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwb3Np dGlvbk9mZnNldFZhbHVlKTogbCAtPiBsZW5ndGgKKyAgICAgICAgKFdlYkNvcmU6OnBlcmNlbnRh Z2VPclpvb21BZGp1c3RlZFZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OmdldEJvcmRlclJhZGl1 c0Nvcm5lclZhbHVlcyk6CisgICAgICAgIChXZWJDb3JlOjpnZXRCb3JkZXJSYWRpdXNDb3JuZXJW YWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxTbmFwRGVzdGluYXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6c2Nyb2xsU25hcFBvaW50cyk6CisgICAgICAgIChXZWJDb3JlOjpzY3JvbGxT bmFwQ29vcmRpbmF0ZXMpOgorCiAyMDE0LTA5LTA4ICBDb21taXQgUXVldWUgIDxjb21taXQtcXVl dWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByMTczNDAy LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAppbmRleCA3OGZkYzZiNzlhODExZDUwMDQ0NjhkNTE5NDAyYTJiMGY5ZGMyMjMxLi5iMThj MmFhODM1ZmM1MTE5YmM2MDRiNGI0MDY5NmI2Yzk3YWYzYzRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtNjc0LDM2ICs2 NzQsMzYgQEAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBvc2l0aW9uT2Zmc2V0VmFsdWUo UmVuZGVyU3R5bGUqIHN0eWxlLCBDU1NQcm9wZXJ0eUkKICAgICBpZiAoIXN0eWxlKQogICAgICAg ICByZXR1cm4gbnVsbHB0cjsKIAotICAgIExlbmd0aCBsOworICAgIExlbmd0aCBsZW5ndGg7CiAg ICAgc3dpdGNoIChwcm9wZXJ0eUlEKSB7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlMZWZ0Ogot ICAgICAgICAgICAgbCA9IHN0eWxlLT5sZWZ0KCk7CisgICAgICAgICAgICBsZW5ndGggPSBzdHls ZS0+bGVmdCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlS aWdodDoKLSAgICAgICAgICAgIGwgPSBzdHlsZS0+cmlnaHQoKTsKKyAgICAgICAgICAgIGxlbmd0 aCA9IHN0eWxlLT5yaWdodCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQ1NT UHJvcGVydHlUb3A6Ci0gICAgICAgICAgICBsID0gc3R5bGUtPnRvcCgpOworICAgICAgICAgICAg bGVuZ3RoID0gc3R5bGUtPnRvcCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2Ug Q1NTUHJvcGVydHlCb3R0b206Ci0gICAgICAgICAgICBsID0gc3R5bGUtPmJvdHRvbSgpOworICAg ICAgICAgICAgbGVuZ3RoID0gc3R5bGUtPmJvdHRvbSgpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKICAg ICBpZiAoc3R5bGUtPmhhc091dE9mRmxvd1Bvc2l0aW9uKCkpIHsKLSAgICAgICAgaWYgKGwuaXNG aXhlZCgpKQotICAgICAgICAgICAgcmV0dXJuIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUobC52YWx1 ZSgpLCBzdHlsZSk7CisgICAgICAgIGlmIChsZW5ndGguaXNGaXhlZCgpKQorICAgICAgICAgICAg cmV0dXJuIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUobGVuZ3RoLnZhbHVlKCksIHN0eWxlKTsKIAot ICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUobCk7CisgICAgICAgIHJl dHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShsZW5ndGgpOwogICAgIH0KIAogICAgIGlm IChzdHlsZS0+aGFzSW5GbG93UG9zaXRpb24oKSkgewogICAgICAgICAvLyBGSVhNRTogSXQncyBu b3QgZW5vdWdoIHRvIHNpbXBseSByZXR1cm4gImF1dG8iIHZhbHVlcyBmb3Igb25lIG9mZnNldCBp ZiB0aGUgb3RoZXIgc2lkZSBpcyBkZWZpbmVkLgogICAgICAgICAvLyBJbiBvdGhlciB3b3JkcyBp ZiBsZWZ0IGlzIGF1dG8gYW5kIHJpZ2h0IGlzIG5vdCBhdXRvLCB0aGVuIGxlZnQncyBjb21wdXRl ZCB2YWx1ZSBpcyBuZWdhdGl2ZSByaWdodCgpLgogICAgICAgICAvLyBTbyB3ZSBzaG91bGQgZ2V0 IHRoZSBvcHBvc2l0ZSBsZW5ndGggdW5pdCBhbmQgc2VlIGlmIGl0IGlzIGF1dG8uCi0gICAgICAg IHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShsKTsKKyAgICAgICAgcmV0dXJuIGNz c1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKGxlbmd0aCk7CiAgICAgfQogCiAgICAgcmV0dXJuIGNz c1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUF1dG8pOwpAQCAtNzE3 LDI3ICs3MTcsMjcgQEAgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gQ29tcHV0ZWRTdHls ZUV4dHJhY3Rvcjo6Y3VycmVudENvbG9yT3JWYWxpZENvbG9yKFIKICAgICByZXR1cm4gY3NzVmFs dWVQb29sKCkuY3JlYXRlQ29sb3JWYWx1ZShjb2xvci5yZ2IoKSk7CiB9CiAKK3N0YXRpYyBQYXNz UmVmPENTU1ByaW1pdGl2ZVZhbHVlPiBwZXJjZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1ZShMZW5n dGggbGVuZ3RoLCBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUpCit7CisgICAgaWYgKGxlbmd0aC5p c1BlcmNlbnROb3RDYWxjdWxhdGVkKCkpCisgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5j cmVhdGVWYWx1ZShsZW5ndGgucGVyY2VudCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNF TlRBR0UpOworICAgIAorICAgIHJldHVybiB6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHZhbHVlRm9y TGVuZ3RoKGxlbmd0aCwgMCksIHN0eWxlKTsKK30KKwogc3RhdGljIFBhc3NSZWY8Q1NTVmFsdWVM aXN0PiBnZXRCb3JkZXJSYWRpdXNDb3JuZXJWYWx1ZXMoY29uc3QgTGVuZ3RoU2l6ZSYgcmFkaXVz LCBjb25zdCBSZW5kZXJTdHlsZSogc3R5bGUpCiB7CiAgICAgYXV0byBsaXN0ID0gQ1NTVmFsdWVM aXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOwotICAgIGlmIChyYWRpdXMud2lkdGgoKS5pc1Bl cmNlbnROb3RDYWxjdWxhdGVkKCkpCi0gICAgICAgIGxpc3QuZ2V0KCkuYXBwZW5kKGNzc1ZhbHVl UG9vbCgpLmNyZWF0ZVZhbHVlKHJhZGl1cy53aWR0aCgpLnBlcmNlbnQoKSwgQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19QRVJDRU5UQUdFKSk7Ci0gICAgZWxzZQotICAgICAgICBsaXN0LmdldCgpLmFw cGVuZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHZhbHVlRm9yTGVuZ3RoKHJhZGl1cy53aWR0aCgp LCAwKSwgc3R5bGUpKTsKLSAgICBpZiAocmFkaXVzLmhlaWdodCgpLmlzUGVyY2VudE5vdENhbGN1 bGF0ZWQoKSkKLSAgICAgICAgbGlzdC5nZXQoKS5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRl VmFsdWUocmFkaXVzLmhlaWdodCgpLnBlcmNlbnQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19Q RVJDRU5UQUdFKSk7Ci0gICAgZWxzZQotICAgICAgICBsaXN0LmdldCgpLmFwcGVuZCh6b29tQWRq dXN0ZWRQaXhlbFZhbHVlKHZhbHVlRm9yTGVuZ3RoKHJhZGl1cy5oZWlnaHQoKSwgMCksIHN0eWxl KSk7CisgICAgbGlzdC5nZXQoKS5hcHBlbmQocGVyY2VudGFnZU9yWm9vbUFkanVzdGVkVmFsdWUo cmFkaXVzLndpZHRoKCksIHN0eWxlKSk7CisgICAgbGlzdC5nZXQoKS5hcHBlbmQocGVyY2VudGFn ZU9yWm9vbUFkanVzdGVkVmFsdWUocmFkaXVzLmhlaWdodCgpLCBzdHlsZSkpOwogICAgIHJldHVy biBsaXN0OwogfQogCiBzdGF0aWMgUGFzc1JlZjxDU1NWYWx1ZT4gZ2V0Qm9yZGVyUmFkaXVzQ29y bmVyVmFsdWUoY29uc3QgTGVuZ3RoU2l6ZSYgcmFkaXVzLCBjb25zdCBSZW5kZXJTdHlsZSogc3R5 bGUpCiB7Ci0gICAgaWYgKHJhZGl1cy53aWR0aCgpID09IHJhZGl1cy5oZWlnaHQoKSkgewotICAg ICAgICBpZiAocmFkaXVzLndpZHRoKCkuaXNQZXJjZW50Tm90Q2FsY3VsYXRlZCgpKQotICAgICAg ICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHJhZGl1cy53aWR0aCgpLnBl cmNlbnQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKTsKLSAgICAgICAgcmV0 dXJuIHpvb21BZGp1c3RlZFBpeGVsVmFsdWUodmFsdWVGb3JMZW5ndGgocmFkaXVzLndpZHRoKCks IDApLCBzdHlsZSk7Ci0gICAgfQorICAgIGlmIChyYWRpdXMud2lkdGgoKSA9PSByYWRpdXMuaGVp Z2h0KCkpCisgICAgICAgIHJldHVybiBwZXJjZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1ZShyYWRp dXMud2lkdGgoKSwgc3R5bGUpOworCiAgICAgcmV0dXJuIGdldEJvcmRlclJhZGl1c0Nvcm5lclZh bHVlcyhyYWRpdXMsIHN0eWxlKTsKIH0KIApAQCAtMTA5NSwzNCArMTA5NSwyMCBAQCBzdGF0aWMg UGFzc1JlZjxDU1NWYWx1ZUxpc3Q+IGdldFRyYW5zaXRpb25Qcm9wZXJ0eVZhbHVlKGNvbnN0IEFu aW1hdGlvbkxpc3QqIGFuaQogc3RhdGljIFBhc3NSZWY8Q1NTVmFsdWVMaXN0PiBzY3JvbGxTbmFw RGVzdGluYXRpb24oUmVuZGVyU3R5bGUqIHN0eWxlLCBMZW5ndGggeCwgTGVuZ3RoIHkpCiB7CiAg ICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gc25hcERlc3RpbmF0aW9uVmFsdWUgPSBDU1NWYWx1ZUxp c3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7Ci0gICAgaWYgKHguaXNQZXJjZW50Tm90Q2FsY3Vs YXRlZCgpKQotICAgICAgICBzbmFwRGVzdGluYXRpb25WYWx1ZS0+YXBwZW5kKGNzc1ZhbHVlUG9v bCgpLmNyZWF0ZVZhbHVlKHgucGVyY2VudCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNF TlRBR0UpKTsKLSAgICBlbHNlCi0gICAgICAgIHNuYXBEZXN0aW5hdGlvblZhbHVlLT5hcHBlbmQo em9vbUFkanVzdGVkUGl4ZWxWYWx1ZSh2YWx1ZUZvckxlbmd0aCh4LCAwKSwgc3R5bGUpKTsKLQot ICAgIGlmICh5LmlzUGVyY2VudE5vdENhbGN1bGF0ZWQoKSkKLSAgICAgICAgc25hcERlc3RpbmF0 aW9uVmFsdWUtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZSh5LnBlcmNlbnQoKSwg Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5UQUdFKSk7Ci0gICAgZWxzZQotICAgICAgICBz bmFwRGVzdGluYXRpb25WYWx1ZS0+YXBwZW5kKHpvb21BZGp1c3RlZFBpeGVsVmFsdWUodmFsdWVG b3JMZW5ndGgoeSwgMCksIHN0eWxlKSk7Ci0KKyAgICBzbmFwRGVzdGluYXRpb25WYWx1ZS0+YXBw ZW5kKHBlcmNlbnRhZ2VPclpvb21BZGp1c3RlZFZhbHVlKHgsIHN0eWxlKSk7CisgICAgc25hcERl c3RpbmF0aW9uVmFsdWUtPmFwcGVuZChwZXJjZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1ZSh5LCBz dHlsZSkpOwogICAgIHJldHVybiBzbmFwRGVzdGluYXRpb25WYWx1ZS5yZWxlYXNlTm9uTnVsbCgp OwogfQogCiBzdGF0aWMgUGFzc1JlZjxDU1NWYWx1ZUxpc3Q+IHNjcm9sbFNuYXBQb2ludHMoUmVu ZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBWZWN0b3I8TGVuZ3RoPiYgcG9pbnRzLCBMZW5ndGggcmVw ZWF0UG9pbnQsIGJvb2wgaGFzUmVwZWF0KQogewogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IHNu YXBQb2ludHNWYWx1ZSA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKLSAg ICBmb3IgKGF1dG8mIHBvaW50IDogcG9pbnRzKSB7Ci0gICAgICAgIGlmIChwb2ludC5pc1BlcmNl bnROb3RDYWxjdWxhdGVkKCkpCi0gICAgICAgICAgICBzbmFwUG9pbnRzVmFsdWUtPmFwcGVuZChj c3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShwb2ludC5wZXJjZW50KCksIENTU1ByaW1pdGl2ZVZh bHVlOjpDU1NfUEVSQ0VOVEFHRSkpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBzbmFwUG9p bnRzVmFsdWUtPmFwcGVuZCh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHZhbHVlRm9yTGVuZ3RoKHBv aW50LCAwKSwgc3R5bGUpKTsKLSAgICB9Ci0gICAgaWYgKGhhc1JlcGVhdCkgewotICAgICAgICBp ZiAocmVwZWF0UG9pbnQuaXNQZXJjZW50Tm90Q2FsY3VsYXRlZCgpKQotICAgICAgICAgICAgc25h cFBvaW50c1ZhbHVlLT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoTGVuZ3RoUmVw ZWF0OjpjcmVhdGUoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUocmVwZWF0UG9pbnQucGVyY2Vu dCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0UpKSkpOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICBzbmFwUG9pbnRzVmFsdWUtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVh dGVWYWx1ZShMZW5ndGhSZXBlYXQ6OmNyZWF0ZSh6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHZhbHVl Rm9yTGVuZ3RoKHJlcGVhdFBvaW50LCAwKSwgc3R5bGUpKSkpOwotICAgIH0KKyAgICBmb3IgKGF1 dG8mIHBvaW50IDogcG9pbnRzKQorICAgICAgICBzbmFwUG9pbnRzVmFsdWUtPmFwcGVuZChwZXJj ZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1ZShwb2ludCwgc3R5bGUpKTsKKworICAgIGlmIChoYXNS ZXBlYXQpCisgICAgICAgIHNuYXBQb2ludHNWYWx1ZS0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNy ZWF0ZVZhbHVlKExlbmd0aFJlcGVhdDo6Y3JlYXRlKHBlcmNlbnRhZ2VPclpvb21BZGp1c3RlZFZh bHVlKHJlcGVhdFBvaW50LCBzdHlsZSkpKSk7CisKICAgICByZXR1cm4gc25hcFBvaW50c1ZhbHVl LnJlbGVhc2VOb25OdWxsKCk7CiB9CiAKQEAgLTExMzEsMTcgKzExMTcsOCBAQCBzdGF0aWMgUGFz c1JlZjxDU1NWYWx1ZUxpc3Q+IHNjcm9sbFNuYXBDb29yZGluYXRlcyhSZW5kZXJTdHlsZSogc3R5 bGUsIGNvbnN0IFZlYwogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IHNuYXBDb29yZGluYXRlc1Zh bHVlID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVDb21tYVNlcGFyYXRlZCgpOwogICAgIGZvciAoY29u c3QgYXV0byYgY29vcmRpbmF0ZSA6IGNvb3JkaW5hdGVzKSB7CiAgICAgICAgIFJlZlB0cjxDU1NW YWx1ZUxpc3Q+IGN1cnJlbnRDb29yZGluYXRlID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNl cGFyYXRlZCgpOwotICAgICAgICBMZW5ndGggcG9pbnQgPSBjb29yZGluYXRlLmZpcnN0OwotICAg ICAgICBpZiAocG9pbnQuaXNQZXJjZW50Tm90Q2FsY3VsYXRlZCgpKQotICAgICAgICAgICAgY3Vy cmVudENvb3JkaW5hdGUtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShwb2ludC5w ZXJjZW50KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUEVSQ0VOVEFHRSkpOwotICAgICAgICBl bHNlCi0gICAgICAgICAgICBjdXJyZW50Q29vcmRpbmF0ZS0+YXBwZW5kKHpvb21BZGp1c3RlZFBp eGVsVmFsdWUodmFsdWVGb3JMZW5ndGgocG9pbnQsIDApLCBzdHlsZSkpOwotCi0gICAgICAgIHBv aW50ID0gY29vcmRpbmF0ZS5zZWNvbmQ7Ci0gICAgICAgIGlmIChwb2ludC5pc1BlcmNlbnROb3RD YWxjdWxhdGVkKCkpCi0gICAgICAgICAgICBjdXJyZW50Q29vcmRpbmF0ZS0+YXBwZW5kKGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHBvaW50LnBlcmNlbnQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU19QRVJDRU5UQUdFKSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGN1cnJlbnRDb29y ZGluYXRlLT5hcHBlbmQoem9vbUFkanVzdGVkUGl4ZWxWYWx1ZSh2YWx1ZUZvckxlbmd0aChwb2lu dCwgMCksIHN0eWxlKSk7CisgICAgICAgIGN1cnJlbnRDb29yZGluYXRlLT5hcHBlbmQocGVyY2Vu dGFnZU9yWm9vbUFkanVzdGVkVmFsdWUoY29vcmRpbmF0ZS5maXJzdCwgc3R5bGUpKTsKKyAgICAg ICAgY3VycmVudENvb3JkaW5hdGUtPmFwcGVuZChwZXJjZW50YWdlT3Jab29tQWRqdXN0ZWRWYWx1 ZShjb29yZGluYXRlLnNlY29uZCwgc3R5bGUpKTsKIAogICAgICAgICBzbmFwQ29vcmRpbmF0ZXNW YWx1ZS0+YXBwZW5kKGN1cnJlbnRDb29yZGluYXRlLnJlbGVhc2VOb25OdWxsKCkpOwogICAgIH0K