63827 2011-07-01 12:12:28 -0700 cleanup of flexbox and marquee data naming in StyleRareNonInheritedData 2011-07-01 13:30:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony abarth ojan webkit.review.bot oldest_to_newest 431325 0 tony 2011-07-01 12:12:28 -0700 cleanup of flexbox and marquee data naming in StyleRareNonInheritedData 431326 1 99501 tony 2011-07-01 12:13:40 -0700 Created attachment 99501 Patch 431328 2 tony 2011-07-01 12:15:35 -0700 stylebot is going to complain, but almost all the params in RenderStyle.h are single letter. 431331 3 webkit.review.bot 2011-07-01 12:17:37 -0700 Attachment 99501 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:1034: l is incorrectly named. Don't use the single letter 'l' as an identifier name. [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. 431400 4 tony 2011-07-01 13:30:05 -0700 Committed r90271: <http://trac.webkit.org/changeset/90271> 99501 2011-07-01 12:13:40 -0700 2011-07-01 12:26:37 -0700 Patch bug-63827-20110701121315.patch text/plain 14155 tony U3VidmVyc2lvbiBSZXZpc2lvbjogOTAyNTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkOGUwMGJlMGRlZjQxY2E1 NTRmMTM5M2Q3ZTVjZWMzYWQyM2ZhMjVmLi5mMzgxYTRlOTY1OGJlN2ZjMmNkMGRjYmRjYWVlMTk5 MDI5OGZjOGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDYgQEAKIDIwMTEtMDctMDEgIFRvbnkg Q2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAorICAgICAgICBjbGVhbnVwIG9mIGZsZXhib3gg YW5kIG1hcnF1ZWUgZGF0YSBuYW1pbmcgaW4gU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM4MjcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9z dHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6UmVu ZGVyU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmRpZmYpOgorICAgICAg ICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5o ZXJpdGVkRmxhZ3M6OmJveEFsaWduKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdz Ojpib3hGbGV4KToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpib3hGbGV4R3Jv dXApOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6OmJveExpbmVzKToKKyAgICAg ICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpib3hPcmRpbmFsR3JvdXApOgorICAgICAgICAo V2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6OmJveE9yaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJ bmhlcml0ZWRGbGFnczo6Ym94UGFjayk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFn czo6bWFycXVlZUluY3JlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6 bWFycXVlZVNwZWVkKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjptYXJxdWVl TG9vcENvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjptYXJxdWVlQmVo YXZpb3IpOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6Om1hcnF1ZWVEaXJlY3Rp b24pOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6OnNldEJveEFsaWduKToKKyAg ICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRCb3hGbGV4KToKKyAgICAgICAgKFdl YkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRCb3hGbGV4R3JvdXApOgorICAgICAgICAoV2ViQ29y ZTo6SW5oZXJpdGVkRmxhZ3M6OnNldEJveExpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVy aXRlZEZsYWdzOjpzZXRCb3hPcmRpbmFsR3JvdXApOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJp dGVkRmxhZ3M6OnNldEJveE9yaWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFn czo6c2V0Qm94UGFjayk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0TWFy cXVlZUluY3JlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0TWFy cXVlZVNwZWVkKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRNYXJxdWVl RGlyZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjpzZXRNYXJxdWVl QmVoYXZpb3IpOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6OnNldE1hcnF1ZWVM b29wQ291bnQpOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0 ZWREYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6 OlN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSYXJl Tm9uSW5oZXJpdGVkRGF0YTo6b3BlcmF0b3I9PSk6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxl L1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuaDoKKyAgICAgICAgICAgIGZsZXhpYmxlQm94IC0+ IG1fZGVwcmVjYXRlZEZsZXhpYmxlQm94IGFuZCBtYXJxdWVlIHRvIG1fbWFycXVlZQorCisyMDEx LTA3LTAxICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgT2phbiBWYWZhaS4KIAogICAgICAgICByZW5hbWUgU3R5bGVGbGV4aWJsZUJveERhdGEg dG8gU3R5bGVEZXByZWNhdGVkRmxleGlibGVCb3hEYXRhCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAppbmRleCBlZjc0ZTJiZTU4NzIyZDdmNjRiZjYz ODNmNzRjOTNjZmU5OWQxMzc1Li5jMzA0YzFjMWY1OGQ4ODc3MmJmNmJjZjYwZDc2NDVjMmU3ZWZk ODU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5j cHAKQEAgLTExNyw4ICsxMTcsOCBAQCBBTFdBWVNfSU5MSU5FIFJlbmRlclN0eWxlOjpSZW5kZXJT dHlsZShib29sKQogICAgIG1fYmFja2dyb3VuZC5pbml0KCk7CiAgICAgc3Vycm91bmQuaW5pdCgp OwogICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLmluaXQoKTsKLSAgICByYXJlTm9uSW5oZXJpdGVk RGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3guaW5pdCgpOwotICAgIHJhcmVOb25Jbmhlcml0ZWRE YXRhLmFjY2VzcygpLT5tYXJxdWVlLmluaXQoKTsKKyAgICByYXJlTm9uSW5oZXJpdGVkRGF0YS5h Y2Nlc3MoKS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3guaW5pdCgpOworICAgIHJhcmVOb25Jbmhl cml0ZWREYXRhLmFjY2VzcygpLT5tX21hcnF1ZWUuaW5pdCgpOwogICAgIHJhcmVOb25Jbmhlcml0 ZWREYXRhLmFjY2VzcygpLT5tX211bHRpQ29sLmluaXQoKTsKICAgICByYXJlTm9uSW5oZXJpdGVk RGF0YS5hY2Nlc3MoKS0+bV90cmFuc2Zvcm0uaW5pdCgpOwogICAgIHJhcmVJbmhlcml0ZWREYXRh LmluaXQoKTsKQEAgLTM0NCw4ICszNDQsOCBAQCBTdHlsZURpZmZlcmVuY2UgUmVuZGVyU3R5bGU6 OmRpZmYoY29uc3QgUmVuZGVyU3R5bGUqIG90aGVyLCB1bnNpZ25lZCYgY2hhbmdlZENvbgogICAg ICAgICAgICAgfHwgcmFyZU5vbkluaGVyaXRlZERhdGEtPnRleHRPdmVyZmxvdyAhPSBvdGhlci0+ cmFyZU5vbkluaGVyaXRlZERhdGEtPnRleHRPdmVyZmxvdykKICAgICAgICAgICAgIHJldHVybiBT dHlsZURpZmZlcmVuY2VMYXlvdXQ7CiAKLSAgICAgICAgaWYgKHJhcmVOb25Jbmhlcml0ZWREYXRh LT5mbGV4aWJsZUJveC5nZXQoKSAhPSBvdGhlci0+cmFyZU5vbkluaGVyaXRlZERhdGEtPmZsZXhp YmxlQm94LmdldCgpCi0gICAgICAgICAgICAmJiAqcmFyZU5vbkluaGVyaXRlZERhdGEtPmZsZXhp YmxlQm94LmdldCgpICE9ICpvdGhlci0+cmFyZU5vbkluaGVyaXRlZERhdGEtPmZsZXhpYmxlQm94 LmdldCgpKQorICAgICAgICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZGVwcmVjYXRlZEZs ZXhpYmxlQm94LmdldCgpICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9kZXByZWNh dGVkRmxleGlibGVCb3guZ2V0KCkKKyAgICAgICAgICAgICYmICpyYXJlTm9uSW5oZXJpdGVkRGF0 YS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3guZ2V0KCkgIT0gKm90aGVyLT5yYXJlTm9uSW5oZXJp dGVkRGF0YS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3guZ2V0KCkpCiAgICAgICAgICAgICByZXR1 cm4gU3R5bGVEaWZmZXJlbmNlTGF5b3V0OwogCiAgICAgICAgIC8vIEZJWE1FOiBXZSBzaG91bGQg YWRkIGFuIG9wdGltaXplZCBmb3JtIG9mIGxheW91dCB0aGF0IGp1c3QgcmVjb21wdXRlcyB2aXN1 YWwgb3ZlcmZsb3cuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5oCmluZGV4IDMwNDJlYzY1MDExZjk0NDJiNzI5Y2ZjZTYzOGIxYTc0OGI2N2U4ZTQuLmJkYThj YTY5NWJmYTk2NDNiMjYzZjk5NjcyMjliNzEyZWUxNTlkNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC02NjEsMTQgKzY2MSwxNCBAQCBwdWJs aWM6CiAgICAgQ29sb3JTcGFjZSBjb2xvclNwYWNlKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nh c3Q8Q29sb3JTcGFjZT4ocmFyZUluaGVyaXRlZERhdGEtPmNvbG9yU3BhY2UpOyB9CiAgICAgZmxv YXQgb3BhY2l0eSgpIGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5vcGFjaXR5 OyB9CiAgICAgQ29udHJvbFBhcnQgYXBwZWFyYW5jZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PENvbnRyb2xQYXJ0PihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9hcHBlYXJhbmNlKTsgfQot ICAgIEVCb3hBbGlnbm1lbnQgYm94QWxpZ24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxF Qm94QWxpZ25tZW50PihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+ZmxleGlibGVCb3gtPmFsaWduKTsg fQorICAgIEVCb3hBbGlnbm1lbnQgYm94QWxpZ24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2Fz dDxFQm94QWxpZ25tZW50PihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9kZXByZWNhdGVkRmxleGli bGVCb3gtPmFsaWduKTsgfQogICAgIEVCb3hEaXJlY3Rpb24gYm94RGlyZWN0aW9uKCkgY29uc3Qg eyByZXR1cm4gc3RhdGljX2Nhc3Q8RUJveERpcmVjdGlvbj4oaW5oZXJpdGVkX2ZsYWdzLl9ib3hf ZGlyZWN0aW9uKTsgfQotICAgIGZsb2F0IGJveEZsZXgoKSB7IHJldHVybiByYXJlTm9uSW5oZXJp dGVkRGF0YS0+ZmxleGlibGVCb3gtPmZsZXg7IH0KLSAgICB1bnNpZ25lZCBpbnQgYm94RmxleEdy b3VwKCkgY29uc3QgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPmZsZXhpYmxlQm94LT5m bGV4X2dyb3VwOyB9Ci0gICAgRUJveExpbmVzIGJveExpbmVzKCkgeyByZXR1cm4gc3RhdGljX2Nh c3Q8RUJveExpbmVzPihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+ZmxleGlibGVCb3gtPmxpbmVzKTsg fQotICAgIHVuc2lnbmVkIGludCBib3hPcmRpbmFsR3JvdXAoKSBjb25zdCB7IHJldHVybiByYXJl Tm9uSW5oZXJpdGVkRGF0YS0+ZmxleGlibGVCb3gtPm9yZGluYWxfZ3JvdXA7IH0KLSAgICBFQm94 T3JpZW50IGJveE9yaWVudCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVCb3hPcmllbnQ+ KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5mbGV4aWJsZUJveC0+b3JpZW50KTsgfQotICAgIEVCb3hB bGlnbm1lbnQgYm94UGFjaygpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVCb3hBbGlnbm1l bnQ+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5mbGV4aWJsZUJveC0+cGFjayk7IH0KKyAgICBmbG9h dCBib3hGbGV4KCkgeyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZGVwcmVjYXRlZEZs ZXhpYmxlQm94LT5mbGV4OyB9CisgICAgdW5zaWduZWQgaW50IGJveEZsZXhHcm91cCgpIGNvbnN0 IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX2RlcHJlY2F0ZWRGbGV4aWJsZUJveC0+ ZmxleF9ncm91cDsgfQorICAgIEVCb3hMaW5lcyBib3hMaW5lcygpIHsgcmV0dXJuIHN0YXRpY19j YXN0PEVCb3hMaW5lcz4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZGVwcmVjYXRlZEZsZXhpYmxl Qm94LT5saW5lcyk7IH0KKyAgICB1bnNpZ25lZCBpbnQgYm94T3JkaW5hbEdyb3VwKCkgY29uc3Qg eyByZXR1cm4gcmFyZU5vbkluaGVyaXRlZERhdGEtPm1fZGVwcmVjYXRlZEZsZXhpYmxlQm94LT5v cmRpbmFsX2dyb3VwOyB9CisgICAgRUJveE9yaWVudCBib3hPcmllbnQoKSBjb25zdCB7IHJldHVy biBzdGF0aWNfY2FzdDxFQm94T3JpZW50PihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9kZXByZWNh dGVkRmxleGlibGVCb3gtPm9yaWVudCk7IH0KKyAgICBFQm94QWxpZ25tZW50IGJveFBhY2soKSBj b25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxFQm94QWxpZ25tZW50PihyYXJlTm9uSW5oZXJpdGVk RGF0YS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3gtPnBhY2spOyB9CiAKICAgICBjb25zdCBTaGFk b3dEYXRhKiBib3hTaGFkb3coKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+ bV9ib3hTaGFkb3cuZ2V0KCk7IH0KICAgICB2b2lkIGdldEJveFNoYWRvd0V4dGVudChpbnQmIHRv cCwgaW50JiByaWdodCwgaW50JiBib3R0b20sIGludCYgbGVmdCkgY29uc3QgeyBnZXRTaGFkb3dF eHRlbnQoYm94U2hhZG93KCksIHRvcCwgcmlnaHQsIGJvdHRvbSwgbGVmdCk7IH0KQEAgLTY3OSwx MSArNjc5LDExIEBAIHB1YmxpYzoKIAogICAgIFN0eWxlUmVmbGVjdGlvbiogYm94UmVmbGVjdCgp IGNvbnN0IHsgcmV0dXJuIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX2JveFJlZmxlY3QuZ2V0KCk7 IH0KICAgICBFQm94U2l6aW5nIGJveFNpemluZygpIGNvbnN0IHsgcmV0dXJuIG1fYm94LT5ib3hT aXppbmcoKTsgfQotICAgIExlbmd0aCBtYXJxdWVlSW5jcmVtZW50KCkgY29uc3QgeyByZXR1cm4g cmFyZU5vbkluaGVyaXRlZERhdGEtPm1hcnF1ZWUtPmluY3JlbWVudDsgfQotICAgIGludCBtYXJx dWVlU3BlZWQoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bWFycXVlZS0+ c3BlZWQ7IH0KLSAgICBpbnQgbWFycXVlZUxvb3BDb3VudCgpIGNvbnN0IHsgcmV0dXJuIHJhcmVO b25Jbmhlcml0ZWREYXRhLT5tYXJxdWVlLT5sb29wczsgfQotICAgIEVNYXJxdWVlQmVoYXZpb3Ig bWFycXVlZUJlaGF2aW9yKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8RU1hcnF1ZWVCZWhh dmlvcj4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1hcnF1ZWUtPmJlaGF2aW9yKTsgfQotICAgIEVN YXJxdWVlRGlyZWN0aW9uIG1hcnF1ZWVEaXJlY3Rpb24oKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDxFTWFycXVlZURpcmVjdGlvbj4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1hcnF1ZWUtPmRp cmVjdGlvbik7IH0KKyAgICBMZW5ndGggbWFycXVlZUluY3JlbWVudCgpIGNvbnN0IHsgcmV0dXJu IHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hcnF1ZWUtPmluY3JlbWVudDsgfQorICAgIGludCBt YXJxdWVlU3BlZWQoKSBjb25zdCB7IHJldHVybiByYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9tYXJx dWVlLT5zcGVlZDsgfQorICAgIGludCBtYXJxdWVlTG9vcENvdW50KCkgY29uc3QgeyByZXR1cm4g cmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbWFycXVlZS0+bG9vcHM7IH0KKyAgICBFTWFycXVlZUJl aGF2aW9yIG1hcnF1ZWVCZWhhdmlvcigpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVNYXJx dWVlQmVoYXZpb3I+KHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hcnF1ZWUtPmJlaGF2aW9yKTsg fQorICAgIEVNYXJxdWVlRGlyZWN0aW9uIG1hcnF1ZWVEaXJlY3Rpb24oKSBjb25zdCB7IHJldHVy biBzdGF0aWNfY2FzdDxFTWFycXVlZURpcmVjdGlvbj4ocmFyZU5vbkluaGVyaXRlZERhdGEtPm1f bWFycXVlZS0+ZGlyZWN0aW9uKTsgfQogICAgIEVVc2VyTW9kaWZ5IHVzZXJNb2RpZnkoKSBjb25z dCB7IHJldHVybiBzdGF0aWNfY2FzdDxFVXNlck1vZGlmeT4ocmFyZUluaGVyaXRlZERhdGEtPnVz ZXJNb2RpZnkpOyB9CiAgICAgRVVzZXJEcmFnIHVzZXJEcmFnKCkgY29uc3QgeyByZXR1cm4gc3Rh dGljX2Nhc3Q8RVVzZXJEcmFnPihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+dXNlckRyYWcpOyB9CiAg ICAgRVVzZXJTZWxlY3QgdXNlclNlbGVjdCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEVV c2VyU2VsZWN0PihyYXJlSW5oZXJpdGVkRGF0YS0+dXNlclNlbGVjdCk7IH0KQEAgLTEwMjcsMjIg KzEwMjcsMjIgQEAgcHVibGljOgogICAgIHZvaWQgc2V0T3BhY2l0eShmbG9hdCBmKSB7IFNFVF9W QVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG9wYWNpdHksIGYpOyB9CiAgICAgdm9pZCBzZXRBcHBl YXJhbmNlKENvbnRyb2xQYXJ0IGEpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgbV9h cHBlYXJhbmNlLCBhKTsgfQogICAgIC8vIEZvciB2YWxpZCB2YWx1ZXMgb2YgYm94LWFsaWduIHNl ZSBodHRwOi8vd3d3LnczLm9yZy9UUi8yMDA5L1dELWNzczMtZmxleGJveC0yMDA5MDcyMy8jYWxp Z25tZW50Ci0gICAgdm9pZCBzZXRCb3hBbGlnbihFQm94QWxpZ25tZW50IGEpIHsgQVNTRVJUKGEg PT0gQlNUUkVUQ0ggfHwgYSA9PSBCU1RBUlQgfHwgYSA9PSBCQ0VOVEVSIHx8IGEgPT0gQkVORCB8 fCBhID09IEJCQVNFTElORSk7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCkt PmZsZXhpYmxlQm94LCBhbGlnbiwgYSk7IH0KKyAgICB2b2lkIHNldEJveEFsaWduKEVCb3hBbGln bm1lbnQgYSkgeyBBU1NFUlQoYSA9PSBCU1RSRVRDSCB8fCBhID09IEJTVEFSVCB8fCBhID09IEJD RU5URVIgfHwgYSA9PSBCRU5EIHx8IGEgPT0gQkJBU0VMSU5FKTsgU0VUX1ZBUihyYXJlTm9uSW5o ZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3gsIGFsaWduLCBhKTsg fQogICAgIHZvaWQgc2V0Qm94RGlyZWN0aW9uKEVCb3hEaXJlY3Rpb24gZCkgeyBpbmhlcml0ZWRf ZmxhZ3MuX2JveF9kaXJlY3Rpb24gPSBkOyB9Ci0gICAgdm9pZCBzZXRCb3hGbGV4KGZsb2F0IGYp IHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3gsIGZs ZXgsIGYpOyB9Ci0gICAgdm9pZCBzZXRCb3hGbGV4R3JvdXAodW5zaWduZWQgaW50IGZnKSB7IFNF VF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPmZsZXhpYmxlQm94LCBmbGV4X2dy b3VwLCBmZyk7IH0KLSAgICB2b2lkIHNldEJveExpbmVzKEVCb3hMaW5lcyBsKSB7IFNFVF9WQVIo cmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPmZsZXhpYmxlQm94LCBsaW5lcywgbCk7IH0K LSAgICB2b2lkIHNldEJveE9yZGluYWxHcm91cCh1bnNpZ25lZCBpbnQgb2cpIHsgU0VUX1ZBUihy YXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3gsIG9yZGluYWxfZ3JvdXAs IG9nKTsgfQotICAgIHZvaWQgc2V0Qm94T3JpZW50KEVCb3hPcmllbnQgbykgeyBTRVRfVkFSKHJh cmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5mbGV4aWJsZUJveCwgb3JpZW50LCBvKTsgfQot ICAgIHZvaWQgc2V0Qm94UGFjayhFQm94QWxpZ25tZW50IHApIHsgU0VUX1ZBUihyYXJlTm9uSW5o ZXJpdGVkRGF0YS5hY2Nlc3MoKS0+ZmxleGlibGVCb3gsIHBhY2ssIHApOyB9CisgICAgdm9pZCBz ZXRCb3hGbGV4KGZsb2F0IGYpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3Mo KS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3gsIGZsZXgsIGYpOyB9CisgICAgdm9pZCBzZXRCb3hG bGV4R3JvdXAodW5zaWduZWQgaW50IGZnKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEu YWNjZXNzKCktPm1fZGVwcmVjYXRlZEZsZXhpYmxlQm94LCBmbGV4X2dyb3VwLCBmZyk7IH0KKyAg ICB2b2lkIHNldEJveExpbmVzKEVCb3hMaW5lcyBsKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRl ZERhdGEuYWNjZXNzKCktPm1fZGVwcmVjYXRlZEZsZXhpYmxlQm94LCBsaW5lcywgbCk7IH0KKyAg ICB2b2lkIHNldEJveE9yZGluYWxHcm91cCh1bnNpZ25lZCBpbnQgb2cpIHsgU0VUX1ZBUihyYXJl Tm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9kZXByZWNhdGVkRmxleGlibGVCb3gsIG9yZGlu YWxfZ3JvdXAsIG9nKTsgfQorICAgIHZvaWQgc2V0Qm94T3JpZW50KEVCb3hPcmllbnQgbykgeyBT RVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX2RlcHJlY2F0ZWRGbGV4aWJs ZUJveCwgb3JpZW50LCBvKTsgfQorICAgIHZvaWQgc2V0Qm94UGFjayhFQm94QWxpZ25tZW50IHAp IHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9kZXByZWNhdGVkRmxl eGlibGVCb3gsIHBhY2ssIHApOyB9CiAgICAgdm9pZCBzZXRCb3hTaGFkb3coUGFzc093blB0cjxT aGFkb3dEYXRhPiwgYm9vbCBhZGQgPSBmYWxzZSk7CiAgICAgdm9pZCBzZXRCb3hSZWZsZWN0KFBh c3NSZWZQdHI8U3R5bGVSZWZsZWN0aW9uPiByZWZsZWN0KSB7IGlmIChyYXJlTm9uSW5oZXJpdGVk RGF0YS0+bV9ib3hSZWZsZWN0ICE9IHJlZmxlY3QpIHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2Vz cygpLT5tX2JveFJlZmxlY3QgPSByZWZsZWN0OyB9CiAgICAgdm9pZCBzZXRCb3hTaXppbmcoRUJv eFNpemluZyBzKSB7IFNFVF9WQVIobV9ib3gsIG1fYm94U2l6aW5nLCBzKTsgfQotICAgIHZvaWQg c2V0TWFycXVlZUluY3JlbWVudChjb25zdCBMZW5ndGgmIGYpIHsgU0VUX1ZBUihyYXJlTm9uSW5o ZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bWFycXVlZSwgaW5jcmVtZW50LCBmKTsgfQotICAgIHZvaWQg c2V0TWFycXVlZVNwZWVkKGludCBmKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1hcnF1ZWUsIHNwZWVkLCBmKTsgfQotICAgIHZvaWQgc2V0TWFycXVlZURpcmVjdGlv bihFTWFycXVlZURpcmVjdGlvbiBkKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNj ZXNzKCktPm1hcnF1ZWUsIGRpcmVjdGlvbiwgZCk7IH0KLSAgICB2b2lkIHNldE1hcnF1ZWVCZWhh dmlvcihFTWFycXVlZUJlaGF2aW9yIGIpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5h Y2Nlc3MoKS0+bWFycXVlZSwgYmVoYXZpb3IsIGIpOyB9Ci0gICAgdm9pZCBzZXRNYXJxdWVlTG9v cENvdW50KGludCBpKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEuYWNjZXNzKCktPm1h cnF1ZWUsIGxvb3BzLCBpKTsgfQorICAgIHZvaWQgc2V0TWFycXVlZUluY3JlbWVudChjb25zdCBM ZW5ndGgmIGYpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJx dWVlLCBpbmNyZW1lbnQsIGYpOyB9CisgICAgdm9pZCBzZXRNYXJxdWVlU3BlZWQoaW50IGYpIHsg U0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBzcGVlZCwg Zik7IH0KKyAgICB2b2lkIHNldE1hcnF1ZWVEaXJlY3Rpb24oRU1hcnF1ZWVEaXJlY3Rpb24gZCkg eyBTRVRfVkFSKHJhcmVOb25Jbmhlcml0ZWREYXRhLmFjY2VzcygpLT5tX21hcnF1ZWUsIGRpcmVj dGlvbiwgZCk7IH0KKyAgICB2b2lkIHNldE1hcnF1ZWVCZWhhdmlvcihFTWFycXVlZUJlaGF2aW9y IGIpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBi ZWhhdmlvciwgYik7IH0KKyAgICB2b2lkIHNldE1hcnF1ZWVMb29wQ291bnQoaW50IGkpIHsgU0VU X1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YS5hY2Nlc3MoKS0+bV9tYXJxdWVlLCBsb29wcywgaSk7 IH0KICAgICB2b2lkIHNldFVzZXJNb2RpZnkoRVVzZXJNb2RpZnkgdSkgeyBTRVRfVkFSKHJhcmVJ bmhlcml0ZWREYXRhLCB1c2VyTW9kaWZ5LCB1KTsgfQogICAgIHZvaWQgc2V0VXNlckRyYWcoRVVz ZXJEcmFnIGQpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgdXNlckRyYWcsIGQpOyB9 CiAgICAgdm9pZCBzZXRVc2VyU2VsZWN0KEVVc2VyU2VsZWN0IHMpIHsgU0VUX1ZBUihyYXJlSW5o ZXJpdGVkRGF0YSwgdXNlclNlbGVjdCwgcyk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25Jbmhlcml0ZWREYXRhLmNwcAppbmRl eCAxZDQyZDBjMjVkMDRlYmE0NGQzYWZmYmEwNDViYTljYjY0ZDkzMGFlLi44MTA2NzA3MjFhYzk4 YWE1ZDZiODUxNzQzOTQyNjAwZmRlN2MzNGNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0YS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5vbkluaGVyaXRlZERhdGEuY3BwCkBA IC02Miw4ICs2Miw4IEBAIFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE6OlN0eWxlUmFyZU5vbklu aGVyaXRlZERhdGEoY29uc3QgU3R5bGVSYXJlTm9uSW5oZXJpdGVkCiAgICAgOiBSZWZDb3VudGVk PFN0eWxlUmFyZU5vbkluaGVyaXRlZERhdGE+KCkKICAgICAsIGxpbmVDbGFtcChvLmxpbmVDbGFt cCkKICAgICAsIG9wYWNpdHkoby5vcGFjaXR5KQotICAgICwgZmxleGlibGVCb3goby5mbGV4aWJs ZUJveCkKLSAgICAsIG1hcnF1ZWUoby5tYXJxdWVlKQorICAgICwgbV9kZXByZWNhdGVkRmxleGli bGVCb3goby5tX2RlcHJlY2F0ZWRGbGV4aWJsZUJveCkKKyAgICAsIG1fbWFycXVlZShvLm1fbWFy cXVlZSkKICAgICAsIG1fbXVsdGlDb2woby5tX211bHRpQ29sKQogICAgICwgbV90cmFuc2Zvcm0o by5tX3RyYW5zZm9ybSkKICAgICAsIG1fY29udGVudChvLm1fY29udGVudCA/IG8ubV9jb250ZW50 LT5jbG9uZSgpIDogbnVsbHB0cikKQEAgLTEwOCw4ICsxMDgsOCBAQCBib29sIFN0eWxlUmFyZU5v bkluaGVyaXRlZERhdGE6Om9wZXJhdG9yPT0oY29uc3QgU3R5bGVSYXJlTm9uSW5oZXJpdGVkRGF0 YSYgbykgYwogICAgICAgICAmJiBtX2Rhc2hib2FyZFJlZ2lvbnMgPT0gby5tX2Rhc2hib2FyZFJl Z2lvbnMKICNlbmRpZgogICAgICAgICAmJiBvcGFjaXR5ID09IG8ub3BhY2l0eQotICAgICAgICAm JiBmbGV4aWJsZUJveCA9PSBvLmZsZXhpYmxlQm94Ci0gICAgICAgICYmIG1hcnF1ZWUgPT0gby5t YXJxdWVlCisgICAgICAgICYmIG1fZGVwcmVjYXRlZEZsZXhpYmxlQm94ID09IG8ubV9kZXByZWNh dGVkRmxleGlibGVCb3gKKyAgICAgICAgJiYgbV9tYXJxdWVlID09IG8ubV9tYXJxdWVlCiAgICAg ICAgICYmIG1fbXVsdGlDb2wgPT0gby5tX211bHRpQ29sCiAgICAgICAgICYmIG1fdHJhbnNmb3Jt ID09IG8ubV90cmFuc2Zvcm0KICAgICAgICAgJiYgY29udGVudERhdGFFcXVpdmFsZW50KG8pCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5o ZXJpdGVkRGF0YS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZU5v bkluaGVyaXRlZERhdGEuaAppbmRleCA1YzdhOGJmM2U1MDhhMzM2OGMxN2QzZTdkOTE1MjJlNWI4 NGJjNjNiLi42ODQ3YTZlMTUwYTEwNDZlZDMzNTMzZjI1N2YyODNmNDcxZDQ3MjE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlTm9uSW5oZXJpdGVk RGF0YS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVOb25J bmhlcml0ZWREYXRhLmgKQEAgLTg5LDggKzg5LDggQEAgcHVibGljOgogI2VuZGlmCiAgICAgZmxv YXQgb3BhY2l0eTsgLy8gV2hldGhlciBvciBub3Qgd2UncmUgdHJhbnNwYXJlbnQuCiAKLSAgICBE YXRhUmVmPFN0eWxlRGVwcmVjYXRlZEZsZXhpYmxlQm94RGF0YT4gZmxleGlibGVCb3g7IC8vIEZs ZXhpYmxlIGJveCBwcm9wZXJ0aWVzCi0gICAgRGF0YVJlZjxTdHlsZU1hcnF1ZWVEYXRhPiBtYXJx dWVlOyAvLyBNYXJxdWVlIHByb3BlcnRpZXMKKyAgICBEYXRhUmVmPFN0eWxlRGVwcmVjYXRlZEZs ZXhpYmxlQm94RGF0YT4gbV9kZXByZWNhdGVkRmxleGlibGVCb3g7IC8vIEZsZXhpYmxlIGJveCBw cm9wZXJ0aWVzCisgICAgRGF0YVJlZjxTdHlsZU1hcnF1ZWVEYXRhPiBtX21hcnF1ZWU7IC8vIE1h cnF1ZWUgcHJvcGVydGllcwogICAgIERhdGFSZWY8U3R5bGVNdWx0aUNvbERhdGE+IG1fbXVsdGlD b2w7IC8vICBDU1MzIG11bHRpY29sIHByb3BlcnRpZXMKICAgICBEYXRhUmVmPFN0eWxlVHJhbnNm b3JtRGF0YT4gbV90cmFuc2Zvcm07IC8vIFRyYW5zZm9ybSBwcm9wZXJ0aWVzIChyb3RhdGUsIHNj YWxlLCBza2V3LCBldGMuKQogCg==