177415 2017-09-24 04:34:59 -0700 Remove CSS regions related fields from RenderStyle 2017-09-27 12:20:11 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174978 1 koivisto webkit-unassigned bfulgham commit-queue hyatt sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1352065 0 koivisto 2017-09-24 04:34:59 -0700 Some more leftovers. 1352066 1 321652 koivisto 2017-09-24 04:39:36 -0700 Created attachment 321652 patch 1352082 2 321652 commit-queue 2017-09-24 11:30:58 -0700 Comment on attachment 321652 patch Clearing flags on attachment: 321652 Committed r222435: <http://trac.webkit.org/changeset/222435> 1352083 3 commit-queue 2017-09-24 11:31:00 -0700 All reviewed patches have been landed. Closing bug. 1353303 4 webkit-bug-importer 2017-09-27 12:20:11 -0700 <rdar://problem/34693069> 321652 2017-09-24 04:39:36 -0700 2017-09-24 11:30:58 -0700 patch named-flow-removal-style.patch text/plain 14446 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjQzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDE3LTA5LTI0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgQ1NTIHJlZ2lvbnMg cmVsYXRlZCBmaWVsZHMgZnJvbSBSZW5kZXJTdHlsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3NDE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5o OgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIFJlZ2lvbkZy YWdtZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjphZGp1c3RSZW5kZXJTdHlsZSk6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjphdm9pZHNGbG9hdHMgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9jay5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpoYXNOZXh0UGFnZSBjb25z dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMgY29uc3QpOgorICAgICAgICAqIHJl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJT dHlsZTo6Y2hhbmdlUmVxdWlyZXNMYXlvdXQgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6cHNldWRvRWxlbWVudFJlbmRl cmVySXNOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6Omhhc0Zsb3dJbnRv IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpmbG93VGhy ZWFkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpoYXNG bG93RnJvbSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 cmVnaW9uVGhyZWFkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpyZWdpb25GcmFnbWVudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTdHlsZTo6c2V0Rmxvd1RocmVhZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTdHlsZTo6c2V0UmVnaW9uVGhyZWFkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclN0eWxlOjpzZXRSZWdpb25GcmFnbWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJTdHlsZTo6aW5pdGlhbEZsb3dUaHJlYWQpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyU3R5bGU6OmluaXRpYWxSZWdpb25UaHJlYWQpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmluaXRpYWxSZWdpb25GcmFnbWVudCk6IERlbGV0 ZWQuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6Cisg ICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YTo6U3R5bGVSYXJlTm9u SW5oZXJpdGVkRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVOb25Jbmhlcml0ZWRE YXRhOjpvcGVyYXRvcj09IGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVS YXJlTm9uSW5oZXJpdGVkRGF0YS5oOgorCiAyMDE3LTA5LTIzICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgU2V0dGVyTWF5VGhyb3dFeGNlcHRpb24K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aAkocmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZh bHVlTWFwcGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMjA1MiwzNyArMjA1Miw2IEBAIHRlbXBs YXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGUKICAgICByZXR1cm4gTU5PTkU7CiB9 CiAKLXRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1 ZShSZWdpb25GcmFnbWVudCBlKQotICAgIDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3MpCi17Ci0g ICAgbV9wcmltaXRpdmVVbml0VHlwZSA9IENTU19WQUxVRV9JRDsKLSAgICBzd2l0Y2ggKGUpIHsK LSAgICBjYXNlIEF1dG9SZWdpb25GcmFnbWVudDoKLSAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0g Q1NTVmFsdWVBdXRvOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEJyZWFrUmVnaW9uRnJhZ21l bnQ6Ci0gICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlQnJlYWs7Ci0gICAgICAgIGJy ZWFrOwotICAgIH0KLX0KLQotdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9w ZXJhdG9yIFJlZ2lvbkZyYWdtZW50KCkgY29uc3QKLXsKLSAgICBBU1NFUlQoaXNWYWx1ZUlEKCkp OwotCi0gICAgc3dpdGNoIChtX3ZhbHVlLnZhbHVlSUQpIHsKLSAgICBjYXNlIENTU1ZhbHVlQXV0 bzoKLSAgICAgICAgcmV0dXJuIEF1dG9SZWdpb25GcmFnbWVudDsKLSAgICBjYXNlIENTU1ZhbHVl QnJlYWs6Ci0gICAgICAgIHJldHVybiBCcmVha1JlZ2lvbkZyYWdtZW50OwotICAgIGRlZmF1bHQ6 Ci0gICAgICAgIGJyZWFrOwotICAgIH0KLQotICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAg IHJldHVybiBBdXRvUmVnaW9uRnJhZ21lbnQ7Ci19Ci0KIHRlbXBsYXRlPD4gaW5saW5lIENTU1By aW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShFTWFycXVlZURpcmVjdGlvbiBlKQogICAg IDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3MpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSZXNvbHZlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UmVzb2x2ZXIuY3BwCShyZXZpc2lvbiAyMjI0MzIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVSZXNvbHZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkxOSw3ICs5MTksNiBAQCB2b2lkIFN0 eWxlUmVzb2x2ZXI6OmFkanVzdFJlbmRlclN0eWxlKFJlCiAgICAgICAgICAgICB8fCBzdHlsZS5o YXNJc29sYXRpb24oKQogICAgICAgICAgICAgfHwgc3R5bGUucG9zaXRpb24oKSA9PSBTdGlja3lQ b3NpdGlvbgogICAgICAgICAgICAgfHwgc3R5bGUucG9zaXRpb24oKSA9PSBGaXhlZFBvc2l0aW9u Ci0gICAgICAgICAgICB8fCBzdHlsZS5oYXNGbG93RnJvbSgpCiAgICAgICAgICAgICB8fCBzdHls ZS53aWxsQ2hhbmdlQ3JlYXRlc1N0YWNraW5nQ29udGV4dCgpKQogICAgICAgICAgICAgc3R5bGUu c2V0WkluZGV4KDApOwogICAgIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAkocmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjQxMCwxMiArMjQxMCw2IEBAIExh eW91dFVuaXQgUmVuZGVyQmxvY2s6OmFkanVzdExvZ2ljYWxSaWcKICAgICByZXR1cm4gcmlnaHQ7 CiB9CiAKLWJvb2wgUmVuZGVyQmxvY2s6OmF2b2lkc0Zsb2F0cygpIGNvbnN0Ci17Ci0gICAgLy8g RmxvYXRzIGNhbid0IGludHJ1ZGUgaW50byBvdXIgYm94IGlmIHdlIGhhdmUgYSBub24tYXV0byBj b2x1bW4gY291bnQgb3Igd2lkdGguCi0gICAgcmV0dXJuIFJlbmRlckJveDo6YXZvaWRzRmxvYXRz KCkgfHwgc3R5bGUoKS5oYXNGbG93RnJvbSgpOwotfQotCiBib29sIFJlbmRlckJsb2NrOjppc1Bv aW50SW5PdmVyZmxvd0NvbnRyb2woSGl0VGVzdFJlc3VsdCYgcmVzdWx0LCBjb25zdCBMYXlvdXRQ b2ludCYgbG9jYXRpb25JbkNvbnRhaW5lciwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVk T2Zmc2V0KQogewogICAgIGlmICghc2Nyb2xsc092ZXJmbG93KCkpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkocmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2Myw4ICs0 NjMsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgcGFpbnRTZWxlY3Rpb24oUGFpbnRJbmZvJiwgY29u c3QgTGF5b3V0UG9pbnQmKTsKICAgICB2b2lkIHBhaW50Q2FyZXQoUGFpbnRJbmZvJiwgY29uc3Qg TGF5b3V0UG9pbnQmLCBDYXJldFR5cGUpOwogCi0gICAgYm9vbCBhdm9pZHNGbG9hdHMoKSBjb25z dCBvdmVycmlkZTsKLQogICAgIHZpcnR1YWwgYm9vbCBoaXRUZXN0Q29udGVudHMoY29uc3QgSGl0 VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2Nh dGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhp dFRlc3RBY3Rpb24pOwogICAgIC8vIEZJWE1FLUJMT0NLRkxPVzogUmVtb3ZlIHZpcnR1YWxpemF0 aW9uIHdoZW4gYWxsIGNhbGxlcnMgaGF2ZSBtb3ZlZCB0byBSZW5kZXJCbG9ja0Zsb3cKICAgICB2 aXJ0dWFsIGJvb2wgaGl0VGVzdEZsb2F0cyhjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RS ZXN1bHQmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mLCBjb25zdCBMYXlvdXRQb2ludCYpIHsgcmV0 dXJuIGZhbHNlOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tG bG93LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcAkocmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckJsb2NrRmxvdy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MzUsNyArMTgzNSw3IEBA IGJvb2wgUmVuZGVyQmxvY2tGbG93OjpoYXNOZXh0UGFnZShMYXlvdXQKICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgaWYgKHJlZ2lvbi0+aXNMYXN0UmVnaW9uKCkpCi0gICAgICAgIHJldHVy biByZWdpb24tPmlzUmVuZGVyUmVnaW9uU2V0KCkgfHwgcmVnaW9uLT5zdHlsZSgpLnJlZ2lvbkZy YWdtZW50KCkgPT0gQnJlYWtSZWdpb25GcmFnbWVudAorICAgICAgICByZXR1cm4gcmVnaW9uLT5p c1JlbmRlclJlZ2lvblNldCgpCiAgICAgICAgICAgICB8fCAocGFnZUJvdW5kYXJ5UnVsZSA9PSBJ bmNsdWRlUGFnZUJvdW5kYXJ5ICYmIHBhZ2VPZmZzZXQgPT0gcmVnaW9uLT5sb2dpY2FsVG9wRm9y Rmxvd1RocmVhZENvbnRlbnQoKSk7CiAKICAgICBSZW5kZXJSZWdpb24qIHN0YXJ0UmVnaW9uID0g bnVsbHB0cjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAko cmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjI3NSw3ICs2Mjc1LDYgQEAgc3RhdGljIGJvb2wgY3Jl YXRlc1N0YWNraW5nQ29udGV4dChjb25zdAogI2VuZGlmCiAgICAgICAgIHx8IHJlbmRlcmVyLmlz VHJhbnNwYXJlbnQoKQogICAgICAgICB8fCByZW5kZXJlci5pc1Bvc2l0aW9uZWQoKQotICAgICAg ICB8fCByZW5kZXJlci5zdHlsZSgpLmhhc0Zsb3dGcm9tKCkKICAgICAgICAgfHwgcmVuZGVyZXIu aGFzUmVmbGVjdGlvbigpCiAgICAgICAgIHx8IHJlbmRlcmVyLnN0eWxlKCkuaGFzSXNvbGF0aW9u KCkKICAgICAgICAgfHwgbGF5ZXIubmVlZHNDb21wb3NpdGVkU2Nyb2xsaW5nKCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkocmV2aXNp b24gMjIyNDMyKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcxLDkgKzU3MSw2IEBAIGJvb2wgUmVuZGVyU3R5bGU6 OmNoYW5nZVJlcXVpcmVzTGF5b3V0KGMKICAgICAgICAgICAgIHx8IG1fcmFyZU5vbkluaGVyaXRl ZERhdGEtPnRleHRPdmVyZmxvdyAhPSBvdGhlci5tX3JhcmVOb25Jbmhlcml0ZWREYXRhLT50ZXh0 T3ZlcmZsb3cpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgICAgICBpZiAobV9yYXJl Tm9uSW5oZXJpdGVkRGF0YS0+cmVnaW9uRnJhZ21lbnQgIT0gb3RoZXIubV9yYXJlTm9uSW5oZXJp dGVkRGF0YS0+cmVnaW9uRnJhZ21lbnQpCi0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLQogICAg ICAgICBpZiAobV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+c2hhcGVNYXJnaW4gIT0gb3RoZXIubV9y YXJlTm9uSW5oZXJpdGVkRGF0YS0+c2hhcGVNYXJnaW4pCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxl LmgJKHJldmlzaW9uIDIyMjQzMikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02NDUsMTIgKzY0NSw2IEBAIHB1YmxpYzoK IAogICAgIC8vIEVuZCBDU1MzIEdldHRlcnMKIAotICAgIGJvb2wgaGFzRmxvd0ludG8oKSBjb25z dCB7IHJldHVybiAhbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+Zmxvd1RocmVhZC5pc051bGwoKTsg fQotICAgIGNvbnN0IEF0b21pY1N0cmluZyYgZmxvd1RocmVhZCgpIGNvbnN0IHsgcmV0dXJuIG1f cmFyZU5vbkluaGVyaXRlZERhdGEtPmZsb3dUaHJlYWQ7IH0KLSAgICBib29sIGhhc0Zsb3dGcm9t KCkgY29uc3QgeyByZXR1cm4gIW1fcmFyZU5vbkluaGVyaXRlZERhdGEtPnJlZ2lvblRocmVhZC5p c051bGwoKTsgfQotICAgIGNvbnN0IEF0b21pY1N0cmluZyYgcmVnaW9uVGhyZWFkKCkgY29uc3Qg eyByZXR1cm4gbV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+cmVnaW9uVGhyZWFkOyB9Ci0gICAgUmVn aW9uRnJhZ21lbnQgcmVnaW9uRnJhZ21lbnQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxS ZWdpb25GcmFnbWVudD4obV9yYXJlTm9uSW5oZXJpdGVkRGF0YS0+cmVnaW9uRnJhZ21lbnQpOyB9 Ci0KICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGxpbmVHcmlkKCkgY29uc3QgeyByZXR1cm4gbV9y YXJlSW5oZXJpdGVkRGF0YS0+bGluZUdyaWQ7IH0KICAgICBMaW5lU25hcCBsaW5lU25hcCgpIGNv bnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PExpbmVTbmFwPihtX3JhcmVJbmhlcml0ZWREYXRhLT5s aW5lU25hcCk7IH0KICAgICBMaW5lQWxpZ24gbGluZUFsaWduKCkgY29uc3QgeyByZXR1cm4gc3Rh dGljX2Nhc3Q8TGluZUFsaWduPihtX3JhcmVJbmhlcml0ZWREYXRhLT5saW5lQWxpZ24pOyB9CkBA IC0xMTgwLDEwICsxMTc0LDYgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TGluZVNuYXAoTGluZVNu YXAgbGluZVNuYXApIHsgU0VUX1ZBUihtX3JhcmVJbmhlcml0ZWREYXRhLCBsaW5lU25hcCwgbGlu ZVNuYXApOyB9CiAgICAgdm9pZCBzZXRMaW5lQWxpZ24oTGluZUFsaWduIGxpbmVBbGlnbikgeyBT RVRfVkFSKG1fcmFyZUluaGVyaXRlZERhdGEsIGxpbmVBbGlnbiwgbGluZUFsaWduKTsgfQogCi0g ICAgdm9pZCBzZXRGbG93VGhyZWFkKGNvbnN0IEF0b21pY1N0cmluZyYgZmxvd1RocmVhZCkgeyBT RVRfVkFSKG1fcmFyZU5vbkluaGVyaXRlZERhdGEsIGZsb3dUaHJlYWQsIGZsb3dUaHJlYWQpOyB9 Ci0gICAgdm9pZCBzZXRSZWdpb25UaHJlYWQoY29uc3QgQXRvbWljU3RyaW5nJiByZWdpb25UaHJl YWQpIHsgU0VUX1ZBUihtX3JhcmVOb25Jbmhlcml0ZWREYXRhLCByZWdpb25UaHJlYWQsIHJlZ2lv blRocmVhZCk7IH0KLSAgICB2b2lkIHNldFJlZ2lvbkZyYWdtZW50KFJlZ2lvbkZyYWdtZW50IHJl Z2lvbkZyYWdtZW50KSB7IFNFVF9WQVIobV9yYXJlTm9uSW5oZXJpdGVkRGF0YSwgcmVnaW9uRnJh Z21lbnQsIHJlZ2lvbkZyYWdtZW50KTsgfQotCiAgICAgdm9pZCBzZXRQb2ludGVyRXZlbnRzKEVQ b2ludGVyRXZlbnRzIHApIHsgbV9pbmhlcml0ZWRGbGFncy5wb2ludGVyRXZlbnRzID0gcDsgfQog CiAgICAgdm9pZCBjbGVhckFuaW1hdGlvbnMoKTsKQEAgLTE2NDQsMTAgKzE2MzQsNiBAQCBwdWJs aWM6CiAgICAgc3RhdGljIExpbmVTbmFwIGluaXRpYWxMaW5lU25hcCgpIHsgcmV0dXJuIExpbmVT bmFwTm9uZTsgfQogICAgIHN0YXRpYyBMaW5lQWxpZ24gaW5pdGlhbExpbmVBbGlnbigpIHsgcmV0 dXJuIExpbmVBbGlnbk5vbmU7IH0KIAotICAgIHN0YXRpYyBjb25zdCBBdG9taWNTdHJpbmcmIGlu aXRpYWxGbG93VGhyZWFkKCkgeyByZXR1cm4gbnVsbEF0b20oKTsgfQotICAgIHN0YXRpYyBjb25z dCBBdG9taWNTdHJpbmcmIGluaXRpYWxSZWdpb25UaHJlYWQoKSB7IHJldHVybiBudWxsQXRvbSgp OyB9Ci0gICAgc3RhdGljIFJlZ2lvbkZyYWdtZW50IGluaXRpYWxSZWdpb25GcmFnbWVudCgpIHsg cmV0dXJuIEF1dG9SZWdpb25GcmFnbWVudDsgfQotCiAgICAgc3RhdGljIEludFNpemUgaW5pdGlh bEluaXRpYWxMZXR0ZXIoKSB7IHJldHVybiBJbnRTaXplKCk7IH0KICAgICBzdGF0aWMgTGluZUNs YW1wVmFsdWUgaW5pdGlhbExpbmVDbGFtcCgpIHsgcmV0dXJuIExpbmVDbGFtcFZhbHVlKCk7IH0K ICAgICBzdGF0aWMgRVRleHRTZWN1cml0eSBpbml0aWFsVGV4dFNlY3VyaXR5KCkgeyByZXR1cm4g VFNOT05FOyB9CkBAIC0yMjQ4LDcgKzIyMzQsNyBAQCBpbmxpbmUgdm9pZCBSZW5kZXJTdHlsZTo6 c2V0Qm94UmVmbGVjdChSCiAKIGlubGluZSBib29sIHBzZXVkb0VsZW1lbnRSZW5kZXJlcklzTmVl ZGVkKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkKIHsKLSAgICByZXR1cm4gc3R5bGUgJiYgc3R5 bGUtPmRpc3BsYXkoKSAhPSBOT05FICYmIChzdHlsZS0+Y29udGVudERhdGEoKSB8fCBzdHlsZS0+ aGFzRmxvd0Zyb20oKSk7CisgICAgcmV0dXJuIHN0eWxlICYmIHN0eWxlLT5kaXNwbGF5KCkgIT0g Tk9ORSAmJiBzdHlsZS0+Y29udGVudERhdGEoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3Rh bnRzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlQ29uc3RhbnRzLmgJKHJldmlzaW9uIDIyMjQzMikKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC02 MjgsOCArNjI4LDYgQEAgZW51bSBJbWFnZVJlc29sdXRpb25TbmFwIHsgSW1hZ2VSZXNvbHV0aQog CiBlbnVtIE9yZGVyIHsgTG9naWNhbE9yZGVyID0gMCwgVmlzdWFsT3JkZXIgfTsKIAotZW51bSBS ZWdpb25GcmFnbWVudCB7IEF1dG9SZWdpb25GcmFnbWVudCwgQnJlYWtSZWdpb25GcmFnbWVudCB9 OwotCiBlbnVtIENvbHVtbkF4aXMgeyBIb3Jpem9udGFsQ29sdW1uQXhpcywgVmVydGljYWxDb2x1 bW5BeGlzLCBBdXRvQ29sdW1uQXhpcyB9OwogCiBlbnVtIENvbHVtblByb2dyZXNzaW9uIHsgTm9y bWFsQ29sdW1uUHJvZ3Jlc3Npb24sIFJldmVyc2VDb2x1bW5Qcm9ncmVzc2lvbiB9OwpJbmRleDog U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJh cmVOb25Jbmhlcml0ZWREYXRhLmNwcAkocmV2aXNpb24gMjIyNDMyKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02OSw4ICs2OSw2IEBAIFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6OlN0eWxl UmFyZU5vbkkKICAgICAsIGNsaXBQYXRoKFJlbmRlclN0eWxlOjppbml0aWFsQ2xpcFBhdGgoKSkK ICAgICAsIHZpc2l0ZWRMaW5rQmFja2dyb3VuZENvbG9yKFJlbmRlclN0eWxlOjppbml0aWFsQmFj a2dyb3VuZENvbG9yKCkpCiAgICAgLCBvcmRlcihSZW5kZXJTdHlsZTo6aW5pdGlhbE9yZGVyKCkp Ci0gICAgLCBmbG93VGhyZWFkKFJlbmRlclN0eWxlOjppbml0aWFsRmxvd1RocmVhZCgpKQotICAg ICwgcmVnaW9uVGhyZWFkKFJlbmRlclN0eWxlOjppbml0aWFsUmVnaW9uVGhyZWFkKCkpCiAgICAg LCBhbGlnbkNvbnRlbnQoUmVuZGVyU3R5bGU6OmluaXRpYWxDb250ZW50QWxpZ25tZW50KCkpCiAg ICAgLCBhbGlnbkl0ZW1zKFJlbmRlclN0eWxlOjppbml0aWFsRGVmYXVsdEFsaWdubWVudCgpKQog ICAgICwgYWxpZ25TZWxmKFJlbmRlclN0eWxlOjppbml0aWFsU2VsZkFsaWdubWVudCgpKQpAQCAt ODAsNyArNzgsNiBAQCBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVOb25JCiAj aWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICAsIHRvdWNoQWN0aW9uKHN0YXRpY19jYXN0PHVu c2lnbmVkPihSZW5kZXJTdHlsZTo6aW5pdGlhbFRvdWNoQWN0aW9uKCkpKQogI2VuZGlmCi0gICAg LCByZWdpb25GcmFnbWVudChSZW5kZXJTdHlsZTo6aW5pdGlhbFJlZ2lvbkZyYWdtZW50KCkpCiAg ICAgLCBwYWdlU2l6ZVR5cGUoUEFHRV9TSVpFX0FVVE8pCiAgICAgLCB0cmFuc2Zvcm1TdHlsZTNE KFJlbmRlclN0eWxlOjppbml0aWFsVHJhbnNmb3JtU3R5bGUzRCgpKQogICAgICwgYmFja2ZhY2VW aXNpYmlsaXR5KFJlbmRlclN0eWxlOjppbml0aWFsQmFja2ZhY2VWaXNpYmlsaXR5KCkpCkBAIC0x NjIsOCArMTU5LDYgQEAgaW5saW5lIFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6OlN0eWxlUgog ICAgICwgdmlzaXRlZExpbmtCb3JkZXJUb3BDb2xvcihvLnZpc2l0ZWRMaW5rQm9yZGVyVG9wQ29s b3IpCiAgICAgLCB2aXNpdGVkTGlua0JvcmRlckJvdHRvbUNvbG9yKG8udmlzaXRlZExpbmtCb3Jk ZXJCb3R0b21Db2xvcikKICAgICAsIG9yZGVyKG8ub3JkZXIpCi0gICAgLCBmbG93VGhyZWFkKG8u Zmxvd1RocmVhZCkKLSAgICAsIHJlZ2lvblRocmVhZChvLnJlZ2lvblRocmVhZCkKICAgICAsIGFs aWduQ29udGVudChvLmFsaWduQ29udGVudCkKICAgICAsIGFsaWduSXRlbXMoby5hbGlnbkl0ZW1z KQogICAgICwgYWxpZ25TZWxmKG8uYWxpZ25TZWxmKQpAQCAtMTczLDcgKzE2OCw2IEBAIGlubGlu ZSBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpTdHlsZVIKICNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQogICAgICwgdG91Y2hBY3Rpb24oby50b3VjaEFjdGlvbikKICNlbmRpZgotICAgICwgcmVn aW9uRnJhZ21lbnQoby5yZWdpb25GcmFnbWVudCkKICAgICAsIHBhZ2VTaXplVHlwZShvLnBhZ2VT aXplVHlwZSkKICAgICAsIHRyYW5zZm9ybVN0eWxlM0Qoby50cmFuc2Zvcm1TdHlsZTNEKQogICAg ICwgYmFja2ZhY2VWaXNpYmlsaXR5KG8uYmFja2ZhY2VWaXNpYmlsaXR5KQpAQCAtMjY2LDE1ICsy NjAsMTIgQEAgYm9vbCBTdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhOjpvcGVyYXRvcgogICAgICAg ICAmJiB2aXNpdGVkTGlua0JvcmRlclRvcENvbG9yID09IG8udmlzaXRlZExpbmtCb3JkZXJUb3BD b2xvcgogICAgICAgICAmJiB2aXNpdGVkTGlua0JvcmRlckJvdHRvbUNvbG9yID09IG8udmlzaXRl ZExpbmtCb3JkZXJCb3R0b21Db2xvcgogICAgICAgICAmJiBvcmRlciA9PSBvLm9yZGVyCi0gICAg ICAgICYmIGZsb3dUaHJlYWQgPT0gby5mbG93VGhyZWFkCiAgICAgICAgICYmIGFsaWduQ29udGVu dCA9PSBvLmFsaWduQ29udGVudAogICAgICAgICAmJiBhbGlnbkl0ZW1zID09IG8uYWxpZ25JdGVt cwogICAgICAgICAmJiBhbGlnblNlbGYgPT0gby5hbGlnblNlbGYKICAgICAgICAgJiYganVzdGlm eUNvbnRlbnQgPT0gby5qdXN0aWZ5Q29udGVudAogICAgICAgICAmJiBqdXN0aWZ5SXRlbXMgPT0g by5qdXN0aWZ5SXRlbXMKICAgICAgICAgJiYganVzdGlmeVNlbGYgPT0gby5qdXN0aWZ5U2VsZgot ICAgICAgICAmJiByZWdpb25UaHJlYWQgPT0gby5yZWdpb25UaHJlYWQKLSAgICAgICAgJiYgcmVn aW9uRnJhZ21lbnQgPT0gby5yZWdpb25GcmFnbWVudAogICAgICAgICAmJiBwYWdlU2l6ZVR5cGUg PT0gby5wYWdlU2l6ZVR5cGUKICAgICAgICAgJiYgdHJhbnNmb3JtU3R5bGUzRCA9PSBvLnRyYW5z Zm9ybVN0eWxlM0QKICAgICAgICAgJiYgYmFja2ZhY2VWaXNpYmlsaXR5ID09IG8uYmFja2ZhY2VW aXNpYmlsaXR5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJl Tm9uSW5oZXJpdGVkRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmgJKHJldmlzaW9uIDIyMjQzMikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRh LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NCw5ICsxNjQsNiBAQCBwdWJsaWM6CiAKICAgICBpbnQg b3JkZXI7CiAKLSAgICBBdG9taWNTdHJpbmcgZmxvd1RocmVhZDsKLSAgICBBdG9taWNTdHJpbmcg cmVnaW9uVGhyZWFkOwotCiAgICAgU3R5bGVDb250ZW50QWxpZ25tZW50RGF0YSBhbGlnbkNvbnRl bnQ7CiAgICAgU3R5bGVTZWxmQWxpZ25tZW50RGF0YSBhbGlnbkl0ZW1zOwogICAgIFN0eWxlU2Vs ZkFsaWdubWVudERhdGEgYWxpZ25TZWxmOwpAQCAtMTc4LDEzICsxNzUsMTAgQEAgcHVibGljOgog ICAgIHVuc2lnbmVkIHRvdWNoQWN0aW9uIDogMTsgLy8gVG91Y2hBY3Rpb24KICNlbmRpZgogCi0g ICAgdW5zaWduZWQgcmVnaW9uRnJhZ21lbnQgOiAxOyAvLyBSZWdpb25GcmFnbWVudAotCiAgICAg dW5zaWduZWQgcGFnZVNpemVUeXBlIDogMjsgLy8gUGFnZVNpemVUeXBlCiAgICAgdW5zaWduZWQg dHJhbnNmb3JtU3R5bGUzRCA6IDE7IC8vIEVUcmFuc2Zvcm1TdHlsZTNECiAgICAgdW5zaWduZWQg YmFja2ZhY2VWaXNpYmlsaXR5IDogMTsgLy8gRUJhY2tmYWNlVmlzaWJpbGl0eQogCi0KICAgICB1 bnNpZ25lZCB1c2VyRHJhZyA6IDI7IC8vIEVVc2VyRHJhZwogICAgIHVuc2lnbmVkIHRleHRPdmVy ZmxvdyA6IDE7IC8vIFdoZXRoZXIgb3Igbm90IGxpbmVzIHRoYXQgc3BpbGwgb3V0IHNob3VsZCBi ZSB0cnVuY2F0ZWQgd2l0aCAiLi4uIgogICAgIHVuc2lnbmVkIG1hcmdpbkJlZm9yZUNvbGxhcHNl IDogMjsgLy8gRU1hcmdpbkNvbGxhcHNlCg==