139218 2014-12-02 19:29:47 -0800 Move 'display' CSS property to the new StyleBuilder 2014-12-03 09:22:57 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 cdumez cdumez commit-queue kling koivisto ossy sam oldest_to_newest 1052065 0 cdumez 2014-12-02 19:29:47 -0800 Move 'display' CSS property to the new StyleBuilder 1052073 1 242478 cdumez 2014-12-02 20:26:38 -0800 Created attachment 242478 Patch 1052138 2 242478 commit-queue 2014-12-03 06:45:48 -0800 Comment on attachment 242478 Patch Clearing flags on attachment: 242478 Committed r176721: <http://trac.webkit.org/changeset/176721> 1052139 3 commit-queue 2014-12-03 06:45:52 -0800 All reviewed patches have been landed. Closing bug. 1052152 4 ossy 2014-12-03 07:36:56 -0800 ( typo fix: https://trac.webkit.org/changeset/176722 fixed the build after r176719 and not after r176721. ) 1052172 5 cdumez 2014-12-03 09:22:57 -0800 (In reply to comment #4) > ( typo fix: https://trac.webkit.org/changeset/176722 fixed the build after > r176719 and not after r176721. ) Thanks Ossy. 242478 2014-12-02 20:26:38 -0800 2014-12-03 06:45:48 -0800 Patch bug-139218-20141202202709.patch text/plain 13317 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRkOTZkNGI0NWQ2ZDJk YzZhYjQ3Y2IwMDViYjc1N2UxOWQwYWQxOC4uOGRkZmUxNGI4ZjdjODUxZTdkYTY3ZGI3MmQ4NjUx YWI0ZDFlNmViNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE0LTEyLTAyICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSAnZGlzcGxheScgQ1NT IHByb3BlcnR5IHRvIHRoZSBuZXcgU3R5bGVCdWlsZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkyMTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlICdkaXNwbGF5JyBDU1MgcHJvcGVydHkgdG8g dGhlIG5ldyBTdHlsZUJ1aWxkZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlv ciBjaGFuZ2UuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAg KiBjc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEZXBy ZWNhdGVkU3R5bGVCdWlsZGVyOjpEZXByZWNhdGVkU3R5bGVCdWlsZGVyKToKKyAgICAgICAgKFdl YkNvcmU6OkFwcGx5UHJvcGVydHlEaXNwbGF5Ojppc1ZhbGlkRGlzcGxheVZhbHVlKTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlEaXNwbGF5OjphcHBseUluaGVyaXRW YWx1ZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpBcHBseVByb3BlcnR5RGlzcGxheTo6 YXBwbHlJbml0aWFsVmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9w ZXJ0eURpc3BsYXk6OmFwcGx5VmFsdWUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6QXBw bHlQcm9wZXJ0eURpc3BsYXk6OmNyZWF0ZUhhbmRsZXIpOiBEZWxldGVkLgorICAgICAgICAqIGNz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1 c3RvbTo6aXNWYWxpZERpc3BsYXlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxk ZXJDdXN0b206OmFwcGx5SW5oZXJpdERpc3BsYXkpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlRGlzcGxheSk6CisgICAgICAgICogY3NzL21ha2Vwcm9w LnBsOgorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgcGFzc2luZyBtdWx0aXBsZSB2YWx1ZXMgZm9y IEN1c3RvbSBvcHRpb24sIGUuZy46CisgICAgICAgICdDdXN0b209SW5oZXJpdHxWYWx1ZScuIFRo aXMgd2FzIHVzZWZ1bCBhcyB3ZSBkaWQgbm90IG5lZWQgY3VzdG9tCisgICAgICAgIGNvZGUgZm9y IGRpc3BsYXkncyBpbml0aWFsIHZhbHVlLgorCiAyMDE0LTEyLTAyICBHeXV5b3VuZyBLaW0gIDxn eXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAgRml4IGJ1aWxkIGJyZWFrIEVGTCBw b3J0IHNpbmNlIHIxNzY2OTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0eU5hbWVzLmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KaW5k ZXggYjU4MzUyOTI1YmUyOTljYzEyNDU4ODY4ZTI3MDdhNWQ3NzAyNjM4ZC4uNzAxOTc2MjgyZDNk YzgwY2I1MjkxNmFkMzlmOTg3ZGJiZDUzN2FhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3Bl cnR5TmFtZXMuaW4KQEAgLTQ0LDIwICs0NCwyNSBAQAogLy8gY2FuIGluZGljYXRlIHRoYXQgYSBD b252ZXJ0ZXIgaGVscGVyIGZ1bmN0aW9uIGluCiAvLyBjc3MvU3R5bGVCdWlsZGVyQ29udmVydGVy Lmggc2hvdWxkIGJlIHVzZWQuCiAvLwotLy8gKiBDdXN0b209W1ZhbHVlfEFsbF06CisvLyAqIEN1 c3RvbT1bSW5pdGlhbHxWYWx1ZXxJbmhlcml0fEFsbF06CisvLyBDdXN0b209SW5pdGlhbCBvcHRp b24gaXMgdXNlZCB0byBpbmRpY2F0ZSB0aGF0IHRoZSBDU1MgcHJvcGVydHkgcmVxdWlyZXMKKy8v IHNwZWNpYWwgaGFuZGxpbmcgdG8gc2V0IGl0cyBpbml0aWFsIHZhbHVlLgorLy8gQ3VzdG9tPUlu aGVyaXQgb3B0aW9uIGlzIHVzZWQgdG8gaW5kaWNhdGUgdGhhdCB0aGUgQ1NTIHByb3BlcnR5IHJl cXVpcmVzCisvLyBzcGVjaWFsIGhhbmRsaW5nIHRvIHNldCBpdHMgaW5oZXJpdCB2YWx1ZS4KIC8v IEN1c3RvbT1WYWx1ZSBvcHRpb24gaXMgdXNlZCB0byBpbmRpY2F0ZSB0aGF0IHRoZSBDU1MgcHJv cGVydHkgcmVxdWlyZXMgc3BlY2lhbAogLy8gaGFuZGxpbmcgdG8gc2V0IGl0cyB2YWx1ZSwgYW5k IGEgcmVndWxhciBDb252ZXJ0ZXIgaGVscGVyIGNhbm5vdCBiZQogLy8gdXNlZC4gVGhlIEN1c3Rv bSBjb2RlIGZvciB0aGUgcHJvcGVydHkgc2hvdWxkIGJlIGxvY2F0ZWQgaW4KIC8vIGNzcy9TdHls ZUJ1aWxkZXJDdXN0b20uaCBhbmQgbmFtZWQgYXBwbHlWYWx1ZVtDU1NQcm9wZXJ0eU5hbWVdKCku CiAvLyBJZiBzcGVjaWFsIGhhbmRsaW5nIGlzIGFsc28gbmVlZGVkIHRvIGFwcGx5IGluaGVyaXQg b3IgaW5pdGlhbCB2YWx1ZSwgdXNlCi0vLyBDdXN0b209QWxsLgorLy8gQ3VzdG9tPUFsbC4gQWx0 ZXJuYXRpdmVseSwgc2V2ZXJhbCAnfCctc2VwYXJhdGVkIG9wdGlvbnMgY2FuIGJlIHBhc3NlZDoK Ky8vIGUuZy4gJ0N1c3RvbT1Jbmhlcml0fFZhbHVlIi4KIAogCiAvLyBoaWdoLXByaW9yaXR5IHBy b3BlcnR5IG5hbWVzIGhhdmUgdG8gYmUgbGlzdGVkIGZpcnN0LCB0byBzaW1wbGlmeSB0aGUgY2hl Y2sKIC8vIGZvciBhcHBseWluZyB0aGVtIGZpcnN0LgogY29sb3IgW0luaGVyaXRlZCwgTGVnYWN5 U3R5bGVCdWlsZGVyXQogZGlyZWN0aW9uIFtJbmhlcml0ZWQsIEN1c3RvbT1WYWx1ZV0KLWRpc3Bs YXkgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KK2Rpc3BsYXkgW0N1c3RvbT1Jbmhlcml0fFZhbHVlXQog Zm9udCBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1aWxkZXJdCiBmb250LWZhbWlseSBbSW5oZXJp dGVkLCBDdXN0b209QWxsXQogZm9udC1zaXplIFtJbmhlcml0ZWQsIExlZ2FjeVN0eWxlQnVpbGRl cl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRl eCA5OGJkYTc0NTc0ZTEzY2M2ZGNlMjNmZmEzMDc4NzU3Yjc0YWQ0M2JhLi4wNTRmNTJkOWJhZWEw NzAyY2UxNjUyMDAyZmEzYTJiN2FiYjRkNmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Rl cHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCkBAIC05NjcsNDcgKzk2Nyw2IEBAIHB1YmxpYzoKICAg ICB9CiB9OwogCi1jbGFzcyBBcHBseVByb3BlcnR5RGlzcGxheSB7Ci1wcml2YXRlOgotICAgIHN0 YXRpYyBpbmxpbmUgYm9vbCBpc1ZhbGlkRGlzcGxheVZhbHVlKFN0eWxlUmVzb2x2ZXIqIHN0eWxl UmVzb2x2ZXIsIEVEaXNwbGF5IGRpc3BsYXlQcm9wZXJ0eVZhbHVlKQotICAgIHsKLSAgICAgICAg aWYgKHN0eWxlUmVzb2x2ZXItPmVsZW1lbnQoKSAmJiBzdHlsZVJlc29sdmVyLT5lbGVtZW50KCkt PmlzU1ZHRWxlbWVudCgpICYmIHN0eWxlUmVzb2x2ZXItPnN0eWxlKCktPnN0eWxlVHlwZSgpID09 IE5PUFNFVURPKQotICAgICAgICAgICAgcmV0dXJuIChkaXNwbGF5UHJvcGVydHlWYWx1ZSA9PSBJ TkxJTkUgfHwgZGlzcGxheVByb3BlcnR5VmFsdWUgPT0gQkxPQ0sgfHwgZGlzcGxheVByb3BlcnR5 VmFsdWUgPT0gTk9ORSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0KLXB1YmxpYzoKLSAg ICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXRWYWx1ZShDU1NQcm9wZXJ0eUlELCBTdHlsZVJlc29s dmVyKiBzdHlsZVJlc29sdmVyKQotICAgIHsKLSAgICAgICAgRURpc3BsYXkgZGlzcGxheSA9IHN0 eWxlUmVzb2x2ZXItPnBhcmVudFN0eWxlKCktPmRpc3BsYXkoKTsKLSAgICAgICAgaWYgKCFpc1Zh bGlkRGlzcGxheVZhbHVlKHN0eWxlUmVzb2x2ZXIsIGRpc3BsYXkpKQotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICBzdHlsZVJlc29sdmVyLT5zdHlsZSgpLT5zZXREaXNwbGF5KGRpc3BsYXkp OwotICAgIH0KLQotICAgIHN0YXRpYyB2b2lkIGFwcGx5SW5pdGlhbFZhbHVlKENTU1Byb3BlcnR5 SUQsIFN0eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIpCi0gICAgewotICAgICAgICBzdHlsZVJl c29sdmVyLT5zdHlsZSgpLT5zZXREaXNwbGF5KFJlbmRlclN0eWxlOjppbml0aWFsRGlzcGxheSgp KTsKLSAgICB9Ci0KLSAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlKENTU1Byb3BlcnR5SUQsIFN0 eWxlUmVzb2x2ZXIqIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlKiB2YWx1ZSkKLSAgICB7Ci0gICAg ICAgIGlmICghaXM8Q1NTUHJpbWl0aXZlVmFsdWU+KCp2YWx1ZSkpCi0gICAgICAgICAgICByZXR1 cm47Ci0KLSAgICAgICAgRURpc3BsYXkgZGlzcGxheSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZh bHVlPigqdmFsdWUpOwotCi0gICAgICAgIGlmICghaXNWYWxpZERpc3BsYXlWYWx1ZShzdHlsZVJl c29sdmVyLCBkaXNwbGF5KSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBzdHlsZVJl c29sdmVyLT5zdHlsZSgpLT5zZXREaXNwbGF5KGRpc3BsYXkpOwotICAgIH0KLQotICAgIHN0YXRp YyBQcm9wZXJ0eUhhbmRsZXIgY3JlYXRlSGFuZGxlcigpCi0gICAgewotICAgICAgICByZXR1cm4g UHJvcGVydHlIYW5kbGVyKCZhcHBseUluaGVyaXRWYWx1ZSwgJmFwcGx5SW5pdGlhbFZhbHVlLCAm YXBwbHlWYWx1ZSk7Ci0gICAgfQotfTsKLQogY29uc3QgRGVwcmVjYXRlZFN0eWxlQnVpbGRlciYg RGVwcmVjYXRlZFN0eWxlQnVpbGRlcjo6c2hhcmVkU3R5bGVCdWlsZGVyKCkKIHsKICAgICBzdGF0 aWMgTmV2ZXJEZXN0cm95ZWQ8RGVwcmVjYXRlZFN0eWxlQnVpbGRlcj4gc3R5bGVCdWlsZGVySW5z dGFuY2U7CkBAIC0xMDM5LDcgKzk5OCw2IEBAIERlcHJlY2F0ZWRTdHlsZUJ1aWxkZXI6OkRlcHJl Y2F0ZWRTdHlsZUJ1aWxkZXIoKQogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUNv dW50ZXJJbmNyZW1lbnQsIEFwcGx5UHJvcGVydHlDb3VudGVyPEluY3JlbWVudD46OmNyZWF0ZUhh bmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q291bnRlclJlc2V0 LCBBcHBseVByb3BlcnR5Q291bnRlcjxSZXNldD46OmNyZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0 UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Q3Vyc29yLCBBcHBseVByb3BlcnR5Q3Vyc29yOjpj cmVhdGVIYW5kbGVyKCkpOwotICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eURpc3Bs YXksIEFwcGx5UHJvcGVydHlEaXNwbGF5OjpjcmVhdGVIYW5kbGVyKCkpOwogICAgIHNldFByb3Bl cnR5SGFuZGxlcihDU1NQcm9wZXJ0eUZvbnRTaXplLCBBcHBseVByb3BlcnR5Rm9udFNpemU6OmNy ZWF0ZUhhbmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFN0 eWxlLCBBcHBseVByb3BlcnR5Rm9udDxGb250SXRhbGljLCAmRm9udERlc2NyaXB0aW9uOjppdGFs aWMsICZGb250RGVzY3JpcHRpb246OnNldEl0YWxpYywgRm9udEl0YWxpY09mZj46OmNyZWF0ZUhh bmRsZXIoKSk7CiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5Rm9udFZhcmlhbnQs IEFwcGx5UHJvcGVydHlGb250PEZvbnRTbWFsbENhcHMsICZGb250RGVzY3JpcHRpb246OnNtYWxs Q2FwcywgJkZvbnREZXNjcmlwdGlvbjo6c2V0U21hbGxDYXBzLCBGb250U21hbGxDYXBzT2ZmPjo6 Y3JlYXRlSGFuZGxlcigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1 aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaApp bmRleCAxYmYxNzJlNzJlYzNlMTk0YzE5YjZkM2MzZGFlMWVmYTZjMThmNDRiLi4xNzc3M2YyOGE3 ZWY4NWVlNjM1N2EwMDBhOTE4MDY0NDE4NmI0Y2YyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl QnVpbGRlckN1c3RvbS5oCkBAIC0zNSw2ICszNSw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNp bmNsdWRlICJMb2NhbGVUb1NjcmlwdE1hcHBpbmcuaCIKICNpbmNsdWRlICJSZWN0LmgiCisjaW5j bHVkZSAiU1ZHRWxlbWVudC5oIgogI2luY2x1ZGUgIlN0eWxlRm9udFNpemVGdW5jdGlvbnMuaCIK ICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAKQEAgLTEyMSw2ICsxMjIsOSBAQCBwdWJsaWM6 CiAgICAgc3RhdGljIHZvaWQgYXBwbHlJbmhlcml0Rm9udEZhbWlseShTdHlsZVJlc29sdmVyJik7 CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUZvbnRGYW1pbHkoU3R5bGVSZXNvbHZlciYsIENT U1ZhbHVlJik7CiAKKyAgICBzdGF0aWMgdm9pZCBhcHBseUluaGVyaXREaXNwbGF5KFN0eWxlUmVz b2x2ZXImKTsKKyAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlRGlzcGxheShTdHlsZVJlc29sdmVy JiwgQ1NTVmFsdWUmKTsKKwogcHJpdmF0ZToKICAgICBzdGF0aWMgdm9pZCByZXNldEVmZmVjdGl2 ZVpvb20oU3R5bGVSZXNvbHZlciYpOwogICAgIHN0YXRpYyBDU1NUb0xlbmd0aENvbnZlcnNpb25E YXRhIGNzc3RvTGVuZ3RoQ29udmVyc2lvbkRhdGFXaXRoVGV4dFpvb21GYWN0b3IoU3R5bGVSZXNv bHZlciYpOwpAQCAtMTMyLDYgKzEzNiw3IEBAIHByaXZhdGU6CiAKICAgICB0ZW1wbGF0ZSA8Q1NT UHJvcGVydHlJRCBpZD4KICAgICBzdGF0aWMgdm9pZCBhcHBseVRleHRPckJveFNoYWRvd1ZhbHVl KFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOworICAgIHN0YXRpYyBib29sIGlzVmFsaWREaXNw bGF5VmFsdWUoU3R5bGVSZXNvbHZlciYsIEVEaXNwbGF5KTsKIH07CiAKIGlubGluZSB2b2lkIFN0 eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZVdlYmtpdE1hcnF1ZWVJbmNyZW1lbnQoU3R5bGVS ZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQpAQCAtOTgwLDYgKzk4NSwy NyBAQCBpbmxpbmUgdm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVGb250RmFtaWx5 KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZQogICAgIHN0eWxlUmVzb2x2ZXIuc2V0Rm9udERl c2NyaXB0aW9uKGZvbnREZXNjcmlwdGlvbik7CiB9CiAKK2lubGluZSBib29sIFN0eWxlQnVpbGRl ckN1c3RvbTo6aXNWYWxpZERpc3BsYXlWYWx1ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVy LCBFRGlzcGxheSBkaXNwbGF5KQoreworICAgIGlmIChpczxTVkdFbGVtZW50PihzdHlsZVJlc29s dmVyLmVsZW1lbnQoKSkgJiYgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zdHlsZVR5cGUoKSA9PSBO T1BTRVVETykKKyAgICAgICAgcmV0dXJuIGRpc3BsYXkgPT0gSU5MSU5FIHx8IGRpc3BsYXkgPT0g QkxPQ0sgfHwgZGlzcGxheSA9PSBOT05FOworICAgIHJldHVybiB0cnVlOworfQorCitpbmxpbmUg dm9pZCBTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5SW5oZXJpdERpc3BsYXkoU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlcikKK3sKKyAgICBFRGlzcGxheSBkaXNwbGF5ID0gc3R5bGVSZXNvbHZl ci5wYXJlbnRTdHlsZSgpLT5kaXNwbGF5KCk7CisgICAgaWYgKGlzVmFsaWREaXNwbGF5VmFsdWUo c3R5bGVSZXNvbHZlciwgZGlzcGxheSkpCisgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+ c2V0RGlzcGxheShkaXNwbGF5KTsKK30KKworaW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9t OjphcHBseVZhbHVlRGlzcGxheShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1 ZSYgdmFsdWUpCit7CisgICAgRURpc3BsYXkgZGlzcGxheSA9IGRvd25jYXN0PENTU1ByaW1pdGl2 ZVZhbHVlPih2YWx1ZSk7CisgICAgaWYgKGlzVmFsaWREaXNwbGF5VmFsdWUoc3R5bGVSZXNvbHZl ciwgZGlzcGxheSkpCisgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0RGlzcGxheShk aXNwbGF5KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gU3R5bGVC dWlsZGVyQ3VzdG9tX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5w bCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9tYWtlcHJvcC5wbAppbmRleCBhMWQyOWQ0ODEyZjcxMDBk YTM1NjNkMjhmNWMwMGRiNDNmMjJiNzcyLi5lYjhjODU1MzU1Y2RmNDU1NDg2ZWY0NjhhMzE5ZWUw NjJjYTYyYWMwIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvbWFrZXByb3AucGwKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL21ha2Vwcm9wLnBsCkBAIC0zMzAsNiArMzMwLDEzIEBAIGNs b3NlIEhFQURFUjsKICMgU3R5bGVCdWlsZGVyLmNwcCBnZW5lcmF0b3IuCiAjCiAKK3N1YiBnZXRT Y29wZUZvckZ1bmN0aW9uIHsKKyAgbXkgJG5hbWUgPSBzaGlmdDsKKyAgbXkgJGJ1aWxkZXJGdW5j dGlvbiA9IHNoaWZ0OworCisgIHJldHVybiAkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRp b25zeyRuYW1lfXsiQ3VzdG9tIn17JGJ1aWxkZXJGdW5jdGlvbn0gPyAiU3R5bGVCdWlsZGVyQ3Vz dG9tIiA6ICJTdHlsZUJ1aWxkZXJGdW5jdGlvbnMiOworfQorCiBmb3JlYWNoIG15ICRuYW1lIChA bmFtZXMpIHsKICAgIyBTa2lwIHByb3BlcnRpZXMgc3RpbGwgdXNpbmcgdGhlIGxlZ2FjeSBzdHls ZSBidWlsZGVyLgogICBuZXh0IHVubGVzcyBleGlzdHMoJHByb3BlcnRpZXNXaXRoU3R5bGVCdWls ZGVyT3B0aW9uc3skbmFtZX0pOwpAQCAtMzUzLDggKzM2MCwxMiBAQCBmb3JlYWNoIG15ICRuYW1l IChAbmFtZXMpIHsKICAgICAkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRuYW1l fXsiSW5pdGlhbCJ9ID0gImluaXRpYWwiIC4gJG5hbWVGb3JNZXRob2RzOwogICB9CiAgIGlmICgh ZXhpc3RzKCRwcm9wZXJ0aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9eyJDdXN0b20i fSkpIHsKLSAgICAkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRuYW1lfXsiQ3Vz dG9tIn0gPSAiTm9uZSI7CisgICAgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3sk bmFtZX17IkN1c3RvbSJ9ID0gIiI7CisgIH0gZWxzaWYgKCRwcm9wZXJ0aWVzV2l0aFN0eWxlQnVp bGRlck9wdGlvbnN7JG5hbWV9eyJDdXN0b20ifSBlcSAiQWxsIikgeworICAgICRwcm9wZXJ0aWVz V2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9eyJDdXN0b20ifSA9ICJJbml0aWFsfEluaGVy aXR8VmFsdWUiOwogICB9CisgIG15ICVjdXN0b21WYWx1ZXMgPSBtYXAgeyAkXyA9PiAxIH0gc3Bs aXQoL1x8LywgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17IkN1c3Rv bSJ9KTsKKyAgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17IkN1c3Rv bSJ9ID0gXCVjdXN0b21WYWx1ZXM7CiB9CiAKIG9wZW4gU1RZTEVCVUlMREVSLCAiPlN0eWxlQnVp bGRlci5jcHAiIHx8IGRpZSAiQ291bGQgbm90IG9wZW4gU3R5bGVCdWlsZGVyLmNwcCBmb3Igd3Jp dGluZyI7CkBAIC0zODAsMTggKzM5MSwyMCBAQCBmb3JlYWNoIG15ICRuYW1lIChAbmFtZXMpIHsK ICAgIyBTa2lwIHByb3BlcnRpZXMgc3RpbGwgdXNpbmcgdGhlIGxlZ2FjeSBzdHlsZSBidWlsZGVy LgogICBuZXh0IHVubGVzcyBleGlzdHMoJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9u c3skbmFtZX0pOwogCi0gIG5leHQgaWYgJHByb3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9u c3skbmFtZX17IkN1c3RvbSJ9IGVxICJBbGwiOwotCiAgIG15ICRzZXRWYWx1ZSA9ICJzdHlsZVJl c29sdmVyLnN0eWxlKCktPiIgLiAkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRu YW1lfXsiU2V0dGVyIn07Ci0gIHByaW50IFNUWUxFQlVJTERFUiAiICAgIGlubGluZSB2b2lkIGFw cGx5SW5pdGlhbCIgLiAkbmFtZVRvSWR7JG5hbWV9IC4gIihTdHlsZVJlc29sdmVyJiBzdHlsZVJl c29sdmVyKVxuIjsKLSAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAge1xuIjsKLSAgcHJpbnQgU1RZ TEVCVUlMREVSICIgICAgICAgICIgLiAkc2V0VmFsdWUgLiAiKFJlbmRlclN0eWxlOjoiIC4gJHBy b3BlcnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17IkluaXRpYWwifSAuICIoKSk7 XG4iOwotICBwcmludCBTVFlMRUJVSUxERVIgIiAgICB9XG4iOwotICBwcmludCBTVFlMRUJVSUxE RVIgIiAgICBpbmxpbmUgdm9pZCBhcHBseUluaGVyaXQiIC4gJG5hbWVUb0lkeyRuYW1lfSAuICIo U3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlcilcbiI7Ci0gIHByaW50IFNUWUxFQlVJTERFUiAi ICAgIHtcbiI7Ci0gIHByaW50IFNUWUxFQlVJTERFUiAiICAgICAgICAiIC4gJHNldFZhbHVlIC4g IihzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPiIgLiAgJHByb3BlcnRpZXNXaXRoU3R5bGVC dWlsZGVyT3B0aW9uc3skbmFtZX17IkdldHRlciJ9IC4gIigpKTtcbiI7Ci0gIHByaW50IFNUWUxF QlVJTERFUiAiICAgIH1cbiI7Ci0gIGlmICgkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRp b25zeyRuYW1lfXsiQ3VzdG9tIn0gbmUgIlZhbHVlIikgeworICBpZiAoISRwcm9wZXJ0aWVzV2l0 aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9eyJDdXN0b20ifXsiSW5pdGlhbCJ9KSB7CisgICAg cHJpbnQgU1RZTEVCVUlMREVSICIgICAgaW5saW5lIHZvaWQgYXBwbHlJbml0aWFsIiAuICRuYW1l VG9JZHskbmFtZX0gLiAiKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIpXG4iOworICAgIHBy aW50IFNUWUxFQlVJTERFUiAiICAgIHtcbiI7CisgICAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAg ICAgICIgLiAkc2V0VmFsdWUgLiAiKFJlbmRlclN0eWxlOjoiIC4gJHByb3BlcnRpZXNXaXRoU3R5 bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17IkluaXRpYWwifSAuICIoKSk7XG4iOworICAgIHByaW50 IFNUWUxFQlVJTERFUiAiICAgIH1cbiI7CisgIH0KKyAgaWYgKCEkcHJvcGVydGllc1dpdGhTdHls ZUJ1aWxkZXJPcHRpb25zeyRuYW1lfXsiQ3VzdG9tIn17IkluaGVyaXQifSkgeworICAgIHByaW50 IFNUWUxFQlVJTERFUiAiICAgIGlubGluZSB2b2lkIGFwcGx5SW5oZXJpdCIgLiAkbmFtZVRvSWR7 JG5hbWV9IC4gIihTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyKVxuIjsKKyAgICBwcmludCBT VFlMRUJVSUxERVIgIiAgICB7XG4iOworICAgIHByaW50IFNUWUxFQlVJTERFUiAiICAgICAgICAi IC4gJHNldFZhbHVlIC4gIihzdHlsZVJlc29sdmVyLnBhcmVudFN0eWxlKCktPiIgLiAgJHByb3Bl cnRpZXNXaXRoU3R5bGVCdWlsZGVyT3B0aW9uc3skbmFtZX17IkdldHRlciJ9IC4gIigpKTtcbiI7 CisgICAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAgfVxuIjsKKyAgfQorICBpZiAoISRwcm9wZXJ0 aWVzV2l0aFN0eWxlQnVpbGRlck9wdGlvbnN7JG5hbWV9eyJDdXN0b20ifXsiVmFsdWUifSkgewog ICAgIHByaW50IFNUWUxFQlVJTERFUiAiICAgIGlubGluZSB2b2lkIGFwcGx5VmFsdWUiIC4gJG5h bWVUb0lkeyRuYW1lfSAuICIoU3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUm IHZhbHVlKVxuIjsKICAgICBwcmludCBTVFlMRUJVSUxERVIgIiAgICB7XG4iOwogICAgIG15ICRj b252ZXJ0ZWRWYWx1ZTsKQEAgLTQxNywxNiArNDMwLDEzIEBAIGZvcmVhY2ggbXkgJG5hbWUgKEBu YW1lcykgewogICAjIFNraXAgcHJvcGVydGllcyBzdGlsbCB1c2luZyB0aGUgbGVnYWN5IHN0eWxl IGJ1aWxkZXIuCiAgIG5leHQgdW5sZXNzIGV4aXN0cygkcHJvcGVydGllc1dpdGhTdHlsZUJ1aWxk ZXJPcHRpb25zeyRuYW1lfSk7CiAKLSAgbXkgJHNjb3BlID0gJHByb3BlcnRpZXNXaXRoU3R5bGVC dWlsZGVyT3B0aW9uc3skbmFtZX17IkN1c3RvbSJ9IGVxICJBbGwiID8gIlN0eWxlQnVpbGRlckN1 c3RvbSIgOiAiU3R5bGVCdWlsZGVyRnVuY3Rpb25zIjsKLSAgbXkgJHZhbHVlU2NvcGUgPSAkcHJv cGVydGllc1dpdGhTdHlsZUJ1aWxkZXJPcHRpb25zeyRuYW1lfXsiQ3VzdG9tIn0gZXEgIlZhbHVl IiA/ICJTdHlsZUJ1aWxkZXJDdXN0b20iIDogJHNjb3BlOwotCiAgIHByaW50IFNUWUxFQlVJTERF UiAiICAgIGNhc2UgQ1NTUHJvcGVydHkiIC4gJG5hbWVUb0lkeyRuYW1lfSAuICI6XG4iOwogICBw cmludCBTVFlMRUJVSUxERVIgIiAgICAgICAgaWYgKGlzSW5pdGlhbClcbiI7Ci0gIHByaW50IFNU WUxFQlVJTERFUiAiICAgICAgICAgICAgIiAuICRzY29wZSAuICI6OmFwcGx5SW5pdGlhbCIgLiAk bmFtZVRvSWR7JG5hbWV9IC4gIihzdHlsZVJlc29sdmVyKTtcbiI7CisgIHByaW50IFNUWUxFQlVJ TERFUiAiICAgICAgICAgICAgIiAuIGdldFNjb3BlRm9yRnVuY3Rpb24oJG5hbWUsICJJbml0aWFs IikgLiAiOjphcHBseUluaXRpYWwiIC4gJG5hbWVUb0lkeyRuYW1lfSAuICIoc3R5bGVSZXNvbHZl cik7XG4iOwogICBwcmludCBTVFlMRUJVSUxERVIgIiAgICAgICAgZWxzZSBpZiAoaXNJbmhlcml0 KVxuIjsKLSAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAgICAgICAgICAiIC4gJHNjb3BlIC4gIjo6 YXBwbHlJbmhlcml0IiAuICRuYW1lVG9JZHskbmFtZX0gLiAiKHN0eWxlUmVzb2x2ZXIpO1xuIjsK KyAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAgICAgICAgICAiIC4gZ2V0U2NvcGVGb3JGdW5jdGlv bigkbmFtZSwgIkluaGVyaXQiKSAuICI6OmFwcGx5SW5oZXJpdCIgLiAkbmFtZVRvSWR7JG5hbWV9 IC4gIihzdHlsZVJlc29sdmVyKTtcbiI7CiAgIHByaW50IFNUWUxFQlVJTERFUiAiICAgICAgICBl bHNlXG4iOwotICBwcmludCBTVFlMRUJVSUxERVIgIiAgICAgICAgICAgICIgLiAkdmFsdWVTY29w ZSAuICI6OmFwcGx5VmFsdWUiIC4gJG5hbWVUb0lkeyRuYW1lfSAuICIoc3R5bGVSZXNvbHZlciwg dmFsdWUpO1xuIjsKKyAgcHJpbnQgU1RZTEVCVUlMREVSICIgICAgICAgICAgICAiIC4gZ2V0U2Nv cGVGb3JGdW5jdGlvbigkbmFtZSwgIlZhbHVlIikgLiAiOjphcHBseVZhbHVlIiAuICRuYW1lVG9J ZHskbmFtZX0gLiAiKHN0eWxlUmVzb2x2ZXIsIHZhbHVlKTtcbiI7CiAgIHByaW50IFNUWUxFQlVJ TERFUiAiICAgICAgICByZXR1cm4gdHJ1ZTtcbiI7CiB9CiAK