15722 2007-10-27 02:35:21 -0700 [GTK] Refactor gtk/RenderThemeGtk and implement a few more methods 2007-10-27 03:52:16 -0700 1 1 1 Unclassified WebKit WebKitGTK 523.x (Safari 3) PC Linux RESOLVED FIXED Gtk P3 Enhancement --- 0 jmalonzo webkit-unassigned oldest_to_newest 59610 0 jmalonzo 2007-10-27 02:35:21 -0700 The attached patch refactors RenderThemeGtk and tries to make the implementation consistent with the Qt and Safari ports. Some of the implementation are copied and pasted from Qt or Safari. Comments welcome. 59611 1 16898 jmalonzo 2007-10-27 02:36:11 -0700 Created attachment 16898 RenderThemeGtk refactor patch 59615 2 alp 2007-10-27 03:52:16 -0700 Landed in r27147 with one brace position coding style fix and some fixes to the ChangeLog entry (should use spaces, not tabs, and provide the bug URL). 16898 2007-10-27 02:36:11 -0700 2007-10-27 03:50:59 -0700 RenderThemeGtk refactor patch renderthemegtk.refactor.patch text/plain 10122 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmM0ZDljMC4uMDc1ZDkwMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwNy0xMC0yNyAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9AdW5wbHVnZ2FibGUuY29tPgorCisJUmVmYWN0b3IvZW5oYW5jZSBH VEsgUmVuZGVyVGhlbWUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENIQU5HRUQKKworICAgICAg ICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZUd0azo6c3VwcG9ydHNGb2N1cyk6IGFkZGVkIFRleHRBcmVhLAorCU1lbnVsaXN0 LCBSYWRpbywgYW5kIENoZWNrYm94IEFwcGVhcmFuY2VzCisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZUd0azo6c3VwcG9ydHNGb2N1c1JpbmcpOiBjYWxsCisJc3VwcG9ydHNGb2N1cygpIHRv IGNoZWNrIGlmIGZvY3VzIG9uIGFwcGVhcmFuY2UgaXMgc3VwcG9ydGVkCisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJUaGVtZUd0azo6Y29udHJvbFN1cHBvcnRzVGludHMpOiBjb3BpZWQgZnJvbSBR dAorCWFuZCBTYWZhcmkgcG9ydHMKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpi YXNlbGluZVBvc2l0aW9uKTogY29waWVkIGZyb20gUXQgYW5kCisJU2FmYXJpIHBvcnRzCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRDaGVja2JveCk6IG1vdmVkIHBhaW50 aW5nIGluIHBhaW50QnV0dG9uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFp bnRSYWRpbyk6IG1vdmVkIHBhaW50aW5nIGluIHBhaW50QnV0dG9uCisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJUaGVtZUd0azo6cGFpbnRCdXR0b24pOiBwYWludCB0aGUgZGlmZmVyZW50CisJYnV0 dG9ucyBoZXJlLCBjaGVja2luZyBmb3IgdGhlIHJpZ2h0IGFwcGVhcmFuY2UgYmVmb3JlIGRvaW5n IHNvCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFpbnRNZW51TGlzdCk6IHVz ZSAwIGluc3RlYWQgb2YgTlVMTHMKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjph ZGp1c3RUZXh0RmllbGRTdHlsZSk6CisJKFdlYkNvcmU6OlJlbmRlclRoZW1lR3RrOjpnZXRUaGVt ZURhdGEpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5oOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OnN1cHBvcnRzQ29udHJvbFRpbnRzKToKKwogMjAw Ny0xMC0yNyAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5k ZXJUaGVtZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAK aW5kZXggNjk0NTNiMC4uZDRiNWUwOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVHdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1l R3RrLmNwcApAQCAtMTEyLDIwICsxMTIsNDcgQEAgdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRkSW50 cmluc2ljTWFyZ2lucyhSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAgICAgfQogfQogCi1ib29s IFJlbmRlclRoZW1lR3RrOjpzdXBwb3J0c0ZvY3VzKEVBcHBlYXJhbmNlIGFwcGVhcmFuY2UpCiti b29sIFJlbmRlclRoZW1lR3RrOjpzdXBwb3J0c0ZvY3VzKEVBcHBlYXJhbmNlIGFwcGVhcmFuY2Up IGNvbnN0CiB7CiAgICAgc3dpdGNoIChhcHBlYXJhbmNlKSB7CiAgICAgICAgIGNhc2UgUHVzaEJ1 dHRvbkFwcGVhcmFuY2U6CiAgICAgICAgIGNhc2UgQnV0dG9uQXBwZWFyYW5jZToKICAgICAgICAg Y2FzZSBUZXh0RmllbGRBcHBlYXJhbmNlOgorICAgICAgICBjYXNlIFRleHRBcmVhQXBwZWFyYW5j ZToKKyAgICAgICAgY2FzZSBNZW51bGlzdEFwcGVhcmFuY2U6CisgICAgICAgIGNhc2UgUmFkaW9B cHBlYXJhbmNlOgorICAgICAgICBjYXNlIENoZWNrYm94QXBwZWFyYW5jZToKICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgIH0KK30KIAotICAgIHJldHVybiBmYWxzZTsKK2Jvb2wgUmVuZGVyVGhlbWVHdGs6OnN1 cHBvcnRzRm9jdXNSaW5nKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QgCit7CisgICAg cmV0dXJuIHN1cHBvcnRzRm9jdXMoc3R5bGUtPmFwcGVhcmFuY2UoKSk7Cit9CisKK2Jvb2wgUmVu ZGVyVGhlbWVHdGs6OmNvbnRyb2xTdXBwb3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCogbykg Y29uc3QKK3sKKyAgICBpZiAoIWlzRW5hYmxlZChvKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgLy8gQ2hlY2tib3hlcyBoYXZlIHRpbnRzIHdoZW4gZW5hYmxlZC4KKyAgICBpZiAoby0+ c3R5bGUoKS0+YXBwZWFyYW5jZSgpID09IENoZWNrYm94QXBwZWFyYW5jZSkKKyAgICAgICAgcmV0 dXJuIGlzQ2hlY2tlZChvKTsKKworICAgIHJldHVybiB0cnVlOwogfQogCitzaG9ydCBSZW5kZXJU aGVtZUd0azo6YmFzZWxpbmVQb3NpdGlvbihjb25zdCBSZW5kZXJPYmplY3QqIG8pIGNvbnN0IAor eworICAgIGlmIChvLT5zdHlsZSgpLT5hcHBlYXJhbmNlKCkgPT0gQ2hlY2tib3hBcHBlYXJhbmNl IHx8CisgICAgICAgIG8tPnN0eWxlKCktPmFwcGVhcmFuY2UoKSA9PSBSYWRpb0FwcGVhcmFuY2Up CisgICAgICAgIHJldHVybiBvLT5tYXJnaW5Ub3AoKSArIG8tPmhlaWdodCgpIC0gMjsgLy8gU2Ft ZSBhcyBpbiBvbGQga2h0bWwKKyAgICByZXR1cm4gUmVuZGVyVGhlbWU6OmJhc2VsaW5lUG9zaXRp b24obyk7Cit9CisgICAgCiBHdGtTdGF0ZVR5cGUgUmVuZGVyVGhlbWVHdGs6OmRldGVybWluZVN0 YXRlKFJlbmRlck9iamVjdCogbykKIHsKICAgICBpZiAoIWlzRW5hYmxlZChvKSB8fCBpc1JlYWRP bmx5Q29udHJvbChvKSkKQEAgLTE1MiwyNSArMTc5LDI1IEBAIFRoZW1lRGF0YSBSZW5kZXJUaGVt ZUd0azo6Z2V0VGhlbWVEYXRhKFJlbmRlck9iamVjdCogbykKICAgICAgICAgY2FzZSBQdXNoQnV0 dG9uQXBwZWFyYW5jZToKICAgICAgICAgY2FzZSBCdXR0b25BcHBlYXJhbmNlOgogICAgICAgICAg ICAgcmVzdWx0Lm1fcGFydCA9IEJQX0JVVFRPTjsKLSAgICAgICAgICAgIHJlc3VsdC5tX3N0YXRl ID0gZGV0ZXJtaW5lU3RhdGUobyk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBD aGVja2JveEFwcGVhcmFuY2U6CiAgICAgICAgICAgICByZXN1bHQubV9wYXJ0ID0gQlBfQ0hFQ0tC T1g7Ci0gICAgICAgICAgICByZXN1bHQubV9zdGF0ZSA9IGRldGVybWluZVN0YXRlKG8pOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgUmFkaW9BcHBlYXJhbmNlOgogICAgICAgICAg ICAgcmVzdWx0Lm1fcGFydCA9IEJQX1JBRElPOwotICAgICAgICAgICAgcmVzdWx0Lm1fc3RhdGUg PSBkZXRlcm1pbmVTdGF0ZShvKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFRl eHRGaWVsZEFwcGVhcmFuY2U6CisgICAgICAgIGNhc2UgTGlzdGJveEFwcGVhcmFuY2U6CisgICAg ICAgIGNhc2UgTWVudWxpc3RBcHBlYXJhbmNlOgorICAgICAgICBjYXNlIFRleHRBcmVhQXBwZWFy YW5jZToKICAgICAgICAgICAgIHJlc3VsdC5tX3BhcnQgPSBURlBfVEVYVEZJRUxEOwotICAgICAg ICAgICAgcmVzdWx0Lm1fc3RhdGUgPSBkZXRlcm1pbmVTdGF0ZShvKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgLy8gRklYTUU6IG11Y2ggbW9yZT8K LSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgYnJlYWs7IC8vIEZJWE1FOiBtdWNoIG1v cmU/CiAgICAgfQogCisgICAgcmVzdWx0Lm1fc3RhdGUgPSBkZXRlcm1pbmVTdGF0ZShvKTsKKwog ICAgIHJldHVybiByZXN1bHQ7CiB9CiAKQEAgLTE4MSwxOSArMjA4LDE4IEBAIHZvaWQgUmVuZGVy VGhlbWVHdGs6OnNldENoZWNrYm94U2l6ZShSZW5kZXJTdHlsZSogc3R5bGUpIGNvbnN0CiAKIGJv b2wgUmVuZGVyVGhlbWVHdGs6OnBhaW50Q2hlY2tib3goUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBS ZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKLSAgICBH dGtXaWRnZXQqIGNoZWNrYm94ID0gZ3RrQ2hlY2tib3goKTsKLSAgICBJbnRQb2ludCBwb3MgPSBp LmNvbnRleHQtPnRyYW5zbGF0ZVBvaW50KHJlY3QubG9jYXRpb24oKSk7Ci0gICAgZ3RrX3BhaW50 X2NoZWNrKGNoZWNrYm94LT5zdHlsZSwgaS5jb250ZXh0LT5nZGtEcmF3YWJsZSgpLAotICAgICAg ICAgICAgICAgICAgICBkZXRlcm1pbmVTdGF0ZShvKSwgZGV0ZXJtaW5lU2hhZG93KG8pLAotICAg ICAgICAgICAgICAgICAgICBOVUxMLCBjaGVja2JveCwgImNoZWNrYnV0dG9uIiwKLSAgICAgICAg ICAgICAgICAgICAgcG9zLngoKSwgcG9zLnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgp KTsKKyAgICBwYWludEJ1dHRvbihvLCBpLCByZWN0KTsgICAgCisgICAgcmV0dXJuIGZhbHNlOwor fQogCitib29sIFJlbmRlclRoZW1lR3RrOjpwYWludFJhZGlvKFJlbmRlck9iamVjdCogbywgY29u c3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpCit7Cisg ICAgcGFpbnRCdXR0b24obywgaSwgcmVjdCk7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCiB2b2lk IFJlbmRlclRoZW1lR3RrOjpzZXRSYWRpb1NpemUoUmVuZGVyU3R5bGUqIHN0eWxlKSBjb25zdCAK IHsgCi0gICAgbm90SW1wbGVtZW50ZWQoKTsgCiAgICAgLy8gSWYgdGhlIHdpZHRoIGFuZCBoZWln aHQgYXJlIGJvdGggc3BlY2lmaWVkLCB0aGVuIHdlIGhhdmUgbm90aGluZyB0byBkby4KICAgICBp ZiAoIXN0eWxlLT53aWR0aCgpLmlzSW50cmluc2ljT3JBdXRvKCkgJiYgIXN0eWxlLT5oZWlnaHQo KS5pc0F1dG8oKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjExLDI2ICsyMzcsMzQgQEAgdm9pZCBS ZW5kZXJUaGVtZUd0azo6c2V0UmFkaW9TaXplKFJlbmRlclN0eWxlKiBzdHlsZSkgY29uc3QKICAg ICAgICAgc3R5bGUtPnNldEhlaWdodChMZW5ndGgoZmYsIEZpeGVkKSk7CiB9CiAKLWJvb2wgUmVu ZGVyVGhlbWVHdGs6OnBhaW50UmFkaW8oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmpl Y3Q6OlBhaW50SW5mbyYgaSwgY29uc3QgSW50UmVjdCYgcmVjdCkKLXsgCi0gICAgR3RrV2lkZ2V0 KiByYWRpbyA9IGd0a1JhZGlvQnV0dG9uKCk7Ci0gICAgSW50UG9pbnQgcG9zID0gaS5jb250ZXh0 LT50cmFuc2xhdGVQb2ludChyZWN0LmxvY2F0aW9uKCkpOwotICAgIGd0a19wYWludF9vcHRpb24o cmFkaW8tPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCi0gICAgICAgICAgICAgICAg ICAgICBkZXRlcm1pbmVTdGF0ZShvKSwgZGV0ZXJtaW5lU2hhZG93KG8pLAotICAgICAgICAgICAg ICAgICAgICAgTlVMTCwgcmFkaW8sICJyYWRpb2J1dHRvbiIsCi0gICAgICAgICAgICAgICAgICAg ICBwb3MueCgpLCBwb3MueSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwotCi0gICAg cmV0dXJuIGZhbHNlOwotfQotCiBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludEJ1dHRvbihSZW5k ZXJPYmplY3QqIG8sIGNvbnN0IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvJiBpLCBjb25zdCBJbnRS ZWN0JiByZWN0KSAKLXsgCi0gICAgR3RrV2lkZ2V0KiBidXR0b24gPSBndGtCdXR0b24oKTsKLSAg ICBJbnRQb2ludCBwb3MgPSBpLmNvbnRleHQtPnRyYW5zbGF0ZVBvaW50KHJlY3QubG9jYXRpb24o KSk7Ci0gICAgZ3RrX3BhaW50X2JveChidXR0b24tPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdh YmxlKCksCi0gICAgICAgICAgICAgICAgICBkZXRlcm1pbmVTdGF0ZShvKSwgZGV0ZXJtaW5lU2hh ZG93KG8pLAotICAgICAgICAgICAgICAgICAgTlVMTCwgYnV0dG9uLCAiYnV0dG9uIiwKLSAgICAg ICAgICAgICAgICAgIHBvcy54KCksIHBvcy55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQo KSk7Cit7CisgICAgRUFwcGVhcmFuY2UgYXBwZWFyYW5jZSA9IG8tPnN0eWxlKCktPmFwcGVhcmFu Y2UoKTsKKworICAgIGlmIChhcHBlYXJhbmNlID09IFB1c2hCdXR0b25BcHBlYXJhbmNlIHx8IGFw cGVhcmFuY2UgPT0gQnV0dG9uQXBwZWFyYW5jZSkKKyAgICB7CisgICAgICAgIEd0a1dpZGdldCog YnV0dG9uID0gZ3RrQnV0dG9uKCk7CisgICAgICAgIEludFBvaW50IHBvcyA9IGkuY29udGV4dC0+ dHJhbnNsYXRlUG9pbnQocmVjdC5sb2NhdGlvbigpKTsKKyAgICAgICAgZ3RrX3BhaW50X2JveChi dXR0b24tPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCisgICAgICAgICAgICAgICAg ICAgICAgZGV0ZXJtaW5lU3RhdGUobyksIGRldGVybWluZVNoYWRvdyhvKSwKKyAgICAgICAgICAg ICAgICAgICAgICAwLCBidXR0b24sICJidXR0b24iLAorICAgICAgICAgICAgICAgICAgICAgIHBv cy54KCksIHBvcy55KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisgICAgfSBlbHNl IGlmIChhcHBlYXJhbmNlID09IENoZWNrYm94QXBwZWFyYW5jZSkgeworICAgICAgICBHdGtXaWRn ZXQqIGNoZWNrYm94ID0gZ3RrQ2hlY2tib3goKTsKKyAgICAgICAgSW50UG9pbnQgcG9zID0gaS5j b250ZXh0LT50cmFuc2xhdGVQb2ludChyZWN0LmxvY2F0aW9uKCkpOworICAgICAgICBndGtfcGFp bnRfY2hlY2soY2hlY2tib3gtPnN0eWxlLCBpLmNvbnRleHQtPmdka0RyYXdhYmxlKCksCisgICAg ICAgICAgICAgICAgICAgICAgICBkZXRlcm1pbmVTdGF0ZShvKSwgZGV0ZXJtaW5lU2hhZG93KG8p LAorICAgICAgICAgICAgICAgICAgICAgICAgMCwgY2hlY2tib3gsICJjaGVja2J1dHRvbiIsCisg ICAgICAgICAgICAgICAgICAgICAgICBwb3MueCgpLCBwb3MueSgpLCByZWN0LndpZHRoKCksIHJl Y3QuaGVpZ2h0KCkpOworICAgIH0gZWxzZSBpZiAoYXBwZWFyYW5jZSA9PSBSYWRpb0FwcGVhcmFu Y2UpIHsKKyAgICAgICAgR3RrV2lkZ2V0KiByYWRpbyA9IGd0a1JhZGlvQnV0dG9uKCk7CisgICAg ICAgIEludFBvaW50IHBvcyA9IGkuY29udGV4dC0+dHJhbnNsYXRlUG9pbnQocmVjdC5sb2NhdGlv bigpKTsKKyAgICAgICAgZ3RrX3BhaW50X29wdGlvbihyYWRpby0+c3R5bGUsIGkuY29udGV4dC0+ Z2RrRHJhd2FibGUoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICBkZXRlcm1pbmVTdGF0ZShv KSwgZGV0ZXJtaW5lU2hhZG93KG8pLAorICAgICAgICAgICAgICAgICAgICAgICAgIDAsIHJhZGlv LCAicmFkaW9idXR0b24iLAorICAgICAgICAgICAgICAgICAgICAgICAgIHBvcy54KCksIHBvcy55 KCksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisgICAgfQorCiAgICAgcmV0dXJuIGZh bHNlOwogfQogCkBAIC0yNDYsMTkgKzI4MCwxOCBAQCBib29sIFJlbmRlclRoZW1lR3RrOjpwYWlu dE1lbnVMaXN0KFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZgog ICAgIEludFBvaW50IHBvcyA9IGkuY29udGV4dC0+dHJhbnNsYXRlUG9pbnQocmVjdC5sb2NhdGlv bigpKTsKICAgICBndGtfcGFpbnRfYm94KGJ1dHRvbi0+c3R5bGUsIGkuY29udGV4dC0+Z2RrRHJh d2FibGUoKSwKICAgICAgICAgICAgICAgICAgIGRldGVybWluZVN0YXRlKG8pLCBkZXRlcm1pbmVT aGFkb3cobyksCi0gICAgICAgICAgICAgICAgICBOVUxMLCBidXR0b24sIE5VTEwsCisgICAgICAg ICAgICAgICAgICAwLCBidXR0b24sIDAsCiAgICAgICAgICAgICAgICAgICBwb3MueCgpLCBwb3Mu eSgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogICAgIHJldHVybiBmYWxzZTsKIH0K IAotdm9pZCBSZW5kZXJUaGVtZUd0azo6YWRqdXN0VGV4dEZpZWxkU3R5bGUoQ1NTU3R5bGVTZWxl Y3RvciosIFJlbmRlclN0eWxlKiwgRWxlbWVudCogZSkgY29uc3QgCit2b2lkIFJlbmRlclRoZW1l R3RrOjphZGp1c3RUZXh0RmllbGRTdHlsZShDU1NTdHlsZVNlbGVjdG9yKiBzZWxlY3RvciwgUmVu ZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlKSBjb25zdCAKIHsgCi0gICAgbm90SW1wbGVtZW50 ZWQoKTsgCisgICAgYWRkSW50cmluc2ljTWFyZ2lucyhzdHlsZSk7CiB9CiAKIGJvb2wgUmVuZGVy VGhlbWVHdGs6OnBhaW50VGV4dEZpZWxkKFJlbmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2Jq ZWN0OjpQYWludEluZm8mIGksIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7Ci0gICAgLy8gRklYTUU6 IHNob3VsZCB1c2UgdGhlbWUtYXdhcmUgZHJhd2luZwogICAgIEd0a1dpZGdldCogZW50cnkgPSBn dGtFbnRyeSgpOwogICAgIEludFBvaW50IHBvcyA9IGkuY29udGV4dC0+dHJhbnNsYXRlUG9pbnQo cmVjdC5sb2NhdGlvbigpKTsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGsuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmgKaW5k ZXggYjkwNDlkZS4uMGI1Njg2YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGsuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5o CkBAIC00Nyw2ICs0NywyMCBAQCBwdWJsaWM6CiAgICAgLy8gQSBtZXRob2QgYXNraW5nIGlmIHRo ZSB0aGVtZSdzIGNvbnRyb2xzIGFjdHVhbGx5IGNhcmUgYWJvdXQgcmVkcmF3aW5nIHdoZW4gaG92 ZXJlZC4KICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNIb3Zlcihjb25zdCBSZW5kZXJTdHlsZSog c3R5bGUpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAorICAgIC8vIEEgbWV0aG9kIGFza2luZyBp ZiB0aGUgdGhlbWUgaXMgYWJsZSB0byBkcmF3IHRoZSBmb2N1cyByaW5nLgorICAgIHZpcnR1YWwg Ym9vbCBzdXBwb3J0c0ZvY3VzUmluZyhjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0OworCisgICAg Ly8gQSBtZXRob2QgYXNraW5nIGlmIHRoZSBjb250cm9sIGNoYW5nZXMgaXRzIHRpbnQgd2hlbiB0 aGUgd2luZG93IGhhcyBmb2N1cyBvciBub3QuCisgICAgdmlydHVhbCBib29sIGNvbnRyb2xTdXBw b3J0c1RpbnRzKGNvbnN0IFJlbmRlck9iamVjdCopIGNvbnN0OworCisgICAgLy8gQSBnZW5lcmFs IG1ldGhvZCBhc2tpbmcgaWYgYW55IGNvbnRyb2wgdGludGluZyBpcyBzdXBwb3J0ZWQgYXQgYWxs LgorICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0NvbnRyb2xUaW50cygpIGNvbnN0IHsgcmV0dXJu IHRydWU7IH0KKworICAgIC8vIEEgbWV0aG9kIHRvIG9idGFpbiB0aGUgYmFzZWxpbmUgcG9zaXRp b24gZm9yIGEgImxlYWYiIGNvbnRyb2wuICBUaGlzIHdpbGwgb25seSBiZSB1c2VkIGlmIGEgYmFz ZWxpbmUKKyAgICAvLyBwb3NpdGlvbiBjYW5ub3QgYmUgZGV0ZXJtaW5lZCBieSBleGFtaW5pbmcg Y2hpbGQgY29udGVudC4gQ2hlY2tib3hlcyBhbmQgcmFkaW8gYnV0dG9ucyBhcmUgZXhhbXBsZXMg b2YKKyAgICAvLyBjb250cm9scyB0aGF0IG5lZWQgdG8gZG8gdGhpcy4KKyAgICB2aXJ0dWFsIHNo b3J0IGJhc2VsaW5lUG9zaXRpb24oY29uc3QgUmVuZGVyT2JqZWN0KikgY29uc3Q7CisgICAgCiAg ICAgLy8gVGhlIHBsYXRmb3JtIHNlbGVjdGlvbiBjb2xvci4KICAgICB2aXJ0dWFsIENvbG9yIHBs YXRmb3JtQWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3Q7CiAgICAgdmlydHVh bCBDb2xvciBwbGF0Zm9ybUluYWN0aXZlU2VsZWN0aW9uQmFja2dyb3VuZENvbG9yKCkgY29uc3Q7 CkBAIC04Niw3ICsxMDAsNyBAQCBwcml2YXRlOgogCiAgICAgR3RrU3RhdGVUeXBlIGRldGVybWlu ZVN0YXRlKFJlbmRlck9iamVjdCopOwogICAgIEd0a1NoYWRvd1R5cGUgZGV0ZXJtaW5lU2hhZG93 KFJlbmRlck9iamVjdCopOwotICAgIGJvb2wgc3VwcG9ydHNGb2N1cyhFQXBwZWFyYW5jZSk7Cisg ICAgYm9vbCBzdXBwb3J0c0ZvY3VzKEVBcHBlYXJhbmNlKSBjb25zdDsKIAogICAgIFRoZW1lRGF0 YSBnZXRUaGVtZURhdGEoUmVuZGVyT2JqZWN0Kik7CiAK