58964 2011-04-19 22:31:48 -0700 Allow casting between CSSPrimitiveValue and EBorderCollapse to remove special-case logic from CSSStyleSelector. 2011-04-20 09:47:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 macpherson webkit-unassigned abarth commit-queue dglazkov eric macpherson simon.fraser webkit.review.bot oldest_to_newest 389067 0 macpherson 2011-04-19 22:31:48 -0700 Allow casting between CSSPrimitiveValue and EBorderCollapse to remove special-case logic from CSSStyleSelector. 389068 1 90308 macpherson 2011-04-19 22:36:33 -0700 Created attachment 90308 Patch 389069 2 webkit.review.bot 2011-04-19 22:38:46 -0700 Attachment 90308 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/style/RenderStyle.h:196: _border_collapse is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 389070 3 macpherson 2011-04-19 22:44:06 -0700 Style fail is due to legacy code. Let me know what you think. Seems that there are a lot of these cases that when fixed will greatly simplify CSSStyleSelector/CSSStyleApplyProperty. 389072 4 90308 eric 2011-04-19 22:55:48 -0700 Comment on attachment 90308 Patch Sounds good to me. style->borderColapse() isn't called anywhere? 389073 5 90308 simon.fraser 2011-04-19 22:56:14 -0700 Comment on attachment 90308 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90308&action=review > Source/WebCore/ChangeLog:8 > + No new tests as no new functinoality added. Typo 389074 6 90309 macpherson 2011-04-19 23:01:24 -0700 Created attachment 90309 Patch 389075 7 webkit.review.bot 2011-04-19 23:03:49 -0700 Attachment 90309 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/style/RenderStyle.h:196: _border_collapse is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 389076 8 macpherson 2011-04-19 23:04:41 -0700 (In reply to comment #4) > (From update of attachment 90308 [details]) > Sounds good to me. style->borderColapse() isn't called anywhere? The enum maps to 0,1 in the same way as the boolean. Also the place it gets called in CSSStyleSelector (in the macro) is of the form set(get()). 389077 9 macpherson 2011-04-19 23:04:58 -0700 (In reply to comment #5) > (From update of attachment 90308 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=90308&action=review > > > Source/WebCore/ChangeLog:8 > > + No new tests as no new functinoality added. > > Typo Fixed. 389272 10 90309 commit-queue 2011-04-20 09:14:52 -0700 Comment on attachment 90309 Patch Clearing flags on attachment: 90309 Committed r84380: <http://trac.webkit.org/changeset/84380> 389273 11 commit-queue 2011-04-20 09:14:58 -0700 All reviewed patches have been landed. Closing bug. 389282 12 webkit.review.bot 2011-04-20 09:28:22 -0700 http://trac.webkit.org/changeset/84380 might have broken Qt Linux Release minimal 389295 13 dglazkov 2011-04-20 09:47:09 -0700 (In reply to comment #12) > http://trac.webkit.org/changeset/84380 might have broken Qt Linux Release minimal Fix landed as http://trac.webkit.org/changeset/84385. 90308 2011-04-19 22:36:33 -0700 2011-04-19 23:01:18 -0700 Patch bug-58964-20110420153630.patch text/plain 6548 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MzQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMTkgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBjYXN0aW5nIGJldHdlZW4gQ1NTUHJp bWl0aXZlVmFsdWUgYW5kIEVCb3JkZXJDb2xsYXBzZSB0byByZW1vdmUgc3BlY2lhbC1jYXNlIGxv Z2ljIGZyb20gQ1NTU3R5bGVTZWxlY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4OTY0CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIG5vIG5l dyBmdW5jdGlub2FsaXR5IGFkZGVkLgorCisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVl TWFwcGluZ3MuaDoKKyAgICAgICAgU3VwcG9ydCBjYXN0aW5nIHRvL2Zyb20gRUJvcmRlckNvbGxh cHNlLgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgVXNlIG5l dyBjYXN0aW5nIGFiaWxpdHkgdG8gc2ltcGxpZnkgY29kZS4KKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgVXNlIEVCb3JkZXJDb2xsYXBzZSBpbnN0ZWFk IG9mIGEgYm9vbCBmb3IgcmVwcmVzZW50aW5nIGJvcmRlciBjb2xsYXBzZSBtZW1iZXIgdmFyaWFi bGUuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6Cisg ICAgICAgIEFkZGVkIEVCb3JkZXJDb2xsYXBzZSBlbnVtLgorCiAyMDExLTA0LTE5ICBOYW9raSBU YWthbm8gIDx0YWthbm8ubmFva2lAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtl bnQgVGFtdXJhLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFw cGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCShyZXZpc2lvbiA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2NDIsNiArMjY0Miwz MyBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlCiAgICAgfQogfQog Cit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUo RUJvcmRlckNvbGxhcHNlIGUpCisgICAgOiBtX3R5cGUoQ1NTX0lERU5UKQorICAgICwgbV9oYXND YWNoZWRDU1NUZXh0KGZhbHNlKQoreworICAgIHN3aXRjaCAoZSkgeworICAgIGNhc2UgQlNFUEFS QVRFOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVTZXBhcmF0ZTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBCQ09MTEFQU0U6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NW YWx1ZUNvbGxhcHNlOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4gaW5s aW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBFQm9yZGVyQ29sbGFwc2UoKSBjb25zdAor eworICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVTZXBhcmF0 ZToKKyAgICAgICAgcmV0dXJuIEJTRVBBUkFURTsKKyAgICBjYXNlIENTU1ZhbHVlQ29sbGFwc2U6 CisgICAgICAgIHJldHVybiBCQ09MTEFQU0U7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBCU0VQQVJBVEU7CisgICAgfQorfQorCiB0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRUNv bG9ySW50ZXJwb2xhdGlvbiBlKQogICAgIDogbV90eXBlKENTU19JREVOVCkKICAgICAsIG1faGFz Q2FjaGVkQ1NTVGV4dChmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHJldmlzaW9uIDg0MzI2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTg2LDE5ICszNTg2LDcgQEAgdm9pZCBD U1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIHN3aXRjaCAocHJvcGVydHkp IHsKIC8vIGlkZW50IG9ubHkgcHJvcGVydGllcwogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJD b2xsYXBzZToKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoYm9yZGVyQ29sbGFw c2UsIEJvcmRlckNvbGxhcHNlKQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBzd2l0Y2ggKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgp KSB7Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlQ29sbGFwc2U6Ci0gICAgICAgICAgICAgICAg bV9zdHlsZS0+c2V0Qm9yZGVyQ29sbGFwc2UodHJ1ZSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlU2VwYXJhdGU6Ci0gICAgICAgICAgICAgICAgbV9z dHlsZS0+c2V0Qm9yZGVyQ29sbGFwc2UoZmFsc2UpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K KyAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3JkZXJD b2xsYXBzZSwgQm9yZGVyQ29sbGFwc2UpCiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1By b3BlcnR5T3V0bGluZVN0eWxlOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9X SVRIX1ZBTFVFKG91dGxpbmVTdHlsZSwgT3V0bGluZVN0eWxlLCBCb3JkZXJTdHlsZSkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lv biA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNyArMTkzLDcgQEAgcHJvdGVjdGVkOgogICAgICAgICB1 bnNpZ25lZCBfdGV4dF9kZWNvcmF0aW9ucyA6IDQ7CiAgICAgICAgIHVuc2lnbmVkIF9jdXJzb3Jf c3R5bGUgOiA2OyAvLyBFQ3Vyc29yCiAgICAgICAgIHVuc2lnbmVkIF9kaXJlY3Rpb24gOiAxOyAv LyBUZXh0RGlyZWN0aW9uCi0gICAgICAgIGJvb2wgX2JvcmRlcl9jb2xsYXBzZSA6IDEgOworICAg ICAgICB1bnNpZ25lZCBfYm9yZGVyX2NvbGxhcHNlIDogMTsgLy8gRUJvcmRlckNvbGxhcHNlCiAg ICAgICAgIHVuc2lnbmVkIF93aGl0ZV9zcGFjZSA6IDM7IC8vIEVXaGl0ZVNwYWNlCiAgICAgICAg IHVuc2lnbmVkIF9ib3hfZGlyZWN0aW9uIDogMTsgLy8gRUJveERpcmVjdGlvbiAoQ1NTMyBib3hf ZGlyZWN0aW9uIHByb3BlcnR5LCBmbGV4aWJsZSBib3ggbGF5b3V0IG1vZHVsZSkKICAgICAgICAg Ly8gMzQgYml0cwpAQCAtNTkyLDggKzU5Miw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBGaWxsTGF5 ZXIqIG1hc2tMYXllcnMoKSBjb25zdCB7IHJldHVybiAmKHJhcmVOb25Jbmhlcml0ZWREYXRhLT5t X21hc2spOyB9CiAgICAgY29uc3QgTmluZVBpZWNlSW1hZ2UmIG1hc2tCb3hJbWFnZSgpIGNvbnN0 IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hc2tCb3hJbWFnZTsgfQogCi0gICAg Ly8gcmV0dXJucyB0cnVlIGZvciBjb2xsYXBzaW5nIGJvcmRlcnMsIGZhbHNlIGZvciBzZXBhcmF0 ZSBib3JkZXJzCi0gICAgYm9vbCBib3JkZXJDb2xsYXBzZSgpIGNvbnN0IHsgcmV0dXJuIGluaGVy aXRlZF9mbGFncy5fYm9yZGVyX2NvbGxhcHNlOyB9CisgICAgRUJvcmRlckNvbGxhcHNlIGJvcmRl ckNvbGxhcHNlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RUJvcmRlckNvbGxhcHNlPihp bmhlcml0ZWRfZmxhZ3MuX2JvcmRlcl9jb2xsYXBzZSk7IH0KICAgICBzaG9ydCBob3Jpem9udGFs Qm9yZGVyU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRlZC0+aG9yaXpvbnRhbF9ib3Jk ZXJfc3BhY2luZzsgfQogICAgIHNob3J0IHZlcnRpY2FsQm9yZGVyU3BhY2luZygpIGNvbnN0IHsg cmV0dXJuIGluaGVyaXRlZC0+dmVydGljYWxfYm9yZGVyX3NwYWNpbmc7IH0KICAgICBFRW1wdHlD ZWxsIGVtcHR5Q2VsbHMoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFRW1wdHlDZWxsPihp bmhlcml0ZWRfZmxhZ3MuX2VtcHR5X2NlbGxzKTsgfQpAQCAtOTY4LDcgKzk2Nyw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldE1hc2tZUG9zaXRpb24oTGVuZ3RoIGwpIHsgU0VUX1ZBUihyYXJlTm9u SW5oZXJpdGVkRGF0YSwgbV9tYXNrLm1feVBvc2l0aW9uLCBsKSB9CiAgICAgdm9pZCBzZXRNYXNr U2l6ZShMZW5ndGhTaXplIGwpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgbV9tYXNr Lm1fc2l6ZUxlbmd0aCwgbCkgfQogCi0gICAgdm9pZCBzZXRCb3JkZXJDb2xsYXBzZShib29sIGNv bGxhcHNlKSB7IGluaGVyaXRlZF9mbGFncy5fYm9yZGVyX2NvbGxhcHNlID0gY29sbGFwc2U7IH0K KyAgICB2b2lkIHNldEJvcmRlckNvbGxhcHNlKEVCb3JkZXJDb2xsYXBzZSBjb2xsYXBzZSkgeyBp bmhlcml0ZWRfZmxhZ3MuX2JvcmRlcl9jb2xsYXBzZSA9IGNvbGxhcHNlOyB9CiAgICAgdm9pZCBz ZXRIb3Jpem9udGFsQm9yZGVyU3BhY2luZyhzaG9ydCB2KSB7IFNFVF9WQVIoaW5oZXJpdGVkLCBo b3Jpem9udGFsX2JvcmRlcl9zcGFjaW5nLCB2KSB9CiAgICAgdm9pZCBzZXRWZXJ0aWNhbEJvcmRl clNwYWNpbmcoc2hvcnQgdikgeyBTRVRfVkFSKGluaGVyaXRlZCwgdmVydGljYWxfYm9yZGVyX3Nw YWNpbmcsIHYpIH0KICAgICB2b2lkIHNldEVtcHR5Q2VsbHMoRUVtcHR5Q2VsbCB2KSB7IGluaGVy aXRlZF9mbGFncy5fZW1wdHlfY2VsbHMgPSB2OyB9CkBAIC0xMjEwLDcgKzEyMDksNyBAQCBwdWJs aWM6CiAgICAgY29uc3QgQ29sb3IgdmlzaXRlZERlcGVuZGVudENvbG9yKGludCBjb2xvclByb3Bl cnR5KSBjb25zdDsKIAogICAgIC8vIEluaXRpYWwgdmFsdWVzIGZvciBhbGwgdGhlIHByb3BlcnRp ZXMKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsQm9yZGVyQ29sbGFwc2UoKSB7IHJldHVybiBmYWxz ZTsgfQorICAgIHN0YXRpYyBFQm9yZGVyQ29sbGFwc2UgaW5pdGlhbEJvcmRlckNvbGxhcHNlKCkg eyByZXR1cm4gQlNFUEFSQVRFOyB9CiAgICAgc3RhdGljIEVCb3JkZXJTdHlsZSBpbml0aWFsQm9y ZGVyU3R5bGUoKSB7IHJldHVybiBCTk9ORTsgfQogICAgIHN0YXRpYyBOaW5lUGllY2VJbWFnZSBp bml0aWFsTmluZVBpZWNlSW1hZ2UoKSB7IHJldHVybiBOaW5lUGllY2VJbWFnZSgpOyB9CiAgICAg c3RhdGljIExlbmd0aFNpemUgaW5pdGlhbEJvcmRlclJhZGl1cygpIHsgcmV0dXJuIExlbmd0aFNp emUoTGVuZ3RoKDAsIEZpeGVkKSwgTGVuZ3RoKDAsIEZpeGVkKSk7IH0KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o CShyZXZpc2lvbiA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZUNvbnN0YW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw2ICs4MCw4IEBAIGVudW0g UHNldWRvSWQgewogICAgIFBVQkxJQ19QU0VVRE9JRF9NQVNLID0gKCgxIDw8IEZJUlNUX0lOVEVS TkFMX1BTRVVET0lEKSAtIDEpICYgfigoMSA8PCBGSVJTVF9QVUJMSUNfUFNFVURPSUQpIC0gMSkK IH07CiAKK2VudW0gRUJvcmRlckNvbGxhcHNlIHsgQlNFUEFSQVRFID0gMCwgQkNPTExBUFNFID0g MSB9OworCiAvLyBUaGVzZSBoYXZlIGJlZW4gZGVmaW5lZCBpbiB0aGUgb3JkZXIgb2YgdGhlaXIg cHJlY2VkZW5jZSBmb3IgYm9yZGVyLWNvbGxhcHNpbmcuIERvCiAvLyBub3QgY2hhbmdlIHRoaXMg b3JkZXIhCiBlbnVtIEVCb3JkZXJTdHlsZSB7IEJOT05FLCBCSElEREVOLCBJTlNFVCwgR1JPT1ZF LCBSSURHRSwgT1VUU0VULCBET1RURUQsIERBU0hFRCwgU09MSUQsIERPVUJMRSB9Owo= 90309 2011-04-19 23:01:24 -0700 2011-04-20 09:14:52 -0700 Patch bug-58964-20110420160121.patch text/plain 6548 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MzQyKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMTkgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvdyBjYXN0aW5nIGJldHdlZW4gQ1NTUHJp bWl0aXZlVmFsdWUgYW5kIEVCb3JkZXJDb2xsYXBzZSB0byByZW1vdmUgc3BlY2lhbC1jYXNlIGxv Z2ljIGZyb20gQ1NTU3R5bGVTZWxlY3Rvci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4OTY0CisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIG5vIG5l dyBmdW5jdGlvbmFsaXR5IGFkZGVkLgorCisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVl TWFwcGluZ3MuaDoKKyAgICAgICAgU3VwcG9ydCBjYXN0aW5nIHRvL2Zyb20gRUJvcmRlckNvbGxh cHNlLgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgVXNlIG5l dyBjYXN0aW5nIGFiaWxpdHkgdG8gc2ltcGxpZnkgY29kZS4KKyAgICAgICAgKiByZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAgICAgVXNlIEVCb3JkZXJDb2xsYXBzZSBpbnN0ZWFk IG9mIGEgYm9vbCBmb3IgcmVwcmVzZW50aW5nIGJvcmRlciBjb2xsYXBzZSBtZW1iZXIgdmFyaWFi bGUuCisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmg6Cisg ICAgICAgIEFkZGVkIEVCb3JkZXJDb2xsYXBzZSBlbnVtLgorCiAyMDExLTA0LTE5ICBOYW9raSBU YWthbm8gIDx0YWthbm8ubmFva2lAZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtl bnQgVGFtdXJhLgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFw cGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCShyZXZpc2lvbiA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQ cmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2NDIsNiArMjY0Miwz MyBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlCiAgICAgfQogfQog Cit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUo RUJvcmRlckNvbGxhcHNlIGUpCisgICAgOiBtX3R5cGUoQ1NTX0lERU5UKQorICAgICwgbV9oYXND YWNoZWRDU1NUZXh0KGZhbHNlKQoreworICAgIHN3aXRjaCAoZSkgeworICAgIGNhc2UgQlNFUEFS QVRFOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVTZXBhcmF0ZTsKKyAgICAgICAg YnJlYWs7CisgICAgY2FzZSBCQ09MTEFQU0U6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NW YWx1ZUNvbGxhcHNlOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4gaW5s aW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBFQm9yZGVyQ29sbGFwc2UoKSBjb25zdAor eworICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVTZXBhcmF0 ZToKKyAgICAgICAgcmV0dXJuIEJTRVBBUkFURTsKKyAgICBjYXNlIENTU1ZhbHVlQ29sbGFwc2U6 CisgICAgICAgIHJldHVybiBCQ09MTEFQU0U7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CisgICAgICAgIHJldHVybiBCU0VQQVJBVEU7CisgICAgfQorfQorCiB0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoRUNv bG9ySW50ZXJwb2xhdGlvbiBlKQogICAgIDogbV90eXBlKENTU19JREVOVCkKICAgICAsIG1faGFz Q2FjaGVkQ1NTVGV4dChmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAJKHJldmlzaW9uIDg0MzI2KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNTg2LDE5ICszNTg2LDcgQEAgdm9pZCBD U1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIHN3aXRjaCAocHJvcGVydHkp IHsKIC8vIGlkZW50IG9ubHkgcHJvcGVydGllcwogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3JkZXJD b2xsYXBzZToKLSAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwoYm9yZGVyQ29sbGFw c2UsIEJvcmRlckNvbGxhcHNlKQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICBzd2l0Y2ggKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgp KSB7Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlQ29sbGFwc2U6Ci0gICAgICAgICAgICAgICAg bV9zdHlsZS0+c2V0Qm9yZGVyQ29sbGFwc2UodHJ1ZSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICBjYXNlIENTU1ZhbHVlU2VwYXJhdGU6Ci0gICAgICAgICAgICAgICAgbV9z dHlsZS0+c2V0Qm9yZGVyQ29sbGFwc2UoZmFsc2UpOwotICAgICAgICAgICAgICAgIGJyZWFrOwot ICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0K KyAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShib3JkZXJD b2xsYXBzZSwgQm9yZGVyQ29sbGFwc2UpCiAgICAgICAgIHJldHVybjsKICAgICBjYXNlIENTU1By b3BlcnR5T3V0bGluZVN0eWxlOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9X SVRIX1ZBTFVFKG91dGxpbmVTdHlsZSwgT3V0bGluZVN0eWxlLCBCb3JkZXJTdHlsZSkKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCShyZXZpc2lv biA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNyArMTkzLDcgQEAgcHJvdGVjdGVkOgogICAgICAgICB1 bnNpZ25lZCBfdGV4dF9kZWNvcmF0aW9ucyA6IDQ7CiAgICAgICAgIHVuc2lnbmVkIF9jdXJzb3Jf c3R5bGUgOiA2OyAvLyBFQ3Vyc29yCiAgICAgICAgIHVuc2lnbmVkIF9kaXJlY3Rpb24gOiAxOyAv LyBUZXh0RGlyZWN0aW9uCi0gICAgICAgIGJvb2wgX2JvcmRlcl9jb2xsYXBzZSA6IDEgOworICAg ICAgICB1bnNpZ25lZCBfYm9yZGVyX2NvbGxhcHNlIDogMTsgLy8gRUJvcmRlckNvbGxhcHNlCiAg ICAgICAgIHVuc2lnbmVkIF93aGl0ZV9zcGFjZSA6IDM7IC8vIEVXaGl0ZVNwYWNlCiAgICAgICAg IHVuc2lnbmVkIF9ib3hfZGlyZWN0aW9uIDogMTsgLy8gRUJveERpcmVjdGlvbiAoQ1NTMyBib3hf ZGlyZWN0aW9uIHByb3BlcnR5LCBmbGV4aWJsZSBib3ggbGF5b3V0IG1vZHVsZSkKICAgICAgICAg Ly8gMzQgYml0cwpAQCAtNTkyLDggKzU5Miw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBGaWxsTGF5 ZXIqIG1hc2tMYXllcnMoKSBjb25zdCB7IHJldHVybiAmKHJhcmVOb25Jbmhlcml0ZWREYXRhLT5t X21hc2spOyB9CiAgICAgY29uc3QgTmluZVBpZWNlSW1hZ2UmIG1hc2tCb3hJbWFnZSgpIGNvbnN0 IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hc2tCb3hJbWFnZTsgfQogCi0gICAg Ly8gcmV0dXJucyB0cnVlIGZvciBjb2xsYXBzaW5nIGJvcmRlcnMsIGZhbHNlIGZvciBzZXBhcmF0 ZSBib3JkZXJzCi0gICAgYm9vbCBib3JkZXJDb2xsYXBzZSgpIGNvbnN0IHsgcmV0dXJuIGluaGVy aXRlZF9mbGFncy5fYm9yZGVyX2NvbGxhcHNlOyB9CisgICAgRUJvcmRlckNvbGxhcHNlIGJvcmRl ckNvbGxhcHNlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RUJvcmRlckNvbGxhcHNlPihp bmhlcml0ZWRfZmxhZ3MuX2JvcmRlcl9jb2xsYXBzZSk7IH0KICAgICBzaG9ydCBob3Jpem9udGFs Qm9yZGVyU3BhY2luZygpIGNvbnN0IHsgcmV0dXJuIGluaGVyaXRlZC0+aG9yaXpvbnRhbF9ib3Jk ZXJfc3BhY2luZzsgfQogICAgIHNob3J0IHZlcnRpY2FsQm9yZGVyU3BhY2luZygpIGNvbnN0IHsg cmV0dXJuIGluaGVyaXRlZC0+dmVydGljYWxfYm9yZGVyX3NwYWNpbmc7IH0KICAgICBFRW1wdHlD ZWxsIGVtcHR5Q2VsbHMoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFRW1wdHlDZWxsPihp bmhlcml0ZWRfZmxhZ3MuX2VtcHR5X2NlbGxzKTsgfQpAQCAtOTY4LDcgKzk2Nyw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHNldE1hc2tZUG9zaXRpb24oTGVuZ3RoIGwpIHsgU0VUX1ZBUihyYXJlTm9u SW5oZXJpdGVkRGF0YSwgbV9tYXNrLm1feVBvc2l0aW9uLCBsKSB9CiAgICAgdm9pZCBzZXRNYXNr U2l6ZShMZW5ndGhTaXplIGwpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgbV9tYXNr Lm1fc2l6ZUxlbmd0aCwgbCkgfQogCi0gICAgdm9pZCBzZXRCb3JkZXJDb2xsYXBzZShib29sIGNv bGxhcHNlKSB7IGluaGVyaXRlZF9mbGFncy5fYm9yZGVyX2NvbGxhcHNlID0gY29sbGFwc2U7IH0K KyAgICB2b2lkIHNldEJvcmRlckNvbGxhcHNlKEVCb3JkZXJDb2xsYXBzZSBjb2xsYXBzZSkgeyBp bmhlcml0ZWRfZmxhZ3MuX2JvcmRlcl9jb2xsYXBzZSA9IGNvbGxhcHNlOyB9CiAgICAgdm9pZCBz ZXRIb3Jpem9udGFsQm9yZGVyU3BhY2luZyhzaG9ydCB2KSB7IFNFVF9WQVIoaW5oZXJpdGVkLCBo b3Jpem9udGFsX2JvcmRlcl9zcGFjaW5nLCB2KSB9CiAgICAgdm9pZCBzZXRWZXJ0aWNhbEJvcmRl clNwYWNpbmcoc2hvcnQgdikgeyBTRVRfVkFSKGluaGVyaXRlZCwgdmVydGljYWxfYm9yZGVyX3Nw YWNpbmcsIHYpIH0KICAgICB2b2lkIHNldEVtcHR5Q2VsbHMoRUVtcHR5Q2VsbCB2KSB7IGluaGVy aXRlZF9mbGFncy5fZW1wdHlfY2VsbHMgPSB2OyB9CkBAIC0xMjEwLDcgKzEyMDksNyBAQCBwdWJs aWM6CiAgICAgY29uc3QgQ29sb3IgdmlzaXRlZERlcGVuZGVudENvbG9yKGludCBjb2xvclByb3Bl cnR5KSBjb25zdDsKIAogICAgIC8vIEluaXRpYWwgdmFsdWVzIGZvciBhbGwgdGhlIHByb3BlcnRp ZXMKLSAgICBzdGF0aWMgYm9vbCBpbml0aWFsQm9yZGVyQ29sbGFwc2UoKSB7IHJldHVybiBmYWxz ZTsgfQorICAgIHN0YXRpYyBFQm9yZGVyQ29sbGFwc2UgaW5pdGlhbEJvcmRlckNvbGxhcHNlKCkg eyByZXR1cm4gQlNFUEFSQVRFOyB9CiAgICAgc3RhdGljIEVCb3JkZXJTdHlsZSBpbml0aWFsQm9y ZGVyU3R5bGUoKSB7IHJldHVybiBCTk9ORTsgfQogICAgIHN0YXRpYyBOaW5lUGllY2VJbWFnZSBp bml0aWFsTmluZVBpZWNlSW1hZ2UoKSB7IHJldHVybiBOaW5lUGllY2VJbWFnZSgpOyB9CiAgICAg c3RhdGljIExlbmd0aFNpemUgaW5pdGlhbEJvcmRlclJhZGl1cygpIHsgcmV0dXJuIExlbmd0aFNp emUoTGVuZ3RoKDAsIEZpeGVkKSwgTGVuZ3RoKDAsIEZpeGVkKSk7IH0KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o CShyZXZpc2lvbiA4NDMyNikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5k ZXJTdHlsZUNvbnN0YW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC04MCw2ICs4MCw4IEBAIGVudW0g UHNldWRvSWQgewogICAgIFBVQkxJQ19QU0VVRE9JRF9NQVNLID0gKCgxIDw8IEZJUlNUX0lOVEVS TkFMX1BTRVVET0lEKSAtIDEpICYgfigoMSA8PCBGSVJTVF9QVUJMSUNfUFNFVURPSUQpIC0gMSkK IH07CiAKK2VudW0gRUJvcmRlckNvbGxhcHNlIHsgQlNFUEFSQVRFID0gMCwgQkNPTExBUFNFID0g MSB9OworCiAvLyBUaGVzZSBoYXZlIGJlZW4gZGVmaW5lZCBpbiB0aGUgb3JkZXIgb2YgdGhlaXIg cHJlY2VkZW5jZSBmb3IgYm9yZGVyLWNvbGxhcHNpbmcuIERvCiAvLyBub3QgY2hhbmdlIHRoaXMg b3JkZXIhCiBlbnVtIEVCb3JkZXJTdHlsZSB7IEJOT05FLCBCSElEREVOLCBJTlNFVCwgR1JPT1ZF LCBSSURHRSwgT1VUU0VULCBET1RURUQsIERBU0hFRCwgU09MSUQsIERPVUJMRSB9Owo=