97707 2012-09-26 11:13:16 -0700 [CSS Exclusions] Rename RenderStyle::wrapShapeInside/Outside to shapeInside/Outside 2012-09-27 12:23:28 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89256 1 betravis betravis cmarcelo donggwan.kim eric macpherson menard michelangelo webkit.review.bot oldest_to_newest 728766 0 betravis 2012-09-26 11:13:16 -0700 We have been removing the "wrap" prefix, so it makes sense to do it here as well. 729103 1 165905 betravis 2012-09-26 17:45:47 -0700 Created attachment 165905 Rename patch 729744 2 165905 koivisto 2012-09-27 11:47:53 -0700 Comment on attachment 165905 Rename patch r=me 729766 3 165905 webkit.review.bot 2012-09-27 12:23:24 -0700 Comment on attachment 165905 Rename patch Clearing flags on attachment: 165905 Committed r129787: <http://trac.webkit.org/changeset/129787> 729767 4 webkit.review.bot 2012-09-27 12:23:28 -0700 All reviewed patches have been landed. Closing bug. 165905 2012-09-26 17:45:47 -0700 2012-09-27 12:23:24 -0700 Rename patch bug-97707-20120926174506.patch text/plain 17712 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NzA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjI5YjJlMmNhMTk0ODhk YmMxNzgxNzczMzY0OGVhNTBhNDYyZTIxNi4uNWYxMjJhZDkxN2Y5MjAyNzc4MDlhMmM3NWEzODZl ZTljODRiYzdjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTA5LTI2ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIEV4Y2x1c2lvbnNd IFJlbmFtZSBSZW5kZXJTdHlsZTo6d3JhcFNoYXBlSW5zaWRlL091dHNpZGUgdG8gc2hhcGVJbnNp ZGUvT3V0c2lkZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTc3MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgZXhjbHVzaW9ucyBzcGVjaWZpY2F0aW9uIGhhcyByZW5hbWVkIHdyYXAtc2hhcGUtaW5z aWRlIGFuZCB3cmFwLXNoYXBlLW91dHNpZGUKKyAgICAgICAgdG8gc2hhcGUtaW5zaWRlIGFuZCBz aGFwZS1vdXRzaWRlLiBXZSBzaG91bGQgcmVuYW1lIHRoZSBnZXR0ZXIvc2V0dGVyIGZ1bmN0aW9u cworICAgICAgICBpbiBSZW5kZXJTdHlsZSwgYW5kIHVwZGF0ZSB0aGUgZGVyaXZlZCB2YXJpYWJs ZSBhbmQgZnVuY3Rpb24gbmFtZXMgYWNjb3JkaW5nbHkuCisgICAgICAgIEZvciBtb3JlIGluZm9y bWF0aW9uLCBzZWU6IGh0dHA6Ly9kZXYudzMub3JnL2Nzc3dnL2NzczMtZXhjbHVzaW9ucy8jZGVj bGFyaW5nLXNoYXBlcworCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuIE5vIG5l dyBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246 OmdldFByb3BlcnR5Q1NTVmFsdWUpOgorICAgICAgICAqIGNzcy9TdHlsZUJ1aWxkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUV4Y2x1c2lvblNoYXBlOjphcHBseVZhbHVl KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlcjo6U3R5bGVCdWlsZGVyKToKKyAgICAg ICAgKiByZW5kZXJpbmcvRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv Rm9yUmVuZGVyQmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6RXhjbHVzaW9uU2hhcGVJbnNpZGVJ bmZvOjppc0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0VuYWJsZWRGb3JSZW5kZXJCbG9jayk6Cisg ICAgICAgIChXZWJDb3JlOjpFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OnJlbW92ZUV4Y2x1c2lv blNoYXBlSW5zaWRlSW5mb0ZvclJlbmRlckJsb2NrKToKKyAgICAgICAgKFdlYkNvcmU6OkV4Y2x1 c2lvblNoYXBlSW5zaWRlSW5mbzo6Y29tcHV0ZVNoYXBlU2l6ZSk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpzdHls ZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6dXBkYXRlRXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvQWZ0ZXJTdHlsZUNoYW5nZSk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJsb2NrLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZXhjbHVzaW9u U2hhcGVJbnNpZGVJbmZvKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmRpZmYpOgorICAgICAgICAqIHJl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9T dHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmFy ZU5vbkluaGVyaXRlZERhdGE6OlN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEpOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YTo6b3BlcmF0b3I9PSk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpyZXBvcnRNZW1vcnlVc2FnZSk6 CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaDoK KyAgICAgICAgKFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEpOgorCiAyMDEyLTA5LTI2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmFtZSBQYWdl OjpmcmFtZUNvdW50KCkgdG8gc3ViZnJhbWVDb3VudCgpLCBhbmQgcmVsYXRlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBk MTBkNzM4YTMwOWY5MWE5YWM4NjQzMzNlNzg1MThkZTljNjE1NGY5Li41MjNmZGQ3MGViNTRhYWU4 YjU5MGNhNGMxNmYxMmYyYmU5NmQzZjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtMjQ0MywxMyArMjQ0MywxMyBAQCBQ YXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb246OmdldFByb3Bl cnR5Q1NTVmFsdWUoQ1NTUHJvcGVydAogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0V3Jh cFBhZGRpbmc6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUo c3R5bGUtPndyYXBQYWRkaW5nKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0U2hh cGVJbnNpZGU6Ci0gICAgICAgICAgICBpZiAoIXN0eWxlLT53cmFwU2hhcGVJbnNpZGUoKSkKKyAg ICAgICAgICAgIGlmICghc3R5bGUtPnNoYXBlSW5zaWRlKCkpCiAgICAgICAgICAgICAgICAgcmV0 dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUF1dG8pOwot ICAgICAgICAgICAgcmV0dXJuIHZhbHVlRm9yQmFzaWNTaGFwZShzdHlsZS0+d3JhcFNoYXBlSW5z aWRlKCkpOworICAgICAgICAgICAgcmV0dXJuIHZhbHVlRm9yQmFzaWNTaGFwZShzdHlsZS0+c2hh cGVJbnNpZGUoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGU6 Ci0gICAgICAgICAgICBpZiAoIXN0eWxlLT53cmFwU2hhcGVPdXRzaWRlKCkpCisgICAgICAgICAg ICBpZiAoIXN0eWxlLT5zaGFwZU91dHNpZGUoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3Nz VmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlQXV0byk7Ci0gICAgICAg ICAgICByZXR1cm4gdmFsdWVGb3JCYXNpY1NoYXBlKHN0eWxlLT53cmFwU2hhcGVPdXRzaWRlKCkp OworICAgICAgICAgICAgcmV0dXJuIHZhbHVlRm9yQmFzaWNTaGFwZShzdHlsZS0+c2hhcGVPdXRz aWRlKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0V3JhcFRocm91Z2g6CiAgICAg ICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPndyYXBUaHJv dWdoKCkpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWls ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDA5YzI3 YjcxNzlmYzI0MjQzNGQ1YjQ2MGZkYzhmYzdiYmE0MTk3ZGEuLjEyZTA3Y2QyMWY4ODI4MDcyNjg0 Mjg3MjA3NzRlYzE0MDUwYzhiNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXIuY3BwCkBA IC0xNzA5LDcgKzE3MDksNyBAQCBwdWJsaWM6CiAKICNpZiBFTkFCTEUoQ1NTX0VYQ0xVU0lPTlMp CiB0ZW1wbGF0ZSA8QmFzaWNTaGFwZSogKFJlbmRlclN0eWxlOjoqZ2V0dGVyRnVuY3Rpb24pKCkg Y29uc3QsIHZvaWQgKFJlbmRlclN0eWxlOjoqc2V0dGVyRnVuY3Rpb24pKFBhc3NSZWZQdHI8QmFz aWNTaGFwZT4pLCBCYXNpY1NoYXBlKiAoKmluaXRpYWxGdW5jdGlvbikoKT4KLWNsYXNzIEFwcGx5 UHJvcGVydHlXcmFwU2hhcGUgeworY2xhc3MgQXBwbHlQcm9wZXJ0eUV4Y2x1c2lvblNoYXBlIHsK IHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBzZXRWYWx1ZShSZW5kZXJTdHlsZSogc3R5bGUsIFBh c3NSZWZQdHI8QmFzaWNTaGFwZT4gdmFsdWUpIHsgKHN0eWxlLT4qc2V0dGVyRnVuY3Rpb24pKHZh bHVlKTsgfQogICAgIHN0YXRpYyB2b2lkIGFwcGx5VmFsdWUoQ1NTUHJvcGVydHlJRCwgU3R5bGVS ZXNvbHZlciogc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUqIHZhbHVlKQpAQCAtMTcxOSw4ICsxNzE5 LDggQEAgcHVibGljOgogICAgICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgp ID09IENTU1ZhbHVlQXV0bykKICAgICAgICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVy LT5zdHlsZSgpLCAwKTsKICAgICAgICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc1No YXBlKCkpIHsKLSAgICAgICAgICAgICAgICBSZWZQdHI8QmFzaWNTaGFwZT4gd3JhcFNoYXBlID0g YmFzaWNTaGFwZUZvclZhbHVlKHN0eWxlUmVzb2x2ZXIsIHByaW1pdGl2ZVZhbHVlLT5nZXRTaGFw ZVZhbHVlKCkpOwotICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxl KCksIHdyYXBTaGFwZS5yZWxlYXNlKCkpOworICAgICAgICAgICAgICAgIFJlZlB0cjxCYXNpY1No YXBlPiBzaGFwZSA9IGJhc2ljU2hhcGVGb3JWYWx1ZShzdHlsZVJlc29sdmVyLCBwcmltaXRpdmVW YWx1ZS0+Z2V0U2hhcGVWYWx1ZSgpKTsKKyAgICAgICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJl c29sdmVyLT5zdHlsZSgpLCBzaGFwZS5yZWxlYXNlKCkpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQpAQCAtMjA2MCw4ICsyMDYwLDggQEAgU3R5bGVCdWlsZGVyOjpTdHlsZUJ1aWxk ZXIoKQogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFdyYXBNYXJnaW4s IEFwcGx5UHJvcGVydHlMZW5ndGg8JlJlbmRlclN0eWxlOjp3cmFwTWFyZ2luLCAmUmVuZGVyU3R5 bGU6OnNldFdyYXBNYXJnaW4sICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBNYXJnaW4+OjpjcmVh dGVIYW5kbGVyKCkpOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFdy YXBQYWRkaW5nLCBBcHBseVByb3BlcnR5TGVuZ3RoPCZSZW5kZXJTdHlsZTo6d3JhcFBhZGRpbmcs ICZSZW5kZXJTdHlsZTo6c2V0V3JhcFBhZGRpbmcsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBQ YWRkaW5nPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRXcmFwVGhyb3VnaCwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8V3JhcFRocm91Z2gs ICZSZW5kZXJTdHlsZTo6d3JhcFRocm91Z2gsIFdyYXBUaHJvdWdoLCAmUmVuZGVyU3R5bGU6OnNl dFdyYXBUaHJvdWdoLCBXcmFwVGhyb3VnaCwgJlJlbmRlclN0eWxlOjppbml0aWFsV3JhcFRocm91 Z2g+OjpjcmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVdlYmtpdFNoYXBlSW5zaWRlLCBBcHBseVByb3BlcnR5V3JhcFNoYXBlPCZSZW5kZXJTdHlsZTo6 d3JhcFNoYXBlSW5zaWRlLCAmUmVuZGVyU3R5bGU6OnNldFdyYXBTaGFwZUluc2lkZSwgJlJlbmRl clN0eWxlOjppbml0aWFsV3JhcFNoYXBlSW5zaWRlPjo6Y3JlYXRlSGFuZGxlcigpKTsKLSAgICBz ZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRTaGFwZU91dHNpZGUsIEFwcGx5UHJv cGVydHlXcmFwU2hhcGU8JlJlbmRlclN0eWxlOjp3cmFwU2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5 bGU6OnNldFdyYXBTaGFwZU91dHNpZGUsICZSZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBTaGFwZU91 dHNpZGU+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9w ZXJ0eVdlYmtpdFNoYXBlSW5zaWRlLCBBcHBseVByb3BlcnR5RXhjbHVzaW9uU2hhcGU8JlJlbmRl clN0eWxlOjpzaGFwZUluc2lkZSwgJlJlbmRlclN0eWxlOjpzZXRTaGFwZUluc2lkZSwgJlJlbmRl clN0eWxlOjppbml0aWFsU2hhcGVJbnNpZGU+OjpjcmVhdGVIYW5kbGVyKCkpOworICAgIHNldFBy b3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdFNoYXBlT3V0c2lkZSwgQXBwbHlQcm9wZXJ0 eUV4Y2x1c2lvblNoYXBlPCZSZW5kZXJTdHlsZTo6c2hhcGVPdXRzaWRlLCAmUmVuZGVyU3R5bGU6 OnNldFNoYXBlT3V0c2lkZSwgJlJlbmRlclN0eWxlOjppbml0aWFsU2hhcGVPdXRzaWRlPjo6Y3Jl YXRlSGFuZGxlcigpKTsKICNlbmRpZgogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVdoaXRlU3BhY2UsIEFwcGx5UHJvcGVydHlEZWZhdWx0PEVXaGl0ZVNwYWNlLCAmUmVuZGVyU3R5 bGU6OndoaXRlU3BhY2UsIEVXaGl0ZVNwYWNlLCAmUmVuZGVyU3R5bGU6OnNldFdoaXRlU3BhY2Us IEVXaGl0ZVNwYWNlLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxXaGl0ZVNwYWNlPjo6Y3JlYXRlSGFu ZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXaWRvd3MsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PHNob3J0LCAmUmVuZGVyU3R5bGU6OndpZG93cywgc2hvcnQsICZSZW5k ZXJTdHlsZTo6c2V0V2lkb3dzLCBzaG9ydCwgJlJlbmRlclN0eWxlOjppbml0aWFsV2lkb3dzPjo6 Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9F eGNsdXNpb25TaGFwZUluc2lkZUluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4 Y2x1c2lvblNoYXBlSW5zaWRlSW5mby5jcHAKaW5kZXggMjAwZGFhNmFlYTcyNTJiOGJjODk2NmMx YjI0ZWQxMDRhYTIxMjM2OS4uZTBkNmQxOTkzMWU4NGU2YTg0NjA4NmEzMTVmNTZmZDlmMDZlZWIw MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBlSW5z aWRlSW5mby5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0V4Y2x1c2lvblNoYXBl SW5zaWRlSW5mby5jcHAKQEAgLTY1LDIwICs2NSwyMCBAQCBFeGNsdXNpb25TaGFwZUluc2lkZUlu Zm8qIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6ZW5zdXJlRXhjbHVzaW9uU2hhcGVJbnNpZGVJ bgogCiBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6 ZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvRm9yUmVuZGVyQmxvY2soY29uc3QgUmVuZGVyQmxvY2sq IGJsb2NrKQogewotICAgIEFTU0VSVChibG9jay0+c3R5bGUoKS0+d3JhcFNoYXBlSW5zaWRlKCkp OworICAgIEFTU0VSVChibG9jay0+c3R5bGUoKS0+c2hhcGVJbnNpZGUoKSk7CiAgICAgcmV0dXJu IGV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb01hcCgpLmdldChibG9jayk7CiB9CiAKIGJvb2wgRXhj bHVzaW9uU2hhcGVJbnNpZGVJbmZvOjppc0V4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0VuYWJsZWRG b3JSZW5kZXJCbG9jayhjb25zdCBSZW5kZXJCbG9jayogYmxvY2spCiB7CiAgICAgLy8gRklYTUU6 IEJ1ZyA4OTcwNzogRW5hYmxlIHNoYXBlIGluc2lkZSBmb3Igbm9uLXJlY3Rhbmd1bGFyIHNoYXBl cwotICAgIEJhc2ljU2hhcGUqIHNoYXBlID0gYmxvY2stPnN0eWxlKCktPndyYXBTaGFwZUluc2lk ZSgpOworICAgIEJhc2ljU2hhcGUqIHNoYXBlID0gYmxvY2stPnN0eWxlKCktPnNoYXBlSW5zaWRl KCk7CiAgICAgcmV0dXJuIChzaGFwZSAmJiBzaGFwZS0+dHlwZSgpID09IEJhc2ljU2hhcGU6OkJB U0lDX1NIQVBFX1JFQ1RBTkdMRSk7CiB9CiAKIHZvaWQgRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZv OjpyZW1vdmVFeGNsdXNpb25TaGFwZUluc2lkZUluZm9Gb3JSZW5kZXJCbG9jayhjb25zdCBSZW5k ZXJCbG9jayogYmxvY2spCiB7Ci0gICAgaWYgKCFibG9jay0+c3R5bGUoKSB8fCAhYmxvY2stPnN0 eWxlKCktPndyYXBTaGFwZUluc2lkZSgpKQorICAgIGlmICghYmxvY2stPnN0eWxlKCkgfHwgIWJs b2NrLT5zdHlsZSgpLT5zaGFwZUluc2lkZSgpKQogICAgICAgICByZXR1cm47CiAgICAgZXhjbHVz aW9uU2hhcGVJbnNpZGVJbmZvTWFwKCkucmVtb3ZlKGJsb2NrKTsKIH0KQEAgLTkzLDcgKzkzLDcg QEAgdm9pZCBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86OmNvbXB1dGVTaGFwZVNpemUoTGF5b3V0 VW5pdCBsb2dpY2FsV2lkdGgsIExheW91dFUKICAgICBtX2xvZ2ljYWxIZWlnaHQgPSBsb2dpY2Fs SGVpZ2h0OwogCiAgICAgLy8gRklYTUU6IEJ1ZyA4OTk5MzogVGhlIHdyYXAgc2hhcGUgbWF5IGNv bWUgZnJvbSB0aGUgcGFyZW50IG9iamVjdAotICAgIEJhc2ljU2hhcGUqIHNoYXBlID0gbV9ibG9j ay0+c3R5bGUoKS0+d3JhcFNoYXBlSW5zaWRlKCk7CisgICAgQmFzaWNTaGFwZSogc2hhcGUgPSBt X2Jsb2NrLT5zdHlsZSgpLT5zaGFwZUluc2lkZSgpOwogICAgIEFTU0VSVChzaGFwZSk7CiAKICAg ICBtX3NoYXBlID0gRXhjbHVzaW9uU2hhcGU6OmNyZWF0ZUV4Y2x1c2lvblNoYXBlKHNoYXBlLCBs b2dpY2FsV2lkdGgsIGxvZ2ljYWxIZWlnaHQsIG1fYmxvY2stPnN0eWxlKCktPndyaXRpbmdNb2Rl KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggZjczYjcx NjMwOTRjMzFhYjBjZmRlOTIwNWYwY2VjYWYyYmM1OWFkYS4uZGQxNzFhODU2ZDdhYTY5MjZiNzc1 ZDdkNTZlNjExZTA3OWEyOWRlNCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2suY3BwCkBAIC0zMzAsNyArMzMwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6c3R5bGVEaWRDaGFu Z2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHkKICNpZiBF TkFCTEUoQ1NTX0VYQ0xVU0lPTlMpCiAgICAgLy8gRklYTUU6IEJ1ZyA4OTk5MzogU3R5bGUgY2hh bmdlcyBzaG91bGQgYWZmZWN0IHRoZSBFeGNsdXNpb25TaGFwZUluc2lkZUluZm9zIGZvciBvdGhl ciByZW5kZXIgYmxvY2tzIHRoYXQKICAgICAvLyBzaGFyZSB0aGUgc2FtZSBFeGNsdXNpb25TaGFw ZUluc2lkZUluZm8KLSAgICB1cGRhdGVFeGNsdXNpb25TaGFwZUluc2lkZUluZm9BZnRlclN0eWxl Q2hhbmdlKHN0eWxlKCktPndyYXBTaGFwZUluc2lkZSgpLCBvbGRTdHlsZSA/IG9sZFN0eWxlLT53 cmFwU2hhcGVJbnNpZGUoKSA6IDApOworICAgIHVwZGF0ZUV4Y2x1c2lvblNoYXBlSW5zaWRlSW5m b0FmdGVyU3R5bGVDaGFuZ2Uoc3R5bGUoKS0+c2hhcGVJbnNpZGUoKSwgb2xkU3R5bGUgPyBvbGRT dHlsZS0+c2hhcGVJbnNpZGUoKSA6IDApOwogI2VuZGlmCiAKICAgICBpZiAoIWlzQW5vbnltb3Vz QmxvY2soKSkgewpAQCAtMTM4MCwxMyArMTM4MCwxMyBAQCB2b2lkIFJlbmRlckJsb2NrOjpsYXlv dXQoKQogfQogCiAjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQotdm9pZCBSZW5kZXJCbG9jazo6 dXBkYXRlRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvQWZ0ZXJTdHlsZUNoYW5nZShjb25zdCBCYXNp Y1NoYXBlKiB3cmFwU2hhcGUsIGNvbnN0IEJhc2ljU2hhcGUqIG9sZFdyYXBTaGFwZSkKK3ZvaWQg UmVuZGVyQmxvY2s6OnVwZGF0ZUV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0FmdGVyU3R5bGVDaGFu Z2UoY29uc3QgQmFzaWNTaGFwZSogc2hhcGVJbnNpZGUsIGNvbnN0IEJhc2ljU2hhcGUqIG9sZFNo YXBlSW5zaWRlKQogewogICAgIC8vIEZJWE1FOiBBIGZ1dHVyZSBvcHRpbWl6YXRpb24gd291bGQg ZG8gYSBkZWVwIGNvbXBhcmlzb24gZm9yIGVxdWFsaXR5LgotICAgIGlmICh3cmFwU2hhcGUgPT0g b2xkV3JhcFNoYXBlKQorICAgIGlmIChzaGFwZUluc2lkZSA9PSBvbGRTaGFwZUluc2lkZSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHdyYXBTaGFwZSkgeworICAgIGlmIChzaGFwZUluc2lk ZSkgewogICAgICAgICBFeGNsdXNpb25TaGFwZUluc2lkZUluZm8qIGV4Y2x1c2lvblNoYXBlSW5z aWRlSW5mbyA9IEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6ZW5zdXJlRXhjbHVzaW9uU2hhcGVJ bnNpZGVJbmZvRm9yUmVuZGVyQmxvY2sodGhpcyk7CiAgICAgICAgIGV4Y2x1c2lvblNoYXBlSW5z aWRlSW5mby0+ZGlydHlTaGFwZVNpemUoKTsKICAgICB9IGVsc2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmgKaW5kZXggOTQ3MDM5OTY4NDVjOGRiNDRiM2VlNmIxNTJlNjliN2Ni M2FkNzM4Ni4uZjM3NjdjNmI2NDYwNTRiMWIxNTVjMThhMTRjZDQ2N2I2ZTAyNjgwOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKQEAgLTQwNCw3ICs0MDQsNyBAQCBwdWJs aWM6CiAjaWYgRU5BQkxFKENTU19FWENMVVNJT05TKQogICAgIEV4Y2x1c2lvblNoYXBlSW5zaWRl SW5mbyogZXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvKCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJl dHVybiBzdHlsZSgpLT53cmFwU2hhcGVJbnNpZGUoKSAmJiBFeGNsdXNpb25TaGFwZUluc2lkZUlu Zm86OmlzRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvRW5hYmxlZEZvclJlbmRlckJsb2NrKHRoaXMp ID8gRXhjbHVzaW9uU2hhcGVJbnNpZGVJbmZvOjpleGNsdXNpb25TaGFwZUluc2lkZUluZm9Gb3JS ZW5kZXJCbG9jayh0aGlzKSA6IDA7CisgICAgICAgIHJldHVybiBzdHlsZSgpLT5zaGFwZUluc2lk ZSgpICYmIEV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mbzo6aXNFeGNsdXNpb25TaGFwZUluc2lkZUlu Zm9FbmFibGVkRm9yUmVuZGVyQmxvY2sodGhpcykgPyBFeGNsdXNpb25TaGFwZUluc2lkZUluZm86 OmV4Y2x1c2lvblNoYXBlSW5zaWRlSW5mb0ZvclJlbmRlckJsb2NrKHRoaXMpIDogMDsKICAgICB9 CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5jcHAKaW5kZXggNjNkNWUwNTUwNzFlZWFlOWQ3MjBjZjEwYzY1MTZjMGRhNDY1ZTE0Ny4uNzdm NWNmZGIzY2Y2ZGMxY2RlYmM3ZTUzOGU2NDgzMGRkMmFlMDUxZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCkBAIC00NTgsNyArNDU4LDcgQEAg U3R5bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0IFJlbmRlclN0eWxlKiBvdGhl ciwgdW5zaWduZWQmIGNoYW5nZWRDb24KICNlbmRpZgogCiAjaWYgRU5BQkxFKENTU19FWENMVVNJ T05TKQotICAgICAgICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fd3JhcFNoYXBlSW5zaWRl ICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV93cmFwU2hhcGVJbnNpZGUpCisgICAg ICAgIGlmIChyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9zaGFwZUluc2lkZSAhPSBvdGhlci0+cmFy ZU5vbkluaGVyaXRlZERhdGEtPm1fc2hhcGVJbnNpZGUpCiAgICAgICAgICAgICByZXR1cm4gU3R5 bGVEaWZmZXJlbmNlTGF5b3V0OwogI2VuZGlmCiAgICAgfQpAQCAtNjc5LDcgKzY3OSw3IEBAIFN0 eWxlRGlmZmVyZW5jZSBSZW5kZXJTdHlsZTo6ZGlmZihjb25zdCBSZW5kZXJTdHlsZSogb3RoZXIs IHVuc2lnbmVkJiBjaGFuZ2VkQ29uCiAgICAgICAgIC8vIHRoZSBwYXJlbnQgY29udGFpbmVyLiBG b3Igc3VyZSwgSSB3aWxsIGhhdmUgdG8gcmV2aXNpdCB0aGlzIGNvZGUsIGJ1dCBmb3Igbm93IEkn dmUgYWRkZWQgdGhpcyBpbiBvcmRlciAKICAgICAgICAgLy8gdG8gYXZvaWQgaGF2aW5nIGRpZmYo KSA9PSBTdHlsZURpZmZlcmVuY2VFcXVhbCB3aGVyZSB3cmFwLXNoYXBlcyBhY3R1YWxseSBkaWZm ZXIuCiAgICAgICAgIC8vIFRyYWNraW5nIGJ1ZzogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTYyOTkxCi0gICAgICAgIGlmIChyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV93 cmFwU2hhcGVPdXRzaWRlICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV93cmFwU2hh cGVPdXRzaWRlKQorICAgICAgICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fc2hhcGVPdXRz aWRlICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9zaGFwZU91dHNpZGUpCiAgICAg ICAgICAgICByZXR1cm4gU3R5bGVEaWZmZXJlbmNlUmVwYWludDsKIAogICAgICAgICBpZiAocmFy ZU5vbkluaGVyaXRlZERhdGEtPm1fY2xpcFBhdGggIT0gb3RoZXItPnJhcmVOb25Jbmhlcml0ZWRE YXRhLT5tX2NsaXBQYXRoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0 eWxlL1JlbmRlclN0eWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGUuaAppbmRleCA3YmNiMzhlYjQ4NGUyYjVkZjQ5ZGY0MjAwMWQ4YWM4ZDljZmFiMzdlLi45 OTcwODM4ZjdhZjEyYjM3ZTIyYzkyZTk2MGJhMzdkMTZiNTY0NjkyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaApAQCAtMTQ0NSwyMiArMTQ0NSwyMiBA QCBwdWJsaWM6CiAgICAgdm9pZCBzZXRLZXJuaW5nKFNWR0xlbmd0aCBrKSB7IGFjY2Vzc1NWR1N0 eWxlKCktPnNldEtlcm5pbmcoayk7IH0KICNlbmRpZgogCi0gICAgdm9pZCBzZXRXcmFwU2hhcGVJ bnNpZGUoUGFzc1JlZlB0cjxCYXNpY1NoYXBlPiBzaGFwZSkKKyAgICB2b2lkIHNldFNoYXBlSW5z aWRlKFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gc2hhcGUpCiAgICAgewotICAgICAgICBpZiAocmFy ZU5vbkluaGVyaXRlZERhdGEtPm1fd3JhcFNoYXBlSW5zaWRlICE9IHNoYXBlKQotICAgICAgICAg ICAgcmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fd3JhcFNoYXBlSW5zaWRlID0gc2hh cGU7CisgICAgICAgIGlmIChyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9zaGFwZUluc2lkZSAhPSBz aGFwZSkKKyAgICAgICAgICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX3NoYXBl SW5zaWRlID0gc2hhcGU7CiAgICAgfQotICAgIEJhc2ljU2hhcGUqIHdyYXBTaGFwZUluc2lkZSgp IGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3dyYXBTaGFwZUluc2lkZS5n ZXQoKTsgfQorICAgIEJhc2ljU2hhcGUqIHNoYXBlSW5zaWRlKCkgY29uc3QgeyByZXR1cm4gcmFy ZU5vbkluaGVyaXRlZERhdGEtPm1fc2hhcGVJbnNpZGUuZ2V0KCk7IH0KIAotICAgIHZvaWQgc2V0 V3JhcFNoYXBlT3V0c2lkZShQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IHNoYXBlKQorICAgIHZvaWQg c2V0U2hhcGVPdXRzaWRlKFBhc3NSZWZQdHI8QmFzaWNTaGFwZT4gc2hhcGUpCiAgICAgewotICAg ICAgICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fd3JhcFNoYXBlT3V0c2lkZSAhPSBzaGFw ZSkKLSAgICAgICAgICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX3dyYXBTaGFw ZU91dHNpZGUgPSBzaGFwZTsKKyAgICAgICAgaWYgKHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3No YXBlT3V0c2lkZSAhPSBzaGFwZSkKKyAgICAgICAgICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFj Y2VzcygpLT5tX3NoYXBlT3V0c2lkZSA9IHNoYXBlOwogICAgIH0KLSAgICBCYXNpY1NoYXBlKiB3 cmFwU2hhcGVPdXRzaWRlKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1f d3JhcFNoYXBlT3V0c2lkZS5nZXQoKTsgfQorICAgIEJhc2ljU2hhcGUqIHNoYXBlT3V0c2lkZSgp IGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX3NoYXBlT3V0c2lkZS5nZXQo KTsgfQogCi0gICAgc3RhdGljIEJhc2ljU2hhcGUqIGluaXRpYWxXcmFwU2hhcGVJbnNpZGUoKSB7 IHJldHVybiAwOyB9Ci0gICAgc3RhdGljIEJhc2ljU2hhcGUqIGluaXRpYWxXcmFwU2hhcGVPdXRz aWRlKCkgeyByZXR1cm4gMDsgfQorICAgIHN0YXRpYyBCYXNpY1NoYXBlKiBpbml0aWFsU2hhcGVJ bnNpZGUoKSB7IHJldHVybiAwOyB9CisgICAgc3RhdGljIEJhc2ljU2hhcGUqIGluaXRpYWxTaGFw ZU91dHNpZGUoKSB7IHJldHVybiAwOyB9CiAKICAgICB2b2lkIHNldENsaXBQYXRoKFBhc3NSZWZQ dHI8Q2xpcFBhdGhPcGVyYXRpb24+IG9wZXJhdGlvbikKICAgICB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0 YS5jcHAKaW5kZXggZmY1YzI4ZDljMjZjMjY0N2RkMmVhOTE0NWE5NTQxMDk5ODM2NzA4OC4uMjI0 MjVmMGQ1NzJiZDI3YjMzMDJmZTE3NTE4MjBkNDg5ODRlMzk0NyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWRE YXRhLmNwcApAQCAtNDUsOCArNDUsOCBAQCBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpTdHls ZVJhcmVOb25Jbmhlcml0ZWREYXRhKCkKICAgICAsIGxpbmVDbGFtcChSZW5kZXJTdHlsZTo6aW5p dGlhbExpbmVDbGFtcCgpKQogICAgICwgbV9tYXNrKEZpbGxMYXllcihNYXNrRmlsbExheWVyKSkK ICAgICAsIG1fcGFnZVNpemUoKQotICAgICwgbV93cmFwU2hhcGVJbnNpZGUoUmVuZGVyU3R5bGU6 OmluaXRpYWxXcmFwU2hhcGVJbnNpZGUoKSkKLSAgICAsIG1fd3JhcFNoYXBlT3V0c2lkZShSZW5k ZXJTdHlsZTo6aW5pdGlhbFdyYXBTaGFwZU91dHNpZGUoKSkKKyAgICAsIG1fc2hhcGVJbnNpZGUo UmVuZGVyU3R5bGU6OmluaXRpYWxTaGFwZUluc2lkZSgpKQorICAgICwgbV9zaGFwZU91dHNpZGUo UmVuZGVyU3R5bGU6OmluaXRpYWxTaGFwZU91dHNpZGUoKSkKICAgICAsIG1fd3JhcE1hcmdpbihS ZW5kZXJTdHlsZTo6aW5pdGlhbFdyYXBNYXJnaW4oKSkKICAgICAsIG1fd3JhcFBhZGRpbmcoUmVu ZGVyU3R5bGU6OmluaXRpYWxXcmFwUGFkZGluZygpKQogICAgICwgbV9jbGlwUGF0aChSZW5kZXJT dHlsZTo6aW5pdGlhbENsaXBQYXRoKCkpCkBAIC0xMTYsOCArMTE2LDggQEAgU3R5bGVSYXJlTm9u SW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YShjb25zdCBTdHlsZVJhcmVO b25Jbmhlcml0ZWQKICAgICAsIG1fbWFzayhvLm1fbWFzaykKICAgICAsIG1fbWFza0JveEltYWdl KG8ubV9tYXNrQm94SW1hZ2UpCiAgICAgLCBtX3BhZ2VTaXplKG8ubV9wYWdlU2l6ZSkKLSAgICAs IG1fd3JhcFNoYXBlSW5zaWRlKG8ubV93cmFwU2hhcGVJbnNpZGUpCi0gICAgLCBtX3dyYXBTaGFw ZU91dHNpZGUoby5tX3dyYXBTaGFwZU91dHNpZGUpCisgICAgLCBtX3NoYXBlSW5zaWRlKG8ubV9z aGFwZUluc2lkZSkKKyAgICAsIG1fc2hhcGVPdXRzaWRlKG8ubV9zaGFwZU91dHNpZGUpCiAgICAg LCBtX3dyYXBNYXJnaW4oby5tX3dyYXBNYXJnaW4pCiAgICAgLCBtX3dyYXBQYWRkaW5nKG8ubV93 cmFwUGFkZGluZykKICAgICAsIG1fY2xpcFBhdGgoby5tX2NsaXBQYXRoKQpAQCAtMTk4LDggKzE5 OCw4IEBAIGJvb2wgU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YTo6b3BlcmF0b3I9PShjb25zdCBT dHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhJiBvKSBjCiAgICAgICAgICYmIG1fbWFzayA9PSBvLm1f bWFzawogICAgICAgICAmJiBtX21hc2tCb3hJbWFnZSA9PSBvLm1fbWFza0JveEltYWdlCiAgICAg ICAgICYmIG1fcGFnZVNpemUgPT0gby5tX3BhZ2VTaXplCi0gICAgICAgICYmIG1fd3JhcFNoYXBl SW5zaWRlID09IG8ubV93cmFwU2hhcGVJbnNpZGUKLSAgICAgICAgJiYgbV93cmFwU2hhcGVPdXRz aWRlID09IG8ubV93cmFwU2hhcGVPdXRzaWRlCisgICAgICAgICYmIG1fc2hhcGVJbnNpZGUgPT0g by5tX3NoYXBlSW5zaWRlCisgICAgICAgICYmIG1fc2hhcGVPdXRzaWRlID09IG8ubV9zaGFwZU91 dHNpZGUKICAgICAgICAgJiYgbV93cmFwTWFyZ2luID09IG8ubV93cmFwTWFyZ2luCiAgICAgICAg ICYmIG1fd3JhcFBhZGRpbmcgPT0gby5tX3dyYXBQYWRkaW5nCiAgICAgICAgICYmIG1fY2xpcFBh dGggPT0gby5tX2NsaXBQYXRoCkBAIC0zMjUsOCArMzI1LDggQEAgdm9pZCBTdHlsZVJhcmVOb25J bmhlcml0ZWREYXRhOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlP YmplY3QKICAgICBpbmZvLmFkZE1lbWJlcihtX2JveFJlZmxlY3QpOwogICAgIGluZm8uYWRkTWVt YmVyKG1fYW5pbWF0aW9ucyk7CiAgICAgaW5mby5hZGRNZW1iZXIobV90cmFuc2l0aW9ucyk7Ci0g ICAgaW5mby5hZGRNZW1iZXIobV93cmFwU2hhcGVJbnNpZGUpOwotICAgIGluZm8uYWRkTWVtYmVy KG1fd3JhcFNoYXBlT3V0c2lkZSk7CisgICAgaW5mby5hZGRNZW1iZXIobV9zaGFwZUluc2lkZSk7 CisgICAgaW5mby5hZGRNZW1iZXIobV9zaGFwZU91dHNpZGUpOwogICAgIGluZm8uYWRkTWVtYmVy KG1fY2xpcFBhdGgpOwogICAgIGluZm8uYWRkTWVtYmVyKG1fZmxvd1RocmVhZCk7CiAgICAgaW5m by5hZGRNZW1iZXIobV9yZWdpb25UaHJlYWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgKaW5kZXggNDFi ODQwN2UwNzYzNWYzOGVhNDg3NzFiZWNmN2Q0ZGViY2RjN2NiOC4uMDU5NGRmYmQ5YmU5NjE1YTI5 YzE2YjFjZWVkOThlZWI1MWQ5NTlkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5oCkBAIC0xMzQsOCAr MTM0LDggQEAgcHVibGljOgogCiAgICAgTGVuZ3RoU2l6ZSBtX3BhZ2VTaXplOwogCi0gICAgUmVm UHRyPEJhc2ljU2hhcGU+IG1fd3JhcFNoYXBlSW5zaWRlOwotICAgIFJlZlB0cjxCYXNpY1NoYXBl PiBtX3dyYXBTaGFwZU91dHNpZGU7CisgICAgUmVmUHRyPEJhc2ljU2hhcGU+IG1fc2hhcGVJbnNp ZGU7CisgICAgUmVmUHRyPEJhc2ljU2hhcGU+IG1fc2hhcGVPdXRzaWRlOwogICAgIExlbmd0aCBt X3dyYXBNYXJnaW47CiAgICAgTGVuZ3RoIG1fd3JhcFBhZGRpbmc7CiAK