169177 2017-03-04 18:23:38 -0800 Make some RenderLayer tree traversal in RenderLayerBacking more generic 2017-03-05 11:14:48 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 1283520 0 simon.fraser 2017-03-04 18:23:38 -0800 Make some RenderLayer tree traversal in RenderLayerBacking more generic 1283521 1 303428 simon.fraser 2017-03-04 18:27:36 -0800 Created attachment 303428 Patch 1283523 2 commit-queue 2017-03-04 18:30:26 -0800 Attachment 303428 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderLayerBacking.cpp:1952: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1283524 3 303430 simon.fraser 2017-03-04 18:38:31 -0800 Created attachment 303430 Patch 1283525 4 commit-queue 2017-03-04 18:39:59 -0800 Attachment 303430 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderLayerBacking.cpp:1954: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1283596 5 303459 simon.fraser 2017-03-05 10:27:10 -0800 Created attachment 303459 Patch 1283597 6 commit-queue 2017-03-05 10:30:37 -0800 Attachment 303459 did not pass style-queue: ERROR: Source/WebCore/rendering/RenderLayerBacking.cpp:1953: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1283605 7 simon.fraser 2017-03-05 11:14:48 -0800 https://trac.webkit.org/r213435 303428 2017-03-04 18:27:36 -0800 2017-03-04 18:38:24 -0800 Patch bug-169177-20170304182735.patch text/plain 6710 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcyNTBlMWY2Mzk0ZDI3 YjRmMDNjMDZlZmMxMzljZDE0MGE4Njg5Yy4uOTg2YjA5YmJjOTE4MDRiYzE4NTFlMDhlZmZmYzdk MzNmZmU3YTZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTAzLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1ha2Ugc29tZSBS ZW5kZXJMYXllciB0cmVlIHRyYXZlcnNhbCBpbiBSZW5kZXJMYXllckJhY2tpbmcgbW9yZSBnZW5l cmljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkx NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg cmVhbCBnb2FsIG9mIHRoaXMgcGF0Y2ggaXMgcmVkdWNlIHRoZSBudW1iZXIgb2YgY2FsbGVycyBv ZgorICAgICAgICBSZW5kZXJMYXllckJhY2tpbmc6OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2Nl bmRhbnRMYXllcnMoKSB0byBvbmUuIFRvIGFjaGlldmUgdGhhdCwKKyAgICAgICAgaGF2ZSB0aGUg c2V0Q29udGVudHNWaXNpYmxlKCkgbG9naWMgKHdoaWNoIGlzIHJlYWxseSBqdXN0IGFib3V0IHRo ZSBDU1MgJ3Zpc2liaWxpdHknIHByb3BlcnR5KQorICAgICAgICBkbyBpdHMgb3duIHRyZWUgdHJh dmVyc2FsIHdoaWNoIGp1c3QgY29uc3VsdHMgbGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKS4gU28K KyAgICAgICAgbWFrZSBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKSBhIGdlbmVy aWMgdHJhdmVyc2FsIGZ1bmN0aW9uIHdoaWNoIHdhbGtzCisgICAgICAgIGRlc2NlbmRhbnQgbGF5 ZXJzIHdoaWNoIG1heSBwYWludCBpbnRvIHRoZSB0YXJnZXQgbGF5ZXIuIFRoZSAiVmlzaWJsZSIg aW4gdGhlIG5hbWUKKyAgICAgICAgcmVmbGVjdHMgdGhlIGZhY3QgdGhhdCBpdCBjYW4gYnlwYXNz IGEgc3VidHJlZSBmb3IgYSBsYXllciB3aXRoICFoYXNWaXNpYmxlRGVzY2VuZGFudCgpLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyRGVzY2VuZGFudHMpOgorICAgICAg ICAoV2ViQ29yZTo6dHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRp b25Gb3JEZXNjZW5kYW50TGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6aGFzVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cyk6CisgICAgICAgIChXZWJD b3JlOjpkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IpOiBEZWxldGVkLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKworMjAxNy0wMy0wNCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBDbGFyaWZ5IHNvbWUg dGVybWlub2xvZ3kgaW4gUmVuZGVyTGF5ZXJCYWNraW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxNzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAzNDUwMjJmMWM4MDNmZjdmZmY4 MjEwNDJhMzNlODZmMWFmNWMzMTYzLi44OTZmMzA3NDJmNThlYTc3Mjg2NDQ0ZDI3MjIzNjBmMGVk OWI4MDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcApAQCAtMTEwNCw3ICsxMTA0LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUFmdGVyRGVzY2VuZGFudHMoKQogCiAgICAgdXBkYXRlRHJhd3NDb250ZW50KGlzU2ltcGxl Q29udGFpbmVyKTsKIAotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKG1f b3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBpc1BhaW50RGVzdGluYXRpb25Gb3JE ZXNjZW5kYW50TGF5ZXJzKCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNp YmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBoYXNWaXNpYmxlTm9uQ29t cG9zaXRlZERlc2NlbmRhbnRzKCkpOwogICAgIGlmIChtX3Njcm9sbGluZ0xheWVyKSB7CiAgICAg ICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldENvbnRlbnRzVmlzaWJsZShyZW5kZXJlcigpLnN0eWxl KCkudmlzaWJpbGl0eSgpID09IFZJU0lCTEUpOwogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5z ZXRVc2VySW50ZXJhY3Rpb25FbmFibGVkKHJlbmRlcmVyKCkuc3R5bGUoKS5wb2ludGVyRXZlbnRz KCkgIT0gUEVfTk9ORSk7CkBAIC0xOTQ4LDcgKzE5NDgsOCBAQCBib29sIFJlbmRlckxheWVyQmFj a2luZzo6aXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2Vz dG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCisvLyBSZXR1cm5pbmcgdHJ1ZSBzdG9wcyB0aGUgdHJh dmVyc2FsLgorc3RhdGljIGJvb2wgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRh bnRMYXllcnMoUmVuZGVyTGF5ZXImIHBhcmVudCwgc3RkOjpmdW5jdGlvbjxib29sIChjb25zdCBS ZW5kZXJMYXllciYpPiBsYXllckZ1bmMpCiB7CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZG4ndCBi ZSBjYWxsZWQgd2l0aCBhIHN0YWxlIHotb3JkZXIgbGlzdHMuIFNlZSBidWcgODU1MTIuCiAgICAg cGFyZW50LnVwZGF0ZUxheWVyTGlzdHNJZk5lZWRlZCgpOwpAQCAtMTk1OSw3ICsxOTYwLDEzIEBA IHN0YXRpYyBib29sIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcihSZW5kZXJMYXll ciYgcGFyZW50KQogCiAgICAgaWYgKGF1dG8qIG5vcm1hbEZsb3dMaXN0ID0gcGFyZW50Lm5vcm1h bEZsb3dMaXN0KCkpIHsKICAgICAgICAgZm9yIChhdXRvKiBjaGlsZExheWVyIDogKm5vcm1hbEZs b3dMaXN0KSB7Ci0gICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3Jl KCpjaGlsZExheWVyKSAmJiAoY2hpbGRMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVz Y2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjaGlsZExheWVyKSkpCisgICAgICAgICAg ICBpZiAoY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpKQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBpZiAobGF5ZXJGdW5jKCpjaGlsZExh eWVyKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIAorICAgICAg ICAgICAgaWYgKHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKCpj aGlsZExheWVyLCBsYXllckZ1bmMpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICB9CiAgICAgfQpAQCAtMTk3MSwxNCArMTk3OCwyNiBAQCBzdGF0aWMgYm9vbCBkZXNjZW5k YW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKICAgICAgICAg Ly8gVXNlIHRoZSBtX2hhc0NvbXBvc2l0aW5nRGVzY2VuZGFudCBiaXQgdG8gb3B0aW1pemU/CiAg ICAgICAgIGlmIChhdXRvKiBuZWdaT3JkZXJMaXN0ID0gcGFyZW50Lm5lZ1pPcmRlckxpc3QoKSkg ewogICAgICAgICAgICAgZm9yIChhdXRvKiBjaGlsZExheWVyIDogKm5lZ1pPcmRlckxpc3QpIHsK LSAgICAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGls ZExheWVyKSAmJiAoY2hpbGRMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFu dExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjaGlsZExheWVyKSkpCisgICAgICAgICAgICAgICAg aWYgKGNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExheWVyKSkKKyAgICAgICAg ICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICBpZiAobGF5ZXJGdW5jKCpj aGlsZExheWVyKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAg ICAgICAgICBpZiAodHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMo KmNoaWxkTGF5ZXIsIGxheWVyRnVuYykpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGF1dG8qIHBvc1pPcmRl ckxpc3QgPSBwYXJlbnQucG9zWk9yZGVyTGlzdCgpKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8q IGNoaWxkTGF5ZXIgOiAqcG9zWk9yZGVyTGlzdCkgewotICAgICAgICAgICAgICAgIGlmICghY29t cG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpICYmIChjaGlsZExheWVyLT5p c1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3Io KmNoaWxkTGF5ZXIpKSkKKyAgICAgICAgICAgICAgICBpZiAoY29tcG9zaXRlZFdpdGhPd25CYWNr aW5nU3RvcmUoKmNoaWxkTGF5ZXIpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKwor ICAgICAgICAgICAgICAgIGlmIChsYXllckZ1bmMoKmNoaWxkTGF5ZXIpKQorICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAgICAgICAgIGlmICh0cmF2ZXJzZVZpc2li bGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycygqY2hpbGRMYXllciwgbGF5ZXJGdW5jKSkK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KQEAgLTE5OTAsNyArMjAwOSwyNCBAQCBzdGF0aWMgYm9vbCBkZXNjZW5kYW50TGF5ZXJQYWlu dHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKIC8vIENvbnNlcnZhdGl2ZSB0ZXN0 IGZvciBoYXZpbmcgbm8gcmVuZGVyZWQgY2hpbGRyZW4uCiBib29sIFJlbmRlckxheWVyQmFja2lu Zzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycygpIGNvbnN0CiB7Ci0gICAg cmV0dXJuIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcihtX293bmluZ0xheWVyKTsK KyAgICBib29sIGhhc1BhaW50aW5nRGVzY2VuZGFudCA9IGZhbHNlOworICAgIHRyYXZlcnNlVmlz aWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKG1fb3duaW5nTGF5ZXIsIFsmaGFzUGFp bnRpbmdEZXNjZW5kYW50XShjb25zdCBSZW5kZXJMYXllciYgbGF5ZXIpIHsKKyAgICAgICAgaGFz UGFpbnRpbmdEZXNjZW5kYW50ID0gbGF5ZXIuaXNWaXN1YWxseU5vbkVtcHR5KCk7CisgICAgICAg IHJldHVybiBoYXNQYWludGluZ0Rlc2NlbmRhbnQ7CisgICAgfSk7CisKKyAgICByZXR1cm4gaGFz UGFpbnRpbmdEZXNjZW5kYW50OworfQorCitib29sIFJlbmRlckxheWVyQmFja2luZzo6aGFzVmlz aWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cygpIGNvbnN0Cit7CisgICAgYm9vbCBoYXNWaXNp YmxlRGVzY2VuZGFudCA9IGZhbHNlOworICAgIHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWRE ZXNjZW5kYW50TGF5ZXJzKG1fb3duaW5nTGF5ZXIsIFsmaGFzVmlzaWJsZURlc2NlbmRhbnRdKGNv bnN0IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBoYXNWaXNpYmxlRGVzY2VuZGFudCA9 IGxheWVyLmhhc1Zpc2libGVDb250ZW50KCk7CisgICAgICAgIHJldHVybiBoYXNWaXNpYmxlRGVz Y2VuZGFudDsKKyAgICB9KTsKKworICAgIHJldHVybiBoYXNWaXNpYmxlRGVzY2VuZGFudDsKIH0K IAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRlZENvbnRlbnQoYm9vbCBp c1NpbXBsZUNvbnRhaW5lcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuaAppbmRleCA3NzAyZTExODhjYTk3Nzk1NmYyZWI2MzVlOWVlNGY4YWU0 YmQ2ZjhkLi5mZjczZWE3YzFiMWIyMGVhZmY2ZjdkZmJkMjBmYTJmZGJiOWI2MmU5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCkBAIC0zMjksNiAr MzI5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0Q29udGVudHNSZWN0KCk7CiAKICAgICBi b29sIGlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXllcnMoKSBjb25zdDsKKyAgICBi b29sIGhhc1Zpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudHMoKSBjb25zdDsKIAogICAgIGJv b2wgc2hvdWxkQ2xpcENvbXBvc2l0ZWRCb3VuZHMoKSBjb25zdDsKIAo= 303430 2017-03-04 18:38:31 -0800 2017-03-04 18:41:47 -0800 Patch bug-169177-20170304183829.patch text/plain 7167 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcyNTBlMWY2Mzk0ZDI3 YjRmMDNjMDZlZmMxMzljZDE0MGE4Njg5Yy4uOTg2YjA5YmJjOTE4MDRiYzE4NTFlMDhlZmZmYzdk MzNmZmU3YTZiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDE3LTAzLTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIE1ha2Ugc29tZSBS ZW5kZXJMYXllciB0cmVlIHRyYXZlcnNhbCBpbiBSZW5kZXJMYXllckJhY2tpbmcgbW9yZSBnZW5l cmljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkx NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUg cmVhbCBnb2FsIG9mIHRoaXMgcGF0Y2ggaXMgcmVkdWNlIHRoZSBudW1iZXIgb2YgY2FsbGVycyBv ZgorICAgICAgICBSZW5kZXJMYXllckJhY2tpbmc6OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2Nl bmRhbnRMYXllcnMoKSB0byBvbmUuIFRvIGFjaGlldmUgdGhhdCwKKyAgICAgICAgaGF2ZSB0aGUg c2V0Q29udGVudHNWaXNpYmxlKCkgbG9naWMgKHdoaWNoIGlzIHJlYWxseSBqdXN0IGFib3V0IHRo ZSBDU1MgJ3Zpc2liaWxpdHknIHByb3BlcnR5KQorICAgICAgICBkbyBpdHMgb3duIHRyZWUgdHJh dmVyc2FsIHdoaWNoIGp1c3QgY29uc3VsdHMgbGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKS4gU28K KyAgICAgICAgbWFrZSBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKSBhIGdlbmVy aWMgdHJhdmVyc2FsIGZ1bmN0aW9uIHdoaWNoIHdhbGtzCisgICAgICAgIGRlc2NlbmRhbnQgbGF5 ZXJzIHdoaWNoIG1heSBwYWludCBpbnRvIHRoZSB0YXJnZXQgbGF5ZXIuIFRoZSAiVmlzaWJsZSIg aW4gdGhlIG5hbWUKKyAgICAgICAgcmVmbGVjdHMgdGhlIGZhY3QgdGhhdCBpdCBjYW4gYnlwYXNz IGEgc3VidHJlZSBmb3IgYSBsYXllciB3aXRoICFoYXNWaXNpYmxlRGVzY2VuZGFudCgpLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUFmdGVyRGVzY2VuZGFudHMpOgorICAgICAg ICAoV2ViQ29yZTo6dHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRp b25Gb3JEZXNjZW5kYW50TGF5ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFj a2luZzo6aGFzVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cyk6CisgICAgICAgIChXZWJD b3JlOjpkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IpOiBEZWxldGVkLgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaDoKKworMjAxNy0wMy0wNCAgU2ltb24g RnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBDbGFyaWZ5IHNvbWUg dGVybWlub2xvZ3kgaW4gUmVuZGVyTGF5ZXJCYWNraW5nCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxNzQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAzNDUwMjJmMWM4MDNmZjdmZmY4 MjEwNDJhMzNlODZmMWFmNWMzMTYzLi4xMzcwNmJiOTY0MDliYjM4NTgzZGJhOTA1N2ViYzkyNzVh YzllZWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcApAQCAtMTEwNCw3ICsxMTA0LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVw ZGF0ZUFmdGVyRGVzY2VuZGFudHMoKQogCiAgICAgdXBkYXRlRHJhd3NDb250ZW50KGlzU2ltcGxl Q29udGFpbmVyKTsKIAotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKG1f b3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBpc1BhaW50RGVzdGluYXRpb25Gb3JE ZXNjZW5kYW50TGF5ZXJzKCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNp YmxlKG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBoYXNWaXNpYmxlTm9uQ29t cG9zaXRlZERlc2NlbmRhbnRzKCkpOwogICAgIGlmIChtX3Njcm9sbGluZ0xheWVyKSB7CiAgICAg ICAgIG1fc2Nyb2xsaW5nTGF5ZXItPnNldENvbnRlbnRzVmlzaWJsZShyZW5kZXJlcigpLnN0eWxl KCkudmlzaWJpbGl0eSgpID09IFZJU0lCTEUpOwogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5z ZXRVc2VySW50ZXJhY3Rpb25FbmFibGVkKHJlbmRlcmVyKCkuc3R5bGUoKS5wb2ludGVyRXZlbnRz KCkgIT0gUEVfTk9ORSk7CkBAIC0xOTQ4LDcgKzE5NDgsMTAgQEAgYm9vbCBSZW5kZXJMYXllckJh Y2tpbmc6OmlzU2ltcGxlQ29udGFpbmVyQ29tcG9zaXRpbmdMYXllcigpIGNvbnN0CiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNl c3RvcihSZW5kZXJMYXllciYgcGFyZW50KQorLy8gUmV0dXJuaW5nIHRydWUgc3RvcHMgdGhlIHRy YXZlcnNhbC4KK2VudW0gY2xhc3MgVHJhdmVyc2FsIHsgQ29udGludWUsIFN0b3AgfTsKKworc3Rh dGljIFRyYXZlcnNhbCB0cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVy cyhSZW5kZXJMYXllciYgcGFyZW50LCBzdGQ6OmZ1bmN0aW9uPFRyYXZlcnNhbCAoY29uc3QgUmVu ZGVyTGF5ZXImKT4gbGF5ZXJGdW5jKQogewogICAgIC8vIEZJWE1FOiBXZSBzaG91bGRuJ3QgYmUg Y2FsbGVkIHdpdGggYSBzdGFsZSB6LW9yZGVyIGxpc3RzLiBTZWUgYnVnIDg1NTEyLgogICAgIHBh cmVudC51cGRhdGVMYXllckxpc3RzSWZOZWVkZWQoKTsKQEAgLTE5NTksMzggKzE5NjIsNzMgQEAg c3RhdGljIGJvb2wgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKFJlbmRlckxheWVy JiBwYXJlbnQpCiAKICAgICBpZiAoYXV0byogbm9ybWFsRmxvd0xpc3QgPSBwYXJlbnQubm9ybWFs Rmxvd0xpc3QoKSkgewogICAgICAgICBmb3IgKGF1dG8qIGNoaWxkTGF5ZXIgOiAqbm9ybWFsRmxv d0xpc3QpIHsKLSAgICAgICAgICAgIGlmICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUo KmNoaWxkTGF5ZXIpICYmIChjaGlsZExheWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNj ZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoKmNoaWxkTGF5ZXIpKSkKLSAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIGlmIChjb21wb3NpdGVkV2l0aE93bkJhY2tp bmdTdG9yZSgqY2hpbGRMYXllcikpCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAg ICAgICAgIGlmIChsYXllckZ1bmMoKmNoaWxkTGF5ZXIpID09IFRyYXZlcnNhbDo6U3RvcCkKKyAg ICAgICAgICAgICAgICByZXR1cm4gVHJhdmVyc2FsOjpTdG9wOworICAgICAgICAgICAgCisgICAg ICAgICAgICBpZiAodHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMo KmNoaWxkTGF5ZXIsIGxheWVyRnVuYykgPT0gVHJhdmVyc2FsOjpTdG9wKQorICAgICAgICAgICAg ICAgIHJldHVybiBUcmF2ZXJzYWw6OlN0b3A7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAo cGFyZW50LmlzU3RhY2tpbmdDb250YWluZXIoKSkgewogICAgICAgICBpZiAoIXBhcmVudC5oYXNW aXNpYmxlRGVzY2VuZGFudCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAg ICAgcmV0dXJuIFRyYXZlcnNhbDo6Q29udGludWU7CiAKICAgICAgICAgLy8gVXNlIHRoZSBtX2hh c0NvbXBvc2l0aW5nRGVzY2VuZGFudCBiaXQgdG8gb3B0aW1pemU/CiAgICAgICAgIGlmIChhdXRv KiBuZWdaT3JkZXJMaXN0ID0gcGFyZW50Lm5lZ1pPcmRlckxpc3QoKSkgewogICAgICAgICAgICAg Zm9yIChhdXRvKiBjaGlsZExheWVyIDogKm5lZ1pPcmRlckxpc3QpIHsKLSAgICAgICAgICAgICAg ICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExheWVyKSAmJiAoY2hp bGRMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExheWVyUGFpbnRzSW50 b0FuY2VzdG9yKCpjaGlsZExheWVyKSkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICAgICAgICAgIGlmIChjb21wb3NpdGVkV2l0aE93bkJhY2tpbmdTdG9yZSgqY2hp bGRMYXllcikpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAg ICAgaWYgKGxheWVyRnVuYygqY2hpbGRMYXllcikgPT0gVHJhdmVyc2FsOjpTdG9wKQorICAgICAg ICAgICAgICAgICAgICByZXR1cm4gVHJhdmVyc2FsOjpTdG9wOworCisgICAgICAgICAgICAgICAg aWYgKHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKCpjaGlsZExh eWVyLCBsYXllckZ1bmMpID09IFRyYXZlcnNhbDo6U3RvcCkKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFRyYXZlcnNhbDo6U3RvcDsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCiAgICAg ICAgIGlmIChhdXRvKiBwb3NaT3JkZXJMaXN0ID0gcGFyZW50LnBvc1pPcmRlckxpc3QoKSkgewog ICAgICAgICAgICAgZm9yIChhdXRvKiBjaGlsZExheWVyIDogKnBvc1pPcmRlckxpc3QpIHsKLSAg ICAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExh eWVyKSAmJiAoY2hpbGRMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExh eWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjaGlsZExheWVyKSkpCi0gICAgICAgICAgICAgICAgICAg IHJldHVybiB0cnVlOworICAgICAgICAgICAgICAgIGlmIChjb21wb3NpdGVkV2l0aE93bkJhY2tp bmdTdG9yZSgqY2hpbGRMYXllcikpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisg ICAgICAgICAgICAgICAgaWYgKGxheWVyRnVuYygqY2hpbGRMYXllcikgPT0gVHJhdmVyc2FsOjpT dG9wKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gVHJhdmVyc2FsOjpTdG9wOworCisgICAg ICAgICAgICAgICAgaWYgKHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5 ZXJzKCpjaGlsZExheWVyLCBsYXllckZ1bmMpID09IFRyYXZlcnNhbDo6U3RvcCkKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIFRyYXZlcnNhbDo6U3RvcDsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KIAotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gVHJhdmVyc2FsOjpD b250aW51ZTsKIH0KIAogLy8gQ29uc2VydmF0aXZlIHRlc3QgZm9yIGhhdmluZyBubyByZW5kZXJl ZCBjaGlsZHJlbi4KIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRpb25G b3JEZXNjZW5kYW50TGF5ZXJzKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZGVzY2VuZGFudExheWVy UGFpbnRzSW50b0FuY2VzdG9yKG1fb3duaW5nTGF5ZXIpOworICAgIGJvb2wgaGFzUGFpbnRpbmdE ZXNjZW5kYW50ID0gZmFsc2U7CisgICAgdHJhdmVyc2VWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2Nl bmRhbnRMYXllcnMobV9vd25pbmdMYXllciwgWyZoYXNQYWludGluZ0Rlc2NlbmRhbnRdKGNvbnN0 IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBoYXNQYWludGluZ0Rlc2NlbmRhbnQgPSBs YXllci5pc1Zpc3VhbGx5Tm9uRW1wdHkoKTsKKyAgICAgICAgcmV0dXJuIGhhc1BhaW50aW5nRGVz Y2VuZGFudCA/IFRyYXZlcnNhbDo6U3RvcCA6IFRyYXZlcnNhbDo6Q29udGludWU7CisgICAgfSk7 CisKKyAgICByZXR1cm4gaGFzUGFpbnRpbmdEZXNjZW5kYW50OworfQorCitib29sIFJlbmRlckxh eWVyQmFja2luZzo6aGFzVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cygpIGNvbnN0Cit7 CisgICAgYm9vbCBoYXNWaXNpYmxlRGVzY2VuZGFudCA9IGZhbHNlOworICAgIHRyYXZlcnNlVmlz aWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKG1fb3duaW5nTGF5ZXIsIFsmaGFzVmlz aWJsZURlc2NlbmRhbnRdKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBoYXNW aXNpYmxlRGVzY2VuZGFudCA9IGxheWVyLmhhc1Zpc2libGVDb250ZW50KCk7CisgICAgICAgIHJl dHVybiBoYXNWaXNpYmxlRGVzY2VuZGFudCA/IFRyYXZlcnNhbDo6U3RvcCA6IFRyYXZlcnNhbDo6 Q29udGludWU7CisgICAgfSk7CisKKyAgICByZXR1cm4gaGFzVmlzaWJsZURlc2NlbmRhbnQ7CiB9 CiAKIGJvb2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpjb250YWluc1BhaW50ZWRDb250ZW50KGJvb2wg aXNTaW1wbGVDb250YWluZXIpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmgKaW5kZXggNzcwMmUxMTg4Y2E5Nzc5NTZmMmViNjM1ZTllZTRmOGFl NGJkNmY4ZC4uZmY3M2VhN2MxYjFiMjBlYWZmNmY3ZGZiZDIwZmEyZmRiYjliNjJlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaApAQCAtMzI5LDYg KzMyOSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXNldENvbnRlbnRzUmVjdCgpOwogCiAgICAg Ym9vbCBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzKCkgY29uc3Q7CisgICAg Ym9vbCBoYXNWaXNpYmxlTm9uQ29tcG9zaXRlZERlc2NlbmRhbnRzKCkgY29uc3Q7CiAKICAgICBi b29sIHNob3VsZENsaXBDb21wb3NpdGVkQm91bmRzKCkgY29uc3Q7CiAK 303459 2017-03-05 10:27:10 -0800 2017-03-05 10:27:10 -0800 Patch bug-169177-20170305102710.patch text/plain 7171 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDcyNTBlMWY2Mzk0ZDI3 YjRmMDNjMDZlZmMxMzljZDE0MGE4Njg5Yy4uZWFmOWM4OTk4MjBlYWQ3ZmMxMzI0MzY5MmYzZGY0 ZjM2MWM2NDlhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTAzLTA1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc29tZSBS ZW5kZXJMYXllciB0cmVlIHRyYXZlcnNhbCBpbiBSZW5kZXJMYXllckJhY2tpbmcgbW9yZSBnZW5l cmljCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkx NzcKKworICAgICAgICBSZXZpZXdlZCBieSBaYWxhbiBCdWp0YXMuCisKKyAgICAgICAgVGhlIHJl YWwgZ29hbCBvZiB0aGlzIHBhdGNoIGlzIHJlZHVjZSB0aGUgbnVtYmVyIG9mIGNhbGxlcnMgb2YK KyAgICAgICAgUmVuZGVyTGF5ZXJCYWNraW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5k YW50TGF5ZXJzKCkgdG8gb25lLiBUbyBhY2hpZXZlIHRoYXQsCisgICAgICAgIGhhdmUgdGhlIHNl dENvbnRlbnRzVmlzaWJsZSgpIGxvZ2ljICh3aGljaCBpcyByZWFsbHkganVzdCBhYm91dCB0aGUg Q1NTICd2aXNpYmlsaXR5JyBwcm9wZXJ0eSkKKyAgICAgICAgZG8gaXRzIG93biB0cmVlIHRyYXZl cnNhbCB3aGljaCBqdXN0IGNvbnN1bHRzIGxheWVyLmhhc1Zpc2libGVDb250ZW50KCkuIFNvCisg ICAgICAgIG1ha2UgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCkgYSBnZW5lcmlj IHRyYXZlcnNhbCBmdW5jdGlvbiB3aGljaCB3YWxrcworICAgICAgICBkZXNjZW5kYW50IGxheWVy cyB3aGljaCBtYXkgcGFpbnQgaW50byB0aGUgdGFyZ2V0IGxheWVyLiBUaGUgIlZpc2libGUiIGlu IHRoZSBuYW1lCisgICAgICAgIHJlZmxlY3RzIHRoZSBmYWN0IHRoYXQgaXQgY2FuIGJ5cGFzcyBh IHN1YnRyZWUgZm9yIGEgbGF5ZXIgd2l0aCAhaGFzVmlzaWJsZURlc2NlbmRhbnQoKS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKToKKyAgICAgICAg KFdlYkNvcmU6OnRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9u Rm9yRGVzY2VuZGFudExheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tp bmc6Omhhc1Zpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudHMpOgorICAgICAgICAoV2ViQ29y ZTo6ZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKTogRGVsZXRlZC4KKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmg6CisKIDIwMTctMDMtMDQgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQ2xhcmlmeSBzb21lIHRl cm1pbm9sb2d5IGluIFJlbmRlckxheWVyQmFja2luZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCAzNDUwMjJmMWM4MDNmZjdmZmY4MjEw NDJhMzNlODZmMWFmNWMzMTYzLi5jMTNiYjI2Mjk5MDg3MDM1ZDRhZGY0Njg5MzU2ZmRlZDRiMmFi ODEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n LmNwcApAQCAtMTEwNCw3ICsxMTA0LDcgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0 ZUFmdGVyRGVzY2VuZGFudHMoKQogCiAgICAgdXBkYXRlRHJhd3NDb250ZW50KGlzU2ltcGxlQ29u dGFpbmVyKTsKIAotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxlKG1fb3du aW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNj ZW5kYW50TGF5ZXJzKCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0Q29udGVudHNWaXNpYmxl KG1fb3duaW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSB8fCBoYXNWaXNpYmxlTm9uQ29tcG9z aXRlZERlc2NlbmRhbnRzKCkpOwogICAgIGlmIChtX3Njcm9sbGluZ0xheWVyKSB7CiAgICAgICAg IG1fc2Nyb2xsaW5nTGF5ZXItPnNldENvbnRlbnRzVmlzaWJsZShyZW5kZXJlcigpLnN0eWxlKCku dmlzaWJpbGl0eSgpID09IFZJU0lCTEUpOwogICAgICAgICBtX3Njcm9sbGluZ0xheWVyLT5zZXRV c2VySW50ZXJhY3Rpb25FbmFibGVkKHJlbmRlcmVyKCkuc3R5bGUoKS5wb2ludGVyRXZlbnRzKCkg IT0gUEVfTk9ORSk7CkBAIC0xOTQ4LDcgKzE5NDgsOSBAQCBib29sIFJlbmRlckxheWVyQmFja2lu Zzo6aXNTaW1wbGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCkgY29uc3QKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9y KFJlbmRlckxheWVyJiBwYXJlbnQpCitlbnVtIGNsYXNzIExheWVyVHJhdmVyc2FsIHsgQ29udGlu dWUsIFN0b3AgfTsKKworc3RhdGljIExheWVyVHJhdmVyc2FsIHRyYXZlcnNlVmlzaWJsZU5vbkNv bXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKFJlbmRlckxheWVyJiBwYXJlbnQsIHN0ZDo6ZnVuY3Rp b248TGF5ZXJUcmF2ZXJzYWwgKGNvbnN0IFJlbmRlckxheWVyJik+IGxheWVyRnVuYykKIHsKICAg ICAvLyBGSVhNRTogV2Ugc2hvdWxkbid0IGJlIGNhbGxlZCB3aXRoIGEgc3RhbGUgei1vcmRlciBs aXN0cy4gU2VlIGJ1ZyA4NTUxMi4KICAgICBwYXJlbnQudXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVk KCk7CkBAIC0xOTU5LDM4ICsxOTYxLDczIEBAIHN0YXRpYyBib29sIGRlc2NlbmRhbnRMYXllclBh aW50c0ludG9BbmNlc3RvcihSZW5kZXJMYXllciYgcGFyZW50KQogCiAgICAgaWYgKGF1dG8qIG5v cm1hbEZsb3dMaXN0ID0gcGFyZW50Lm5vcm1hbEZsb3dMaXN0KCkpIHsKICAgICAgICAgZm9yIChh dXRvKiBjaGlsZExheWVyIDogKm5vcm1hbEZsb3dMaXN0KSB7Ci0gICAgICAgICAgICBpZiAoIWNv bXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExheWVyKSAmJiAoY2hpbGRMYXllci0+ aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9y KCpjaGlsZExheWVyKSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAg ICBpZiAoY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpKQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBpZiAobGF5ZXJGdW5jKCpjaGlsZExh eWVyKSA9PSBMYXllclRyYXZlcnNhbDo6U3RvcCkKKyAgICAgICAgICAgICAgICByZXR1cm4gTGF5 ZXJUcmF2ZXJzYWw6OlN0b3A7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlmICh0cmF2ZXJz ZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycygqY2hpbGRMYXllciwgbGF5ZXJG dW5jKSA9PSBMYXllclRyYXZlcnNhbDo6U3RvcCkKKyAgICAgICAgICAgICAgICByZXR1cm4gTGF5 ZXJUcmF2ZXJzYWw6OlN0b3A7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAocGFyZW50Lmlz U3RhY2tpbmdDb250YWluZXIoKSkgewogICAgICAgICBpZiAoIXBhcmVudC5oYXNWaXNpYmxlRGVz Y2VuZGFudCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICAgICAgcmV0dXJu IExheWVyVHJhdmVyc2FsOjpDb250aW51ZTsKIAogICAgICAgICAvLyBVc2UgdGhlIG1faGFzQ29t cG9zaXRpbmdEZXNjZW5kYW50IGJpdCB0byBvcHRpbWl6ZT8KICAgICAgICAgaWYgKGF1dG8qIG5l Z1pPcmRlckxpc3QgPSBwYXJlbnQubmVnWk9yZGVyTGlzdCgpKSB7CiAgICAgICAgICAgICBmb3Ig KGF1dG8qIGNoaWxkTGF5ZXIgOiAqbmVnWk9yZGVyTGlzdCkgewotICAgICAgICAgICAgICAgIGlm ICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpICYmIChjaGlsZExh eWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5j ZXN0b3IoKmNoaWxkTGF5ZXIpKSkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgICAgICAgICAgICAgaWYgKGNvbXBvc2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKCpjaGlsZExh eWVyKSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICBp ZiAobGF5ZXJGdW5jKCpjaGlsZExheWVyKSA9PSBMYXllclRyYXZlcnNhbDo6U3RvcCkKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIExheWVyVHJhdmVyc2FsOjpTdG9wOworCisgICAgICAgICAg ICAgICAgaWYgKHRyYXZlcnNlVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKCpj aGlsZExheWVyLCBsYXllckZ1bmMpID09IExheWVyVHJhdmVyc2FsOjpTdG9wKQorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OlN0b3A7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KIAogICAgICAgICBpZiAoYXV0byogcG9zWk9yZGVyTGlzdCA9IHBhcmVudC5wb3Na T3JkZXJMaXN0KCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0byogY2hpbGRMYXllciA6ICpwb3Na T3JkZXJMaXN0KSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFjb21wb3NpdGVkV2l0aE93bkJhY2tp bmdTdG9yZSgqY2hpbGRMYXllcikgJiYgKGNoaWxkTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgp IHx8IGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY2hpbGRMYXllcikpKQotICAg ICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgICAgICBpZiAoY29tcG9z aXRlZFdpdGhPd25CYWNraW5nU3RvcmUoKmNoaWxkTGF5ZXIpKQorICAgICAgICAgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICAgICAgICAgIGlmIChsYXllckZ1bmMoKmNoaWxkTGF5ZXIp ID09IExheWVyVHJhdmVyc2FsOjpTdG9wKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gTGF5 ZXJUcmF2ZXJzYWw6OlN0b3A7CisKKyAgICAgICAgICAgICAgICBpZiAodHJhdmVyc2VWaXNpYmxl Tm9uQ29tcG9zaXRlZERlc2NlbmRhbnRMYXllcnMoKmNoaWxkTGF5ZXIsIGxheWVyRnVuYykgPT0g TGF5ZXJUcmF2ZXJzYWw6OlN0b3ApCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBMYXllclRy YXZlcnNhbDo6U3RvcDsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAotICAgIHJl dHVybiBmYWxzZTsKKyAgICByZXR1cm4gTGF5ZXJUcmF2ZXJzYWw6OkNvbnRpbnVlOwogfQogCiAv LyBDb25zZXJ2YXRpdmUgdGVzdCBmb3IgaGF2aW5nIG5vIHJlbmRlcmVkIGNoaWxkcmVuLgogYm9v bCBSZW5kZXJMYXllckJhY2tpbmc6OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXll cnMoKSBjb25zdAogewotICAgIHJldHVybiBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5jZXN0 b3IobV9vd25pbmdMYXllcik7CisgICAgYm9vbCBoYXNQYWludGluZ0Rlc2NlbmRhbnQgPSBmYWxz ZTsKKyAgICB0cmF2ZXJzZVZpc2libGVOb25Db21wb3NpdGVkRGVzY2VuZGFudExheWVycyhtX293 bmluZ0xheWVyLCBbJmhhc1BhaW50aW5nRGVzY2VuZGFudF0oY29uc3QgUmVuZGVyTGF5ZXImIGxh eWVyKSB7CisgICAgICAgIGhhc1BhaW50aW5nRGVzY2VuZGFudCA9IGxheWVyLmlzVmlzdWFsbHlO b25FbXB0eSgpOworICAgICAgICByZXR1cm4gaGFzUGFpbnRpbmdEZXNjZW5kYW50ID8gTGF5ZXJU cmF2ZXJzYWw6OlN0b3AgOiBMYXllclRyYXZlcnNhbDo6Q29udGludWU7CisgICAgfSk7CisKKyAg ICByZXR1cm4gaGFzUGFpbnRpbmdEZXNjZW5kYW50OworfQorCitib29sIFJlbmRlckxheWVyQmFj a2luZzo6aGFzVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cygpIGNvbnN0Cit7CisgICAg Ym9vbCBoYXNWaXNpYmxlRGVzY2VuZGFudCA9IGZhbHNlOworICAgIHRyYXZlcnNlVmlzaWJsZU5v bkNvbXBvc2l0ZWREZXNjZW5kYW50TGF5ZXJzKG1fb3duaW5nTGF5ZXIsIFsmaGFzVmlzaWJsZURl c2NlbmRhbnRdKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikgeworICAgICAgICBoYXNWaXNpYmxl RGVzY2VuZGFudCA9IGxheWVyLmhhc1Zpc2libGVDb250ZW50KCk7CisgICAgICAgIHJldHVybiBo YXNWaXNpYmxlRGVzY2VuZGFudCA/IExheWVyVHJhdmVyc2FsOjpTdG9wIDogTGF5ZXJUcmF2ZXJz YWw6OkNvbnRpbnVlOworICAgIH0pOworCisgICAgcmV0dXJuIGhhc1Zpc2libGVEZXNjZW5kYW50 OwogfQogCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6Y29udGFpbnNQYWludGVkQ29udGVudChi b29sIGlzU2ltcGxlQ29udGFpbmVyKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQmFja2luZy5oCmluZGV4IDc3MDJlMTE4OGNhOTc3OTU2ZjJlYjYzNWU5ZWU0 ZjhhZTRiZDZmOGQuLmZmNzNlYTdjMWIxYjIwZWFmZjZmN2RmYmQyMGZhMmZkYmI5YjYyZTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTMy OSw2ICszMjksNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVzZXRDb250ZW50c1JlY3QoKTsKIAog ICAgIGJvb2wgaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycygpIGNvbnN0Owor ICAgIGJvb2wgaGFzVmlzaWJsZU5vbkNvbXBvc2l0ZWREZXNjZW5kYW50cygpIGNvbnN0OwogCiAg ICAgYm9vbCBzaG91bGRDbGlwQ29tcG9zaXRlZEJvdW5kcygpIGNvbnN0OwogCg==