70867 2011-10-25 20:09:41 -0700 Use enum instead of bool to represent -webkit-column-span property. 2011-10-28 12:15:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson macpherson webkit.review.bot oldest_to_newest 490543 0 macpherson 2011-10-25 20:09:41 -0700 Use enum instead of bool to represent -webkit-column-span property. 490544 1 112443 macpherson 2011-10-25 20:12:42 -0700 Created attachment 112443 Patch 490947 2 112443 darin 2011-10-26 09:52:58 -0700 Comment on attachment 112443 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112443&action=review > Source/WebCore/rendering/style/RenderStyleConstants.h:86 > +enum ColumnSpan { ColumnSpanOne = 0, ColumnSpanAll}; Not sure I see the value in specifying "= 0" here and not specifying "= 1". I’d leave off the "= 0" myself. 492081 3 112443 macpherson 2011-10-27 16:29:45 -0700 Comment on attachment 112443 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112443&action=review >> Source/WebCore/rendering/style/RenderStyleConstants.h:86 >> +enum ColumnSpan { ColumnSpanOne = 0, ColumnSpanAll}; > > Not sure I see the value in specifying "= 0" here and not specifying "= 1". I’d leave off the "= 0" myself. The reason I do it this way is to make the behavior clear when used in logical statements. I'm not sure that the C++ spec defines the first enum value to be zero, even though most compilers do generate values that way. By doing this I am trying to express that ColumSpanOne is always logically false, and ColumnSpanAll is logically true (!0). Is that logic flawed? It seems to come up in reviews from time to time. 492587 4 112443 webkit.review.bot 2011-10-28 12:15:43 -0700 Comment on attachment 112443 Patch Clearing flags on attachment: 112443 Committed r98748: <http://trac.webkit.org/changeset/98748> 492588 5 webkit.review.bot 2011-10-28 12:15:47 -0700 All reviewed patches have been landed. Closing bug. 112443 2011-10-25 20:12:42 -0700 2011-10-28 12:15:43 -0700 Patch bug-70867-20111026141239.patch text/plain 9314 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4NDI3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMTAtMjUgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgZW51bSBp bnN0ZWFkIG9mIGJvb2wgdG8gcmVwcmVzZW50IC13ZWJraXQtY29sdW1uLXNwYW4gcHJvcGVydHku CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDg2Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQg YnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBw aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2 ZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBD b2x1bW5TcGFuKToKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6 OmNyZWF0ZUFub255bW91c0NvbHVtblNwYW5CbG9jayk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnByb3BhZ2F0 ZVN0eWxlVG9Bbm9ueW1vdXNDaGlsZHJlbik6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1Jl bmRlclN0eWxlLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6Y29sdW1uU3Bh bik6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0Q29sdW1uU3Bhbik6Cisg ICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6aW5pdGlhbENvbHVtblNwYW4pOgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oOgorICAgICAgICAq IHJlbmRlcmluZy9zdHlsZS9TdHlsZU11bHRpQ29sRGF0YS5oOgorCiAyMDExLTEwLTI1ICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSlNFdmVudFRhcmdldC5jcHAg aGFzIGEgYnVuY2ggb2YgdW5uZXNzYXJ5IGluY2x1ZGVzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJKHJldmlzaW9uIDk4MzEwKQorKysg U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAkod29ya2luZyBj b3B5KQpAQCAtMTMwLDYgKzEzMCwzMSBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVW YWx1ZTo6b3BlCiAgICAgcmV0dXJuIDAuMGY7CiB9CiAKK3RlbXBsYXRlPD4gaW5saW5lIENTU1By aW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShDb2x1bW5TcGFuIGNvbHVtblNwYW4pCisg ICAgOiBtX2hhc0NhY2hlZENTU1RleHQoZmFsc2UpCit7CisgICAgc3dpdGNoIChjb2x1bW5TcGFu KSB7CisgICAgY2FzZSBDb2x1bW5TcGFuQWxsOgorICAgICAgICBtX3R5cGUgPSBDU1NfSURFTlQ7 CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZUFsbDsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBDb2x1bW5TcGFuT25lOgorICAgICAgICBtX3R5cGUgPSBDU1NfTlVNQkVSOworICAg ICAgICBtX3ZhbHVlLm51bSA9IDE7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordGVtcGxh dGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIENvbHVtblNwYW4oKSBjb25z dAoreworICAgIGlmIChtX3R5cGUgPT0gQ1NTX0lERU5UICYmIG1fdmFsdWUuaWRlbnQgPT0gQ1NT VmFsdWVBbGwpCisgICAgICAgIHJldHVybiBDb2x1bW5TcGFuQWxsOworICAgIGlmIChtX3R5cGUg PT0gQ1NTX05VTUJFUiAmJiBtX3ZhbHVlLm51bSA9PSAxKQorICAgICAgICByZXR1cm4gQ29sdW1u U3Bhbk9uZTsKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gQ29sdW1uU3Bh bk9uZTsKK30KKwogdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1p dGl2ZVZhbHVlKEVCb3JkZXJTdHlsZSBlKQogICAgIDogbV90eXBlKENTU19JREVOVCkKICAgICAs IG1faGFzQ2FjaGVkQ1NTVGV4dChmYWxzZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5 bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDk4MzEwKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NT U1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzU0LDYgKzIzNTQsOCBAQCB2 b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgYm9vbCBpc0luaGVy aXQgPSBtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1ZhbHVlOjpDU1NfSU5IRVJJVDsK ICAgICBib29sIGlzSW5pdGlhbCA9IHZhbHVlVHlwZSA9PSBDU1NWYWx1ZTo6Q1NTX0lOSVRJQUwg fHwgKCFtX3BhcmVudE5vZGUgJiYgdmFsdWVUeXBlID09IENTU1ZhbHVlOjpDU1NfSU5IRVJJVCk7 CiAKKyAgICBBU1NFUlQoIWlzSW5oZXJpdCB8fCAhaXNJbml0aWFsKTsgLy8gaXNJbmhlcml0IC0+ ICFpc0luaXRpYWwgJiYgaXNJbml0aWFsIC0+ICFpc0luaGVyaXQKKwogICAgIGlmICghYXBwbHlQ cm9wZXJ0eVRvUmVndWxhclN0eWxlKCkgJiYgKCFhcHBseVByb3BlcnR5VG9WaXNpdGVkTGlua1N0 eWxlKCkgfHwgIWlzVmFsaWRWaXNpdGVkTGlua1Byb3BlcnR5KGlkKSkpIHsKICAgICAgICAgLy8g TGltaXQgdGhlIHByb3BlcnRpZXMgdGhhdCBjYW4gYmUgYXBwbGllZCB0byBvbmx5IHRoZSBvbmVz IGhvbm9yZWQgYnkgOnZpc2l0ZWQuCiAgICAgICAgIHJldHVybjsKQEAgLTMyMzIsMTEgKzMyMzQs OSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkoaW50CiAgICAgY2FzZSBD U1NQcm9wZXJ0eUJveFNpemluZzoKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxf QU5EX1BSSU1JVElWRShib3hTaXppbmcsIEJveFNpemluZyk7CiAgICAgICAgIHJldHVybjsKLSAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uU3BhbjogewotICAgICAgICBIQU5ETEVfSU5I RVJJVF9BTkRfSU5JVElBTChjb2x1bW5TcGFuLCBDb2x1bW5TcGFuKQotICAgICAgICBtX3N0eWxl LT5zZXRDb2x1bW5TcGFuKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQWxs KTsKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uU3BhbjoKKyAgICAgICAgSEFORExF X0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShjb2x1bW5TcGFuLCBDb2x1bW5TcGFu KQogICAgICAgICByZXR1cm47Ci0gICAgfQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1 bW5SdWxlU3R5bGU6CiAgICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMX0FORF9QUklN SVRJVkVfV0lUSF9WQUxVRShjb2x1bW5SdWxlU3R5bGUsIENvbHVtblJ1bGVTdHlsZSwgQm9yZGVy U3R5bGUpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAkocmV2aXNpb24gOTgzMTApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTc3LDcgKzYxNzcsNyBAQCBS ZW5kZXJCbG9jayogUmVuZGVyQmxvY2s6OmNyZWF0ZUFub255bW91CiBSZW5kZXJCbG9jayogUmVu ZGVyQmxvY2s6OmNyZWF0ZUFub255bW91c0NvbHVtblNwYW5CbG9jaygpIGNvbnN0CiB7CiAgICAg UmVmUHRyPFJlbmRlclN0eWxlPiBuZXdTdHlsZSA9IFJlbmRlclN0eWxlOjpjcmVhdGVBbm9ueW1v dXNTdHlsZShzdHlsZSgpKTsKLSAgICBuZXdTdHlsZS0+c2V0Q29sdW1uU3Bhbih0cnVlKTsKKyAg ICBuZXdTdHlsZS0+c2V0Q29sdW1uU3BhbihDb2x1bW5TcGFuQWxsKTsKICAgICBuZXdTdHlsZS0+ c2V0RGlzcGxheShCTE9DSyk7CiAKICAgICBSZW5kZXJCbG9jayogbmV3Qm94ID0gbmV3IChyZW5k ZXJBcmVuYSgpKSBSZW5kZXJCbG9jayhkb2N1bWVudCgpIC8qIGFub255bW91cyBib3ggKi8pOwpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJKHJldmlzaW9u IDk4MzEwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTE5MDYsNyArMTkwNiw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojpwcm9w YWdhdGVTdHlsZVRvQW5vbnkKICAgICAgICAgICAgIGlmIChjaGlsZC0+c3R5bGUoKS0+c3BlY2lm aWVzQ29sdW1ucygpKQogICAgICAgICAgICAgICAgIG5ld1N0eWxlLT5pbmhlcml0Q29sdW1uUHJv cGVydGllc0Zyb20oc3R5bGUoKSk7CiAgICAgICAgICAgICBpZiAoY2hpbGQtPnN0eWxlKCktPmNv bHVtblNwYW4oKSkKLSAgICAgICAgICAgICAgICBuZXdTdHlsZS0+c2V0Q29sdW1uU3Bhbih0cnVl KTsKKyAgICAgICAgICAgICAgICBuZXdTdHlsZS0+c2V0Q29sdW1uU3BhbihDb2x1bW5TcGFuQWxs KTsKICAgICAgICAgfQogICAgICAgICBuZXdTdHlsZS0+c2V0RGlzcGxheShjaGlsZC0+c3R5bGUo KS0+ZGlzcGxheSgpKTsKICAgICAgICAgY2hpbGQtPnNldFN0eWxlKG5ld1N0eWxlLnJlbGVhc2Uo KSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUu aAkocmV2aXNpb24gOTgzMTApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzY2LDcgKzc2Niw3IEBAIHB1YmxpYzoKICAg ICBFQm9yZGVyU3R5bGUgY29sdW1uUnVsZVN0eWxlKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbklu aGVyaXRlZERhdGEtPm1fbXVsdGlDb2wtPm1fcnVsZS5zdHlsZSgpOyB9CiAgICAgdW5zaWduZWQg c2hvcnQgY29sdW1uUnVsZVdpZHRoKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERh dGEtPm1fbXVsdGlDb2wtPnJ1bGVXaWR0aCgpOyB9CiAgICAgYm9vbCBjb2x1bW5SdWxlSXNUcmFu c3BhcmVudCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29s LT5tX3J1bGUuaXNUcmFuc3BhcmVudCgpOyB9Ci0gICAgYm9vbCBjb2x1bW5TcGFuKCkgY29uc3Qg eyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbXVsdGlDb2wtPm1fY29sdW1uU3Bhbjsg fQorICAgIENvbHVtblNwYW4gY29sdW1uU3BhbigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0 PENvbHVtblNwYW4+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29sLT5tX2NvbHVtblNw YW4pOyB9CiAgICAgRVBhZ2VCcmVhayBjb2x1bW5CcmVha0JlZm9yZSgpIGNvbnN0IHsgcmV0dXJu IHN0YXRpY19jYXN0PEVQYWdlQnJlYWs+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX211bHRpQ29s LT5tX2JyZWFrQmVmb3JlKTsgfQogICAgIEVQYWdlQnJlYWsgY29sdW1uQnJlYWtJbnNpZGUoKSBj b25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFUGFnZUJyZWFrPihyYXJlTm9uSW5oZXJpdGVkRGF0 YS0+bV9tdWx0aUNvbC0+bV9icmVha0luc2lkZSk7IH0KICAgICBFUGFnZUJyZWFrIGNvbHVtbkJy ZWFrQWZ0ZXIoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFUGFnZUJyZWFrPihyYXJlTm9u SW5oZXJpdGVkRGF0YS0+bV9tdWx0aUNvbC0+bV9icmVha0FmdGVyKTsgfQpAQCAtMTE1NCw3ICsx MTU0LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0Q29sdW1uUnVsZVN0eWxlKEVCb3JkZXJTdHls ZSBiKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fbXVsdGlDb2ws IG1fcnVsZS5tX3N0eWxlLCBiKTsgfQogICAgIHZvaWQgc2V0Q29sdW1uUnVsZVdpZHRoKHVuc2ln bmVkIHNob3J0IHcpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9t dWx0aUNvbCwgbV9ydWxlLm1fd2lkdGgsIHcpOyB9CiAgICAgdm9pZCByZXNldENvbHVtblJ1bGUo KSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1fbXVsdGlDb2wsIG1f cnVsZSwgQm9yZGVyVmFsdWUoKSkgfQotICAgIHZvaWQgc2V0Q29sdW1uU3Bhbihib29sIGIpIHsg U0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwgbV9jb2x1 bW5TcGFuLCBiKTsgfQorICAgIHZvaWQgc2V0Q29sdW1uU3BhbihDb2x1bW5TcGFuIGNvbHVtblNw YW4pIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tdWx0aUNvbCwg bV9jb2x1bW5TcGFuLCBjb2x1bW5TcGFuKTsgfQogICAgIHZvaWQgc2V0Q29sdW1uQnJlYWtCZWZv cmUoRVBhZ2VCcmVhayBwKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCkt Pm1fbXVsdGlDb2wsIG1fYnJlYWtCZWZvcmUsIHApOyB9CiAgICAgLy8gRm9yIHZhbGlkIHZhbHVl cyBvZiBjb2x1bW4tYnJlYWstaW5zaWRlIHNlZSBodHRwOi8vd3d3LnczLm9yZy9UUi9jc3MzLW11 bHRpY29sLyNicmVhay1iZWZvcmUtYnJlYWstYWZ0ZXItYnJlYWstaW5zaWRlCiAgICAgdm9pZCBz ZXRDb2x1bW5CcmVha0luc2lkZShFUGFnZUJyZWFrIHApIHsgQVNTRVJUKHAgPT0gUEJBVVRPIHx8 IHAgPT0gUEJBVk9JRCk7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1f bXVsdGlDb2wsIG1fYnJlYWtJbnNpZGUsIHApOyB9CkBAIC0xNDM5LDcgKzE0MzksNyBAQCBwdWJs aWM6CiAgICAgc3RhdGljIE9yZGVyIGluaXRpYWxSVExPcmRlcmluZygpIHsgcmV0dXJuIExvZ2lj YWxPcmRlcjsgfQogICAgIHN0YXRpYyBmbG9hdCBpbml0aWFsVGV4dFN0cm9rZVdpZHRoKCkgeyBy ZXR1cm4gMDsgfQogICAgIHN0YXRpYyB1bnNpZ25lZCBzaG9ydCBpbml0aWFsQ29sdW1uQ291bnQo KSB7IHJldHVybiAxOyB9Ci0gICAgc3RhdGljIGJvb2wgaW5pdGlhbENvbHVtblNwYW4oKSB7IHJl dHVybiBmYWxzZTsgfQorICAgIHN0YXRpYyBDb2x1bW5TcGFuIGluaXRpYWxDb2x1bW5TcGFuKCkg eyByZXR1cm4gQ29sdW1uU3Bhbk9uZTsgfQogICAgIHN0YXRpYyBjb25zdCBUcmFuc2Zvcm1PcGVy YXRpb25zJiBpbml0aWFsVHJhbnNmb3JtKCkgeyBERUZJTkVfU1RBVElDX0xPQ0FMKFRyYW5zZm9y bU9wZXJhdGlvbnMsIG9wcywgKCkpOyByZXR1cm4gb3BzOyB9CiAgICAgc3RhdGljIExlbmd0aCBp bml0aWFsVHJhbnNmb3JtT3JpZ2luWCgpIHsgcmV0dXJuIExlbmd0aCg1MC4wLCBQZXJjZW50KTsg fQogICAgIHN0YXRpYyBMZW5ndGggaW5pdGlhbFRyYW5zZm9ybU9yaWdpblkoKSB7IHJldHVybiBM ZW5ndGgoNTAuMCwgUGVyY2VudCk7IH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5oCShyZXZpc2lvbiA5ODMxMCkK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZUNvbnN0YW50cy5o CSh3b3JraW5nIGNvcHkpCkBAIC04Myw2ICs4Myw4IEBAIGVudW0gUHNldWRvSWQgewogICAgIFBV QkxJQ19QU0VVRE9JRF9NQVNLID0gKCgxIDw8IEZJUlNUX0lOVEVSTkFMX1BTRVVET0lEKSAtIDEp ICYgfigoMSA8PCBGSVJTVF9QVUJMSUNfUFNFVURPSUQpIC0gMSkKIH07CiAKK2VudW0gQ29sdW1u U3BhbiB7IENvbHVtblNwYW5PbmUgPSAwLCBDb2x1bW5TcGFuQWxsfTsKKwogZW51bSBFQm9yZGVy Q29sbGFwc2UgeyBCU0VQQVJBVEUgPSAwLCBCQ09MTEFQU0UgPSAxIH07CiAKIC8vIFRoZXNlIGhh dmUgYmVlbiBkZWZpbmVkIGluIHRoZSBvcmRlciBvZiB0aGVpciBwcmVjZWRlbmNlIGZvciBib3Jk ZXItY29sbGFwc2luZy4gRG8KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZU11bHRpQ29sRGF0YS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9TdHlsZU11bHRpQ29sRGF0YS5oCShyZXZpc2lvbiA5ODMxMCkKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZU11bHRpQ29sRGF0YS5oCSh3b3JraW5nIGNvcHkp CkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKICAgICBib29sIG1fYXV0b1dpZHRoIDogMTsKICAg ICBib29sIG1fYXV0b0NvdW50IDogMTsKICAgICBib29sIG1fbm9ybWFsR2FwIDogMTsKLSAgICBi b29sIG1fY29sdW1uU3BhbiA6IDE7CisgICAgdW5zaWduZWQgbV9jb2x1bW5TcGFuIDogMTsKICAg ICB1bnNpZ25lZCBtX2JyZWFrQmVmb3JlIDogMjsgLy8gRVBhZ2VCcmVhawogICAgIHVuc2lnbmVk IG1fYnJlYWtBZnRlciA6IDI7IC8vIEVQYWdlQnJlYWsKICAgICB1bnNpZ25lZCBtX2JyZWFrSW5z aWRlIDogMjsgLy8gRVBhZ2VCcmVhawo=