203471 2019-10-27 11:05:53 -0700 Move resolving direction and writing mode to PropertyCascade 2019-10-27 15:13:18 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned allan.jensen commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard webkit-bug-importer zalan oldest_to_newest 1584310 0 koivisto 2019-10-27 11:05:53 -0700 From StyleResolver 1584311 1 382027 koivisto 2019-10-27 11:11:13 -0700 Created attachment 382027 patch 1584349 2 commit-queue 2019-10-27 15:11:41 -0700 The commit-queue encountered the following flaky tests while processing attachment 382027: imported/w3c/web-platform-tests/css/css-position/position-absolute-container-dynamic-002.html bug 203473 (author: simon.fraser@apple.com) imported/w3c/web-platform-tests/css/css-position/position-absolute-crash-chrome-005.html bug 203474 (author: simon.fraser@apple.com) imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/integrity.html bug 203394 (author: ysuzuki@apple.com) The commit-queue is continuing to process your patch. 1584350 3 382027 commit-queue 2019-10-27 15:12:27 -0700 Comment on attachment 382027 patch Clearing flags on attachment: 382027 Committed r251644: <https://trac.webkit.org/changeset/251644> 1584351 4 commit-queue 2019-10-27 15:12:29 -0700 All reviewed patches have been landed. Closing bug. 1584352 5 webkit-bug-importer 2019-10-27 15:13:18 -0700 <rdar://problem/56655910> 382027 2019-10-27 11:11:13 -0700 2019-10-27 15:12:27 -0700 patch propertycascade-direction-writingmode.patch text/plain 14367 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZDk3ODdlNzlkMC4uYTI3ZWVmMGExOTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMyBAQAorMjAxOS0xMC0yNyAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CisKKyAgICAgICAgTW92ZSByZXNvbHZpbmcgZGlyZWN0aW9uIGFuZCB3cml0aW5nIG1vZGUgdG8g UHJvcGVydHlDYXNjYWRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDM0NzEKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2ltcGxpZnkgUHJvcGVydHlDYXNjYWRlIGNhbGwgc2l0ZXMuCisKKyAgICAgICAgKiBj c3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpz dHlsZUZvcktleWZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OnN0eWxl Rm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjphcHBseU1hdGNoZWRQ cm9wZXJ0aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVy dHlUb0N1cnJlbnRTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpleHRyYWN0RGlyZWN0aW9uQW5k V3JpdGluZ01vZGUpOiBEZWxldGVkLgorICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2FzY2FkZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eUNh c2NhZGUpOgorCisgICAgICAgIEFkZCBjb3B5aW5nIGNvbnN0cnVjdG9yIHRoYXQgYXZvaWRzIHJl LXJlc29sdmluZyBkaXJlY3Rpb25zLgorCisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVy dHlDYXNjYWRlOjpidWlsZENhc2NhZGUpOgorCisgICAgICAgIEZhY3RvciBpbnRvIGEgZnVuY3Rp b24uCisKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNhc2NhZGU6OnByb3BlcnR5 Q2FzY2FkZUZvclJvbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNh c2NhZGU6OnJlc29sdmVEaXJlY3Rpb25BbmRXcml0aW5nTW9kZSk6CisKKyAgICAgICAgVGhlIGNv ZGUgbW92ZXMgaGVyZS4KKworICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oOgorCiAy MDE5LTEwLTI2ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBF bmZvcmNlIHVzZXIgZ2VzdHVyZSBmb3IgZ2V0VXNlck1lZGlhIGluIGNhc2UgYSBwcmV2aW91cyBn ZXRVc2VyTWVkaWEgY2FsbCB3YXMgZGVuaWVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9j c3MvU3R5bGVSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5j cHAKaW5kZXggMjRlYmYwNjE5NjcuLmY2YzdmZmEwYjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwCkBAIC0xMTgsOCArMTE4LDYgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1l czsKIAogc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgZmlyc3RMb3dQcmlvcml0eVByb3BlcnR5 ID0gc3RhdGljX2Nhc3Q8Q1NTUHJvcGVydHlJRD4obGFzdEhpZ2hQcmlvcml0eVByb3BlcnR5ICsg MSk7CiAKLXN0YXRpYyB2b2lkIGV4dHJhY3REaXJlY3Rpb25BbmRXcml0aW5nTW9kZShjb25zdCBS ZW5kZXJTdHlsZSYsIGNvbnN0IE1hdGNoUmVzdWx0JiwgVGV4dERpcmVjdGlvbiYsIFdyaXRpbmdN b2RlJik7Ci0KIGlubGluZSB2b2lkIFN0eWxlUmVzb2x2ZXI6OlN0YXRlOjpjYWNoZUJvcmRlckFu ZEJhY2tncm91bmQoKQogewogICAgIG1faGFzVUFBcHBlYXJhbmNlID0gbV9zdHlsZS0+aGFzQXBw ZWFyYW5jZSgpOwpAQCAtMzY2LDExICszNjQsNyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UmVuZGVyU3R5 bGU+IFN0eWxlUmVzb2x2ZXI6OnN0eWxlRm9yS2V5ZnJhbWUoY29uc3QgUmVuZGVyU3R5bGUqCiAg ICAgc3RhdGUuc2V0U3R5bGUoUmVuZGVyU3R5bGU6OmNsb25lUHRyKCplbGVtZW50U3R5bGUpKTsK ICAgICBzdGF0ZS5zZXRQYXJlbnRTdHlsZShSZW5kZXJTdHlsZTo6Y2xvbmVQdHIoKmVsZW1lbnRT dHlsZSkpOwogCi0gICAgVGV4dERpcmVjdGlvbiBkaXJlY3Rpb247Ci0gICAgV3JpdGluZ01vZGUg d3JpdGluZ01vZGU7Ci0gICAgZXh0cmFjdERpcmVjdGlvbkFuZFdyaXRpbmdNb2RlKCpzdGF0ZS5z dHlsZSgpLCByZXN1bHQsIGRpcmVjdGlvbiwgd3JpdGluZ01vZGUpOwotCi0gICAgU3R5bGU6OlBy b3BlcnR5Q2FzY2FkZSBjYXNjYWRlKCp0aGlzLCByZXN1bHQsIHsgU3R5bGU6OkNhc2NhZGVMZXZl bDo6QXV0aG9yIH0sIGRpcmVjdGlvbiwgd3JpdGluZ01vZGUpOworICAgIFN0eWxlOjpQcm9wZXJ0 eUNhc2NhZGUgY2FzY2FkZSgqdGhpcywgcmVzdWx0LCB7IFN0eWxlOjpDYXNjYWRlTGV2ZWw6OkF1 dGhvciB9KTsKIAogICAgIGNhc2NhZGUuYXBwbHlQcm9wZXJ0aWVzKGZpcnN0Q1NTUHJvcGVydHks IGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eSk7CiAKQEAgLTU3MCwxMSArNTY0LDcgQEAgc3RkOjp1 bmlxdWVfcHRyPFJlbmRlclN0eWxlPiBTdHlsZVJlc29sdmVyOjpzdHlsZUZvclBhZ2UoaW50IHBh Z2VJbmRleCkKIAogICAgIGF1dG8mIHJlc3VsdCA9IGNvbGxlY3Rvci5tYXRjaFJlc3VsdCgpOwog Ci0gICAgVGV4dERpcmVjdGlvbiBkaXJlY3Rpb247Ci0gICAgV3JpdGluZ01vZGUgd3JpdGluZ01v ZGU7Ci0gICAgZXh0cmFjdERpcmVjdGlvbkFuZFdyaXRpbmdNb2RlKCptX3N0YXRlLnN0eWxlKCks IHJlc3VsdCwgZGlyZWN0aW9uLCB3cml0aW5nTW9kZSk7Ci0KLSAgICBTdHlsZTo6UHJvcGVydHlD YXNjYWRlIGNhc2NhZGUoKnRoaXMsIHJlc3VsdCwgeyBTdHlsZTo6Q2FzY2FkZUxldmVsOjpBdXRo b3IgfSwgZGlyZWN0aW9uLCB3cml0aW5nTW9kZSk7CisgICAgU3R5bGU6OlByb3BlcnR5Q2FzY2Fk ZSBjYXNjYWRlKCp0aGlzLCByZXN1bHQsIHsgU3R5bGU6OkNhc2NhZGVMZXZlbDo6QXV0aG9yIH0p OwogCiAgICAgY2FzY2FkZS5hcHBseVByb3BlcnRpZXMoZmlyc3RDU1NQcm9wZXJ0eSwgbGFzdEhp Z2hQcmlvcml0eVByb3BlcnR5KTsKIApAQCAtMTMwNCw0MSArMTI5NCw2IEBAIHN0YXRpYyBib29s IGlzQ2FjaGVhYmxlSW5NYXRjaGVkUHJvcGVydGllc0NhY2hlKGNvbnN0IEVsZW1lbnQmIGVsZW1l bnQsIGNvbnN0IFJlCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZvaWQgZXh0cmFjdERpcmVjdGlv bkFuZFdyaXRpbmdNb2RlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgY29uc3QgTWF0Y2hSZXN1 bHQmIG1hdGNoUmVzdWx0LCBUZXh0RGlyZWN0aW9uJiBkaXJlY3Rpb24sIFdyaXRpbmdNb2RlJiB3 cml0aW5nTW9kZSkKLXsKLSAgICBkaXJlY3Rpb24gPSBzdHlsZS5kaXJlY3Rpb24oKTsKLSAgICB3 cml0aW5nTW9kZSA9IHN0eWxlLndyaXRpbmdNb2RlKCk7Ci0KLSAgICBib29sIGhhZEltcG9ydGFu dFdyaXRpbmdNb2RlID0gZmFsc2U7Ci0gICAgYm9vbCBoYWRJbXBvcnRhbnREaXJlY3Rpb24gPSBm YWxzZTsKLQotICAgIGZvciAoYXV0byogbWF0Y2hlZERlY2xhcmF0aW9ucyA6IHsgJm1hdGNoUmVz dWx0LnVzZXJBZ2VudERlY2xhcmF0aW9ucywgJm1hdGNoUmVzdWx0LnVzZXJEZWNsYXJhdGlvbnMs ICZtYXRjaFJlc3VsdC5hdXRob3JEZWNsYXJhdGlvbnMgfSkgewotICAgICAgICBmb3IgKGNvbnN0 IGF1dG8mIG1hdGNoZWRQcm9wZXJ0aWVzIDogKm1hdGNoZWREZWNsYXJhdGlvbnMpIHsKLSAgICAg ICAgICAgIGZvciAodW5zaWduZWQgaSA9IDAsIGNvdW50ID0gbWF0Y2hlZFByb3BlcnRpZXMucHJv cGVydGllcy0+cHJvcGVydHlDb3VudCgpOyBpIDwgY291bnQ7ICsraSkgewotICAgICAgICAgICAg ICAgIGF1dG8gcHJvcGVydHkgPSBtYXRjaGVkUHJvcGVydGllcy5wcm9wZXJ0aWVzLT5wcm9wZXJ0 eUF0KGkpOwotICAgICAgICAgICAgICAgIGlmICghcHJvcGVydHkudmFsdWUoKS0+aXNQcmltaXRp dmVWYWx1ZSgpKQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAg ICBzd2l0Y2ggKHByb3BlcnR5LmlkKCkpIHsKLSAgICAgICAgICAgICAgICBjYXNlIENTU1Byb3Bl cnR5V3JpdGluZ01vZGU6Ci0gICAgICAgICAgICAgICAgICAgIGlmICghaGFkSW1wb3J0YW50V3Jp dGluZ01vZGUgfHwgcHJvcGVydHkuaXNJbXBvcnRhbnQoKSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgd3JpdGluZ01vZGUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4oKnByb3BlcnR5 LnZhbHVlKCkpOwotICAgICAgICAgICAgICAgICAgICAgICAgaGFkSW1wb3J0YW50V3JpdGluZ01v ZGUgPSBwcm9wZXJ0eS5pc0ltcG9ydGFudCgpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlE aXJlY3Rpb246Ci0gICAgICAgICAgICAgICAgICAgIGlmICghaGFkSW1wb3J0YW50RGlyZWN0aW9u IHx8IHByb3BlcnR5LmlzSW1wb3J0YW50KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRp cmVjdGlvbiA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqcHJvcGVydHkudmFsdWUoKSk7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBoYWRJbXBvcnRhbnREaXJlY3Rpb24gPSBwcm9wZXJ0 eS5pc0ltcG9ydGFudCgpOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLSAgICAgICAgfQotICAg IH0KLX0KLQogdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseU1hdGNoZWRQcm9wZXJ0aWVzKGNvbnN0 IE1hdGNoUmVzdWx0JiBtYXRjaFJlc3VsdCwgY29uc3QgRWxlbWVudCYgZWxlbWVudCwgU2hvdWxk VXNlTWF0Y2hlZFByb3BlcnRpZXNDYWNoZSBzaG91bGRVc2VNYXRjaGVkUHJvcGVydGllc0NhY2hl KQogewogICAgIFN0YXRlJiBzdGF0ZSA9IG1fc3RhdGU7CkBAIC0xMzY1LDE4ICsxMzIwLDEyIEBA IHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25zdCBNYXRjaFJl c3VsdCYgbWF0Y2hSZXN1bHQsIGNvbnN0CiAgICAgICAgIGluY2x1ZGVkUHJvcGVydGllcyA9IFN0 eWxlOjpQcm9wZXJ0eUNhc2NhZGU6OkluY2x1ZGVkUHJvcGVydGllczo6SW5oZXJpdGVkT25seTsK ICAgICB9CiAKLSAgICAvLyBEaXJlY3Rpb25hbCBwcm9wZXJ0aWVzICgqLWJlZm9yZS9hZnRlcikg YXJlIGFsaWFzZXMgdGhhdCBkZXBlbmQgb24gdGhlIFRleHREaXJlY3Rpb24gYW5kIFdyaXRpbmdN b2RlLgotICAgIC8vIFRoZXNlIG11c3QgYmUgcmVzb2x2ZWQgYmVmb3JlIHdlIGNhbiBiZWdpbiB0 aGUgcHJvcGVydHkgY2FzY2FkZS4KLSAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbjsKLSAgICBX cml0aW5nTW9kZSB3cml0aW5nTW9kZTsKLSAgICBleHRyYWN0RGlyZWN0aW9uQW5kV3JpdGluZ01v ZGUoKnN0YXRlLnN0eWxlKCksIG1hdGNoUmVzdWx0LCBkaXJlY3Rpb24sIHdyaXRpbmdNb2RlKTsK LQogICAgIGlmIChlbGVtZW50VHlwZUhhc0FwcGVhcmFuY2VGcm9tVUFTdHlsZSgqc3RhdGUuZWxl bWVudCgpKSkgewogICAgICAgICAvLyBGSVhNRTogVGhpcyBpcyBzdWNoIGEgaGFjay4KICAgICAg ICAgLy8gRmluZCBvdXQgaWYgdGhlcmUncyBhIC13ZWJraXQtYXBwZWFyYW5jZSBwcm9wZXJ0eSBp biBlZmZlY3QgZnJvbSB0aGUgVUEgc2hlZXQuCiAgICAgICAgIC8vIElmIHNvLCB3ZSBjYWNoZSB0 aGUgYm9yZGVyIGFuZCBiYWNrZ3JvdW5kIHN0eWxlcyBzbyB0aGF0IFJlbmRlclRoZW1lOjphZGp1 c3RTdHlsZSgpCiAgICAgICAgIC8vIGNhbiBsb29rIGF0IHRoZW0gbGF0ZXIgdG8gZmlndXJlIG91 dCBpZiB0aGlzIGlzIGEgc3R5bGVkIGZvcm0gY29udHJvbCBvciBub3QuCi0gICAgICAgIFN0eWxl OjpQcm9wZXJ0eUNhc2NhZGUgY2FzY2FkZSgqdGhpcywgbWF0Y2hSZXN1bHQsIHsgU3R5bGU6OkNh c2NhZGVMZXZlbDo6VXNlckFnZW50IH0sIGRpcmVjdGlvbiwgd3JpdGluZ01vZGUsIGluY2x1ZGVk UHJvcGVydGllcyk7CisgICAgICAgIFN0eWxlOjpQcm9wZXJ0eUNhc2NhZGUgY2FzY2FkZSgqdGhp cywgbWF0Y2hSZXN1bHQsIHsgU3R5bGU6OkNhc2NhZGVMZXZlbDo6VXNlckFnZW50IH0sIGluY2x1 ZGVkUHJvcGVydGllcyk7CiAKICAgICAgICAgY2FzY2FkZS5hcHBseVByb3BlcnRpZXMoQ1NTUHJv cGVydHlXZWJraXRSdWJ5UG9zaXRpb24sIENTU1Byb3BlcnR5V2Via2l0UnVieVBvc2l0aW9uKTsK ICAgICAgICAgYWRqdXN0U3R5bGVGb3JJbnRlckNoYXJhY3RlclJ1YnkoKTsKQEAgLTEzOTksNyAr MTM0OCw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25z dCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1bHQsIGNvbnN0CiAgICAgICAgIHN0YXRlLmNhY2hlQm9y ZGVyQW5kQmFja2dyb3VuZCgpOwogICAgIH0KIAotICAgIFN0eWxlOjpQcm9wZXJ0eUNhc2NhZGUg Y2FzY2FkZSgqdGhpcywgbWF0Y2hSZXN1bHQsIFN0eWxlOjphbGxDYXNjYWRlTGV2ZWxzKCksIGRp cmVjdGlvbiwgd3JpdGluZ01vZGUsIGluY2x1ZGVkUHJvcGVydGllcyk7CisgICAgU3R5bGU6OlBy b3BlcnR5Q2FzY2FkZSBjYXNjYWRlKCp0aGlzLCBtYXRjaFJlc3VsdCwgU3R5bGU6OmFsbENhc2Nh ZGVMZXZlbHMoKSwgaW5jbHVkZWRQcm9wZXJ0aWVzKTsKIAogICAgIGNhc2NhZGUuYXBwbHlQcm9w ZXJ0aWVzKENTU1Byb3BlcnR5V2Via2l0UnVieVBvc2l0aW9uLCBDU1NQcm9wZXJ0eVdlYmtpdFJ1 YnlQb3NpdGlvbik7CiAgICAgYWRqdXN0U3R5bGVGb3JJbnRlckNoYXJhY3RlclJ1YnkoKTsKQEAg LTE0NTQsNyArMTQwMyw3IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9wZXJ0eVRvQ3Vy cmVudFN0eWxlKENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlKiB2YWx1CiAgICAgaWYgKCF2YWx1 ZSkKICAgICAgICAgcmV0dXJuOwogICAgIE1hdGNoUmVzdWx0IG1hdGNoUmVzdWx0OwotICAgIFN0 eWxlOjpQcm9wZXJ0eUNhc2NhZGUgY2FzY2FkZSgqdGhpcywgbWF0Y2hSZXN1bHQsIHsgfSwgeyB9 LCB7IH0pOworICAgIFN0eWxlOjpQcm9wZXJ0eUNhc2NhZGUgY2FzY2FkZSgqdGhpcywgbWF0Y2hS ZXN1bHQsIHsgfSk7CiAgICAgaWYgKHZhbHVlKQogICAgICAgICBjYXNjYWRlLmFwcGx5UHJvcGVy dHkoaWQsICp2YWx1ZSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9w ZXJ0eUNhc2NhZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmNw cAppbmRleCBjNDBlMDRhOGIxMy4uYTQzOTgxMTIzNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3R5bGUv UHJvcGVydHlDYXNjYWRlLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIlByb3BlcnR5 Q2FzY2FkZS5oIgogCiAjaW5jbHVkZSAiQ1NTUGFpbnRJbWFnZVZhbHVlLmgiCisjaW5jbHVkZSAi Q1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oIgogI2luY2x1ZGUgIkNTU1ZhbHVlUG9vbC5oIgog I2luY2x1ZGUgIlBhaW50V29ya2xldEdsb2JhbFNjb3BlLmgiCiAjaW5jbHVkZSAiU3R5bGVCdWls ZGVyLmgiCkBAIC0xNzIsMTIgKzE3MywzMSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNWYWxpZEN1 ZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlJRCBpZCkKIH0KICNlbmRpZgogCi1Qcm9wZXJ0eUNh c2NhZGU6OlByb3BlcnR5Q2FzY2FkZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBjb25z dCBNYXRjaFJlc3VsdCYgbWF0Y2hSZXN1bHQsIE9wdGlvblNldDxDYXNjYWRlTGV2ZWw+IGNhc2Nh ZGVMZXZlbHMsIFRleHREaXJlY3Rpb24gZGlyZWN0aW9uLCBXcml0aW5nTW9kZSB3cml0aW5nTW9k ZSwgSW5jbHVkZWRQcm9wZXJ0aWVzIGluY2x1ZGVkUHJvcGVydGllcykKK1Byb3BlcnR5Q2FzY2Fk ZTo6UHJvcGVydHlDYXNjYWRlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0IE1h dGNoUmVzdWx0JiBtYXRjaFJlc3VsdCwgT3B0aW9uU2V0PENhc2NhZGVMZXZlbD4gY2FzY2FkZUxl dmVscywgSW5jbHVkZWRQcm9wZXJ0aWVzIGluY2x1ZGVkUHJvcGVydGllcykKICAgICA6IG1fc3R5 bGVSZXNvbHZlcihzdHlsZVJlc29sdmVyKQogICAgICwgbV9tYXRjaFJlc3VsdChtYXRjaFJlc3Vs dCkKICAgICAsIG1faW5jbHVkZWRQcm9wZXJ0aWVzKGluY2x1ZGVkUHJvcGVydGllcykKLSAgICAs IG1fZGlyZWN0aW9uKGRpcmVjdGlvbikKLSAgICAsIG1fd3JpdGluZ01vZGUod3JpdGluZ01vZGUp Cit7CisgICAgLy8gRGlyZWN0aW9uYWwgcHJvcGVydGllcyAoKi1iZWZvcmUvYWZ0ZXIpIGFyZSBh bGlhc2VzIHRoYXQgZGVwZW5kIG9uIHRoZSBUZXh0RGlyZWN0aW9uIGFuZCBXcml0aW5nTW9kZS4K KyAgICAvLyBUaGVzZSBtdXN0IGJlIHJlc29sdmVkIGJlZm9yZSB3ZSBjYW4gYmVnaW4gYnVpbGRp bmcgdGhlIHByb3BlcnR5IGNhc2NhZGUuCisgICAgcmVzb2x2ZURpcmVjdGlvbkFuZFdyaXRpbmdN b2RlKCk7CisKKyAgICBidWlsZENhc2NhZGUoY2FzY2FkZUxldmVscyk7Cit9CisKK1Byb3BlcnR5 Q2FzY2FkZTo6UHJvcGVydHlDYXNjYWRlKGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYgcGFyZW50LCBP cHRpb25TZXQ8Q2FzY2FkZUxldmVsPiBjYXNjYWRlTGV2ZWxzKQorICAgIDogbV9zdHlsZVJlc29s dmVyKHBhcmVudC5tX3N0eWxlUmVzb2x2ZXIpCisgICAgLCBtX21hdGNoUmVzdWx0KHBhcmVudC5t X21hdGNoUmVzdWx0KQorICAgICwgbV9pbmNsdWRlZFByb3BlcnRpZXMocGFyZW50Lm1faW5jbHVk ZWRQcm9wZXJ0aWVzKQorICAgICwgbV9kaXJlY3Rpb24ocGFyZW50Lm1fZGlyZWN0aW9uKQorICAg ICwgbV93cml0aW5nTW9kZShwYXJlbnQubV93cml0aW5nTW9kZSkKK3sKKyAgICBidWlsZENhc2Nh ZGUoY2FzY2FkZUxldmVscyk7Cit9CisKK1Byb3BlcnR5Q2FzY2FkZTo6flByb3BlcnR5Q2FzY2Fk ZSgpID0gZGVmYXVsdDsKKwordm9pZCBQcm9wZXJ0eUNhc2NhZGU6OmJ1aWxkQ2FzY2FkZShPcHRp b25TZXQ8Q2FzY2FkZUxldmVsPiBjYXNjYWRlTGV2ZWxzKQogewogICAgIE9wdGlvblNldDxDYXNj YWRlTGV2ZWw+IGNhc2NhZGVMZXZlbHNXaXRoSW1wb3J0YW50OwogCkBAIC0xOTQsOCArMjE0LDYg QEAgUHJvcGVydHlDYXNjYWRlOjpQcm9wZXJ0eUNhc2NhZGUoU3R5bGVSZXNvbHZlciYgc3R5bGVS ZXNvbHZlciwgY29uc3QgTWF0Y2hSZXN1bHQKICAgICB9CiB9CiAKLVByb3BlcnR5Q2FzY2FkZTo6 flByb3BlcnR5Q2FzY2FkZSgpID0gZGVmYXVsdDsKLQogdm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnNl dFByb3BlcnR5SW50ZXJuYWwoUHJvcGVydHkmIHByb3BlcnR5LCBDU1NQcm9wZXJ0eUlEIGlkLCBD U1NWYWx1ZSYgY3NzVmFsdWUsIHVuc2lnbmVkIGxpbmtNYXRjaFR5cGUsIENhc2NhZGVMZXZlbCBj YXNjYWRlTGV2ZWwsIFNjb3BlT3JkaW5hbCBzdHlsZVNjb3BlT3JkaW5hbCkKIHsKICAgICBBU1NF UlQobGlua01hdGNoVHlwZSA8PSBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoQWxsKTsKQEAgLTQ5MCwx NCArNTA4LDE0IEBAIGNvbnN0IFByb3BlcnR5Q2FzY2FkZSogUHJvcGVydHlDYXNjYWRlOjpwcm9w ZXJ0eUNhc2NhZGVGb3JSb2xsYmFjayhDYXNjYWRlTGV2ZWwKICAgICBjYXNlIENhc2NhZGVMZXZl bDo6QXV0aG9yOgogICAgICAgICBpZiAoIW1fYXV0aG9yUm9sbGJhY2tDYXNjYWRlKSB7CiAgICAg ICAgICAgICBhdXRvIGNhc2NhZGVMZXZlbHMgPSBPcHRpb25TZXQ8Q2FzY2FkZUxldmVsPiB7IENh c2NhZGVMZXZlbDo6VXNlckFnZW50LCBDYXNjYWRlTGV2ZWw6OlVzZXIgfTsKLSAgICAgICAgICAg IG1fYXV0aG9yUm9sbGJhY2tDYXNjYWRlID0gbWFrZVVuaXF1ZTxjb25zdCBQcm9wZXJ0eUNhc2Nh ZGU+KG1fc3R5bGVSZXNvbHZlciwgbV9tYXRjaFJlc3VsdCwgY2FzY2FkZUxldmVscywgbV9kaXJl Y3Rpb24sIG1fd3JpdGluZ01vZGUsIG1faW5jbHVkZWRQcm9wZXJ0aWVzKTsKKyAgICAgICAgICAg IG1fYXV0aG9yUm9sbGJhY2tDYXNjYWRlID0gbWFrZVVuaXF1ZTxjb25zdCBQcm9wZXJ0eUNhc2Nh ZGU+KCp0aGlzLCBjYXNjYWRlTGV2ZWxzKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gbV9h dXRob3JSb2xsYmFja0Nhc2NhZGUuZ2V0KCk7CiAKICAgICBjYXNlIENhc2NhZGVMZXZlbDo6VXNl cjoKICAgICAgICAgaWYgKCFtX3VzZXJSb2xsYmFja0Nhc2NhZGUpIHsKICAgICAgICAgICAgIGF1 dG8gY2FzY2FkZUxldmVscyA9IE9wdGlvblNldDxDYXNjYWRlTGV2ZWw+IHsgQ2FzY2FkZUxldmVs OjpVc2VyQWdlbnQgfTsKLSAgICAgICAgICAgIG1fdXNlclJvbGxiYWNrQ2FzY2FkZSA9IG1ha2VV bmlxdWU8Y29uc3QgUHJvcGVydHlDYXNjYWRlPihtX3N0eWxlUmVzb2x2ZXIsIG1fbWF0Y2hSZXN1 bHQsIGNhc2NhZGVMZXZlbHMsIG1fZGlyZWN0aW9uLCBtX3dyaXRpbmdNb2RlLCBtX2luY2x1ZGVk UHJvcGVydGllcyk7CisgICAgICAgICAgICBtX3VzZXJSb2xsYmFja0Nhc2NhZGUgPSBtYWtlVW5p cXVlPGNvbnN0IFByb3BlcnR5Q2FzY2FkZT4oKnRoaXMsIGNhc2NhZGVMZXZlbHMpOwogICAgICAg ICB9CiAgICAgICAgIHJldHVybiBtX3VzZXJSb2xsYmFja0Nhc2NhZGUuZ2V0KCk7CiAKQEAgLTY1 MCw1ICs2NjgsNDIgQEAgUmVmUHRyPENTU1ZhbHVlPiBQcm9wZXJ0eUNhc2NhZGU6OnJlc29sdmVk VmFyaWFibGVWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BJRCwgY28KICAgICByZXR1cm4gcGFyc2Vy LnBhcnNlVmFsdWVXaXRoVmFyaWFibGVSZWZlcmVuY2VzKHByb3BJRCwgdmFsdWUsICp0aGlzKTsK IH0KIAordm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnJlc29sdmVEaXJlY3Rpb25BbmRXcml0aW5nTW9k ZSgpCit7CisgICAgYXV0byYgc3R5bGUgPSAqbV9zdHlsZVJlc29sdmVyLnN0eWxlKCk7CisKKyAg ICBtX2RpcmVjdGlvbiA9IHN0eWxlLmRpcmVjdGlvbigpOworICAgIG1fd3JpdGluZ01vZGUgPSBz dHlsZS53cml0aW5nTW9kZSgpOworCisgICAgYm9vbCBoYWRJbXBvcnRhbnRXcml0aW5nTW9kZSA9 IGZhbHNlOworICAgIGJvb2wgaGFkSW1wb3J0YW50RGlyZWN0aW9uID0gZmFsc2U7CisKKyAgICBm b3IgKGF1dG8gY2FzY2FkZUxldmVsIDogeyBDYXNjYWRlTGV2ZWw6OlVzZXJBZ2VudCwgQ2FzY2Fk ZUxldmVsOjpVc2VyLCBDYXNjYWRlTGV2ZWw6OkF1dGhvciB9KSB7CisgICAgICAgIGZvciAoY29u c3QgYXV0byYgbWF0Y2hlZFByb3BlcnRpZXMgOiBkZWNsYXJhdGlvbnNGb3JDYXNjYWRlTGV2ZWwo bV9tYXRjaFJlc3VsdCwgY2FzY2FkZUxldmVsKSkgeworICAgICAgICAgICAgZm9yICh1bnNpZ25l ZCBpID0gMCwgY291bnQgPSBtYXRjaGVkUHJvcGVydGllcy5wcm9wZXJ0aWVzLT5wcm9wZXJ0eUNv dW50KCk7IGkgPCBjb3VudDsgKytpKSB7CisgICAgICAgICAgICAgICAgYXV0byBwcm9wZXJ0eSA9 IG1hdGNoZWRQcm9wZXJ0aWVzLnByb3BlcnRpZXMtPnByb3BlcnR5QXQoaSk7CisgICAgICAgICAg ICAgICAgaWYgKCFwcm9wZXJ0eS52YWx1ZSgpLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHN3aXRjaCAocHJvcGVydHku aWQoKSkgeworICAgICAgICAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXcml0aW5nTW9kZToKKyAg ICAgICAgICAgICAgICAgICAgaWYgKCFoYWRJbXBvcnRhbnRXcml0aW5nTW9kZSB8fCBwcm9wZXJ0 eS5pc0ltcG9ydGFudCgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBtX3dyaXRpbmdNb2Rl ID0gZG93bmNhc3Q8Q1NTUHJpbWl0aXZlVmFsdWU+KCpwcm9wZXJ0eS52YWx1ZSgpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIGhhZEltcG9ydGFudFdyaXRpbmdNb2RlID0gcHJvcGVydHkuaXNJ bXBvcnRhbnQoKTsKKyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgICAgICBjYXNlIENTU1Byb3BlcnR5RGlyZWN0aW9uOgorICAgICAg ICAgICAgICAgICAgICBpZiAoIWhhZEltcG9ydGFudERpcmVjdGlvbiB8fCBwcm9wZXJ0eS5pc0lt cG9ydGFudCgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBtX2RpcmVjdGlvbiA9IGRvd25j YXN0PENTU1ByaW1pdGl2ZVZhbHVlPigqcHJvcGVydHkudmFsdWUoKSk7CisgICAgICAgICAgICAg ICAgICAgICAgICBoYWRJbXBvcnRhbnREaXJlY3Rpb24gPSBwcm9wZXJ0eS5pc0ltcG9ydGFudCgp OworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KK30KKwogfQogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaAppbmRleCBlZTdmZTE2M2U0Mi4uNDJj NTA4NWEzOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2Fk ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5oCkBAIC00Nyw3 ICs0Nyw5IEBAIGNsYXNzIFByb3BlcnR5Q2FzY2FkZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExP Q0FURUQ7CiBwdWJsaWM6CiAgICAgZW51bSBJbmNsdWRlZFByb3BlcnRpZXMgeyBBbGwsIEluaGVy aXRlZE9ubHkgfTsKLSAgICBQcm9wZXJ0eUNhc2NhZGUoU3R5bGVSZXNvbHZlciYsIGNvbnN0IE1h dGNoUmVzdWx0JiwgT3B0aW9uU2V0PENhc2NhZGVMZXZlbD4sIFRleHREaXJlY3Rpb24sIFdyaXRp bmdNb2RlLCBJbmNsdWRlZFByb3BlcnRpZXMgPSBJbmNsdWRlZFByb3BlcnRpZXM6OkFsbCk7Cisg ICAgUHJvcGVydHlDYXNjYWRlKFN0eWxlUmVzb2x2ZXImLCBjb25zdCBNYXRjaFJlc3VsdCYsIE9w dGlvblNldDxDYXNjYWRlTGV2ZWw+LCBJbmNsdWRlZFByb3BlcnRpZXMgPSBJbmNsdWRlZFByb3Bl cnRpZXM6OkFsbCk7CisgICAgUHJvcGVydHlDYXNjYWRlKGNvbnN0IFByb3BlcnR5Q2FzY2FkZSYs IE9wdGlvblNldDxDYXNjYWRlTGV2ZWw+KTsKKwogICAgIH5Qcm9wZXJ0eUNhc2NhZGUoKTsKIAog ICAgIFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIoKSB7IHJldHVybiBtX3N0eWxlUmVzb2x2 ZXI7IH0KQEAgLTc0LDYgKzc2LDcgQEAgcHVibGljOgogICAgIHZvaWQgYXBwbHlQcm9wZXJ0eShD U1NQcm9wZXJ0eUlELCBDU1NWYWx1ZSYsIFNlbGVjdG9yQ2hlY2tlcjo6TGlua01hdGNoTWFzayA9 IFNlbGVjdG9yQ2hlY2tlcjo6TWF0Y2hEZWZhdWx0KTsKIAogcHJpdmF0ZToKKyAgICB2b2lkIGJ1 aWxkQ2FzY2FkZShPcHRpb25TZXQ8Q2FzY2FkZUxldmVsPik7CiAgICAgYm9vbCBhZGROb3JtYWxN YXRjaGVzKENhc2NhZGVMZXZlbCk7CiAgICAgdm9pZCBhZGRJbXBvcnRhbnRNYXRjaGVzKENhc2Nh ZGVMZXZlbCk7CiAgICAgYm9vbCBhZGRNYXRjaChjb25zdCBNYXRjaGVkUHJvcGVydGllcyYsIENh c2NhZGVMZXZlbCwgYm9vbCBpbXBvcnRhbnQpOwpAQCAtOTIsMTIgKzk1LDE1IEBAIHByaXZhdGU6 CiAgICAgUmVmPENTU1ZhbHVlPiByZXNvbHZlVmFsdWUoQ1NTUHJvcGVydHlJRCwgQ1NTVmFsdWUm KTsKICAgICBSZWZQdHI8Q1NTVmFsdWU+IHJlc29sdmVkVmFyaWFibGVWYWx1ZShDU1NQcm9wZXJ0 eUlELCBjb25zdCBDU1NWYWx1ZSYpOwogCisgICAgdm9pZCByZXNvbHZlRGlyZWN0aW9uQW5kV3Jp dGluZ01vZGUoKTsKKwogICAgIFN0eWxlUmVzb2x2ZXImIG1fc3R5bGVSZXNvbHZlcjsKIAogICAg IGNvbnN0IE1hdGNoUmVzdWx0JiBtX21hdGNoUmVzdWx0OwogICAgIGNvbnN0IEluY2x1ZGVkUHJv cGVydGllcyBtX2luY2x1ZGVkUHJvcGVydGllczsKLSAgICBjb25zdCBUZXh0RGlyZWN0aW9uIG1f ZGlyZWN0aW9uOwotICAgIGNvbnN0IFdyaXRpbmdNb2RlIG1fd3JpdGluZ01vZGU7CisgICAgCisg ICAgVGV4dERpcmVjdGlvbiBtX2RpcmVjdGlvbjsKKyAgICBXcml0aW5nTW9kZSBtX3dyaXRpbmdN b2RlOwogCiAgICAgUHJvcGVydHkgbV9wcm9wZXJ0aWVzW251bUNTU1Byb3BlcnRpZXMgKyAyXTsK ICAgICBzdGQ6OmJpdHNldDxudW1DU1NQcm9wZXJ0aWVzICsgMj4gbV9wcm9wZXJ0eUlzUHJlc2Vu dDsK