144237 2015-04-26 15:47:38 -0700 REGRESSION (r174283): disabled default buttons use impossible-to-read white text on Mac 2015-04-26 19:05:22 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 darin darin commit-queue esprehn+autocc glenn kondapallykalyan mitz oldest_to_newest 1088859 0 darin 2015-04-26 15:47:38 -0700 REGRESSION (r174283): disabled default buttons use impossible-to-read white text on Mac 1088860 1 251711 darin 2015-04-26 15:50:57 -0700 Created attachment 251711 Patch 1088861 2 darin 2015-04-26 15:51:32 -0700 <rdar://problem/19523555> 1088885 3 251711 simon.fraser 2015-04-26 18:05:10 -0700 Comment on attachment 251711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251711&action=review > Source/WebCore/rendering/RenderTheme.cpp:180 > + // Special style that tells enabled default in active windows to use the ActiveButtonText color. enabled default *button*? 1088886 4 251711 mitz 2015-04-26 18:06:27 -0700 Comment on attachment 251711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251711&action=review > Source/WebCore/rendering/RenderTheme.cpp:180 > + // Special style that tells enabled default in active windows to use the ActiveButtonText color. Missing word before “in”. 1088905 5 darin 2015-04-26 19:05:22 -0700 Committed r183378: <http://trac.webkit.org/changeset/183378> 251711 2015-04-26 15:50:57 -0700 2015-04-26 18:05:10 -0700 Patch bug-144237-20150426154950.patch text/plain 9844 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE1YzBmMWZiMTIwZGY5 MDc4ZjNiMjNmNjllNWY0MTc1NTQ5OGRlZC4uOGVhYzgzNjc4NzM2MmRlNDAwMmNjOWU3Zjc5ZjY5 ZWU5NjhiNzFkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE1LTA0LTI2ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAorICAgICAgICBSRUdSRVNTSU9OIChyMTc0Mjgz KTogZGlzYWJsZWQgZGVmYXVsdCBidXR0b25zIHVzZSBpbXBvc3NpYmxlLXRvLXJlYWQgd2hpdGUg dGV4dCBvbiBNYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NDIzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vIHRlc3QgYmVjYXVzZSBEdW1wUmVuZGVyVHJlZSBhbmQgV2ViS2l0VGVzdFJ1bm5lciBk b24ndCBoYXZlIGEgZ29vZCBtZXRob2QKKyAgICAgICAgZm9yIHRlc3RpbmcgYmVoYXZpb3JzIHRo YXQgYXJlIHNwZWNpZmljIHRvIGFjdGl2ZSB3aW5kb3dzLiBUaGF0J3MgdGhlIHNhbWUgcmVhc29u CisgICAgICAgIHRoYXQgdGhlIGNoYW5nZSB0aGF0IGNhdXNlZCB0aGlzIGJ1ZyBkaWRuJ3QgY29t ZSB3aXRoIGEgcmVncmVzc2lvbiB0ZXN0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lOjphZGp1c3RTdHlsZSk6IFJl bmFtZWQgImUiIHRvICJlbGVtZW50Ii4gQWRkZWQgYSBjb21tZW50IHRvCisgICAgICAgIGNsYXJp ZnkgdGhlIG1lYW5pbmcgb2YgdGhlIHNldEluc2lkZURlZmF1bHRCdXR0b24gZnVuY3Rpb24sIGFu ZCBhZGRlZCBhbgorICAgICAgICBpc0Rpc2FibGVkRm9ybUNvbnRyb2wgY2hlY2sgc28gaXQgd29u J3QgdHJpZ2dlciBvbiBhIGRpc2FibGVkIGJ1dHRvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRoZW1lOjpzeXN0ZW1Db2xvcik6IE1vdmVkIENTU1ZhbHVlQWN0aXZlYnV0dG9udGV4dCBpbnRv CisgICAgICAgIGFscGhhYmV0aWNhbCBvcmRlciB0byBtYXRjaCB0aGUgcmVzdCBvZiB0aGUgc3dp dGNoIHN0YXRlbWVudCBvcmRlcmluZy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVt ZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpzeXN0ZW1Db2xvcik6 IE1vdmVkIENTU1ZhbHVlQWN0aXZlYnV0dG9udGV4dCBpbnRvCisgICAgICAgIGFscGhhYmV0aWNh bCBvcmRlciB0byBtYXRjaCB0aGUgcmVzdCBvZiB0aGUgc3dpdGNoIHN0YXRlbWVudCBvcmRlcmlu Zy4gQWxzbworICAgICAgICBmaXhlZCBpdHMgYmVoYXZpb3Igb24gb2xkZXIgdmVyc2lvbnMgb2Yg T1MgWDsgaXQgc2hvdWxkIGp1c3QgcmV0dXJuIHRoZSBzYW1lCisgICAgICAgIHRoaW5nIHRoYXQg Q1NTVmFsdWVCdXR0b250ZXh0IHdvdWxkIHJldHVybiBpbiB0aGF0IGNvbnRleHQuCisKKzIwMTUt MDQtMjYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCiAgICAgICAgIFJFR1JFU1NJ T04gKHIxNzY3NTEpOiBsaW5lLWhlaWdodCBpZ25vcmVkIGluIDxidXR0b24+IGVsZW1lbnRzCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDQyMzQKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHAKaW5kZXggYjFhNDNhYTdlNzM3 MTliOWVmYTBkOTQyYzgwMDM1M2M1ZmI1MTI0Mi4uNmU4MDU1NDg2ZTI5Nzk2MjRhNjk1NGEzZmE5 NGFkMDZjM2MzOTA5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3Bw CkBAIC03OSw3ICs3OSw3IEBAIFJlbmRlclRoZW1lOjpSZW5kZXJUaGVtZSgpCiB7CiB9CiAKLXZv aWQgUmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIs IFJlbmRlclN0eWxlJiBzdHlsZSwgRWxlbWVudCogZSwgYm9vbCBVQUhhc0FwcGVhcmFuY2UsIGNv bnN0IEJvcmRlckRhdGEmIGJvcmRlciwgY29uc3QgRmlsbExheWVyJiBiYWNrZ3JvdW5kLCBjb25z dCBDb2xvciYgYmFja2dyb3VuZENvbG9yKQordm9pZCBSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUo U3R5bGVSZXNvbHZlciYgc3R5bGVSZXNvbHZlciwgUmVuZGVyU3R5bGUmIHN0eWxlLCBFbGVtZW50 KiBlbGVtZW50LCBib29sIFVBSGFzQXBwZWFyYW5jZSwgY29uc3QgQm9yZGVyRGF0YSYgYm9yZGVy LCBjb25zdCBGaWxsTGF5ZXImIGJhY2tncm91bmQsIGNvbnN0IENvbG9yJiBiYWNrZ3JvdW5kQ29s b3IpCiB7CiAgICAgLy8gRm9yY2UgaW5saW5lIGFuZCB0YWJsZSBkaXNwbGF5IHN0eWxlcyB0byBi ZSBpbmxpbmUtYmxvY2sgKGV4Y2VwdCBmb3IgdGFibGUtIHdoaWNoIGlzIGJsb2NrKQogICAgIENv bnRyb2xQYXJ0IHBhcnQgPSBzdHlsZS5hcHBlYXJhbmNlKCk7CkBAIC0xNzYsOSArMTc2LDEyIEBA IHZvaWQgUmVuZGVyVGhlbWU6OmFkanVzdFN0eWxlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2 ZXIsIFJlbmRlclN0eWxlJiBzdHlsZSwKICAgICAgICAgICAgIGlmIChzdHlsZS5zZXRGb250RGVz Y3JpcHRpb24odGhlbWVGb250LnZhbHVlKCkpKQogICAgICAgICAgICAgICAgIHN0eWxlLmZvbnRD YXNjYWRlKCkudXBkYXRlKG51bGxwdHIpOwogICAgICAgICB9Ci0gICAgICAgIHN0eWxlLnNldElu c2lkZURlZmF1bHRCdXR0b24ocGFydCA9PSBEZWZhdWx0QnV0dG9uUGFydCk7CisKKyAgICAgICAg Ly8gU3BlY2lhbCBzdHlsZSB0aGF0IHRlbGxzIGVuYWJsZWQgZGVmYXVsdCBpbiBhY3RpdmUgd2lu ZG93cyB0byB1c2UgdGhlIEFjdGl2ZUJ1dHRvblRleHQgY29sb3IuCisgICAgICAgIC8vIFRoZSBh Y3RpdmUgd2luZG93IHBhcnQgb2YgdGhlIHRlc3QgaGFzIHRvIGJlIGRvbmUgYXQgcGFpbnQgdGlt ZSBzaW5jZSBpdCdzIG5vdCB0cmlnZ2VyZWQgYnkgYSBzdHlsZSBjaGFuZ2UuCisgICAgICAgIHN0 eWxlLnNldEluc2lkZURlZmF1bHRCdXR0b24ocGFydCA9PSBEZWZhdWx0QnV0dG9uUGFydCAmJiBl bGVtZW50ICYmICFlbGVtZW50LT5pc0Rpc2FibGVkRm9ybUNvbnRyb2woKSk7CisgICAgICAgIGJy ZWFrOwogICAgIH0KLSAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAg ICB9CkBAIC0xODgsMjUgKzE5MSwyNSBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1c3RTdHlsZShT dHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBSZW5kZXJTdHlsZSYgc3R5bGUsCiAgICAgc3dp dGNoIChzdHlsZS5hcHBlYXJhbmNlKCkpIHsKICNpZiAhVVNFKE5FV19USEVNRSkKICAgICBjYXNl IENoZWNrYm94UGFydDoKLSAgICAgICAgcmV0dXJuIGFkanVzdENoZWNrYm94U3R5bGUoc3R5bGVS ZXNvbHZlciwgc3R5bGUsIGUpOworICAgICAgICByZXR1cm4gYWRqdXN0Q2hlY2tib3hTdHlsZShz dHlsZVJlc29sdmVyLCBzdHlsZSwgZWxlbWVudCk7CiAgICAgY2FzZSBSYWRpb1BhcnQ6Ci0gICAg ICAgIHJldHVybiBhZGp1c3RSYWRpb1N0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlKTsKKyAg ICAgICAgcmV0dXJuIGFkanVzdFJhZGlvU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1l bnQpOwogICAgIGNhc2UgUHVzaEJ1dHRvblBhcnQ6CiAgICAgY2FzZSBTcXVhcmVCdXR0b25QYXJ0 OgogICAgIGNhc2UgRGVmYXVsdEJ1dHRvblBhcnQ6CiAgICAgY2FzZSBCdXR0b25QYXJ0OgotICAg ICAgICByZXR1cm4gYWRqdXN0QnV0dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGUpOwor ICAgICAgICByZXR1cm4gYWRqdXN0QnV0dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVs ZW1lbnQpOwogICAgIGNhc2UgSW5uZXJTcGluQnV0dG9uUGFydDoKLSAgICAgICAgcmV0dXJuIGFk anVzdElubmVyU3BpbkJ1dHRvblN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlKTsKKyAgICAg ICAgcmV0dXJuIGFkanVzdElubmVyU3BpbkJ1dHRvblN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxl LCBlbGVtZW50KTsKICNlbmRpZgogICAgIGNhc2UgVGV4dEZpZWxkUGFydDoKLSAgICAgICAgcmV0 dXJuIGFkanVzdFRleHRGaWVsZFN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlKTsKKyAgICAg ICAgcmV0dXJuIGFkanVzdFRleHRGaWVsZFN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlbGVt ZW50KTsKICAgICBjYXNlIFRleHRBcmVhUGFydDoKLSAgICAgICAgcmV0dXJuIGFkanVzdFRleHRB cmVhU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGUpOworICAgICAgICByZXR1cm4gYWRqdXN0 VGV4dEFyZWFTdHlsZShzdHlsZVJlc29sdmVyLCBzdHlsZSwgZWxlbWVudCk7CiAgICAgY2FzZSBN ZW51bGlzdFBhcnQ6Ci0gICAgICAgIHJldHVybiBhZGp1c3RNZW51TGlzdFN0eWxlKHN0eWxlUmVz b2x2ZXIsIHN0eWxlLCBlKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdE1lbnVMaXN0U3R5bGUoc3R5 bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1lbnQpOwogICAgIGNhc2UgTWVudWxpc3RCdXR0b25QYXJ0 OgotICAgICAgICByZXR1cm4gYWRqdXN0TWVudUxpc3RCdXR0b25TdHlsZShzdHlsZVJlc29sdmVy LCBzdHlsZSwgZSk7CisgICAgICAgIHJldHVybiBhZGp1c3RNZW51TGlzdEJ1dHRvblN0eWxlKHN0 eWxlUmVzb2x2ZXIsIHN0eWxlLCBlbGVtZW50KTsKICAgICBjYXNlIE1lZGlhUGxheUJ1dHRvblBh cnQ6CiAgICAgY2FzZSBNZWRpYUN1cnJlbnRUaW1lUGFydDoKICAgICBjYXNlIE1lZGlhVGltZVJl bWFpbmluZ1BhcnQ6CkBAIC0yMTQsNDUgKzIxNyw0NSBAQCB2b2lkIFJlbmRlclRoZW1lOjphZGp1 c3RTdHlsZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBSZW5kZXJTdHlsZSYgc3R5bGUs CiAgICAgY2FzZSBNZWRpYUV4aXRGdWxsc2NyZWVuQnV0dG9uUGFydDoKICAgICBjYXNlIE1lZGlh TXV0ZUJ1dHRvblBhcnQ6CiAgICAgY2FzZSBNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lclBhcnQ6 Ci0gICAgICAgIHJldHVybiBhZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShzdHlsZVJlc29sdmVyLCBz dHlsZSwgZSk7CisgICAgICAgIHJldHVybiBhZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShzdHlsZVJl c29sdmVyLCBzdHlsZSwgZWxlbWVudCk7CiAgICAgY2FzZSBNZWRpYVNsaWRlclBhcnQ6CiAgICAg Y2FzZSBNZWRpYVZvbHVtZVNsaWRlclBhcnQ6CiAgICAgY2FzZSBNZWRpYUZ1bGxTY3JlZW5Wb2x1 bWVTbGlkZXJQYXJ0OgogICAgIGNhc2UgU2xpZGVySG9yaXpvbnRhbFBhcnQ6CiAgICAgY2FzZSBT bGlkZXJWZXJ0aWNhbFBhcnQ6Ci0gICAgICAgIHJldHVybiBhZGp1c3RTbGlkZXJUcmFja1N0eWxl KHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdFNsaWRlclRy YWNrU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1lbnQpOwogICAgIGNhc2UgU2xpZGVy VGh1bWJIb3Jpem9udGFsUGFydDoKICAgICBjYXNlIFNsaWRlclRodW1iVmVydGljYWxQYXJ0Ogot ICAgICAgICByZXR1cm4gYWRqdXN0U2xpZGVyVGh1bWJTdHlsZShzdHlsZVJlc29sdmVyLCBzdHls ZSwgZSk7CisgICAgICAgIHJldHVybiBhZGp1c3RTbGlkZXJUaHVtYlN0eWxlKHN0eWxlUmVzb2x2 ZXIsIHN0eWxlLCBlbGVtZW50KTsKICAgICBjYXNlIFNlYXJjaEZpZWxkUGFydDoKLSAgICAgICAg cmV0dXJuIGFkanVzdFNlYXJjaEZpZWxkU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGUpOwor ICAgICAgICByZXR1cm4gYWRqdXN0U2VhcmNoRmllbGRTdHlsZShzdHlsZVJlc29sdmVyLCBzdHls ZSwgZWxlbWVudCk7CiAgICAgY2FzZSBTZWFyY2hGaWVsZENhbmNlbEJ1dHRvblBhcnQ6Ci0gICAg ICAgIHJldHVybiBhZGp1c3RTZWFyY2hGaWVsZENhbmNlbEJ1dHRvblN0eWxlKHN0eWxlUmVzb2x2 ZXIsIHN0eWxlLCBlKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdFNlYXJjaEZpZWxkQ2FuY2VsQnV0 dG9uU3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1lbnQpOwogICAgIGNhc2UgU2VhcmNo RmllbGREZWNvcmF0aW9uUGFydDoKLSAgICAgICAgcmV0dXJuIGFkanVzdFNlYXJjaEZpZWxkRGVj b3JhdGlvblBhcnRTdHlsZShzdHlsZVJlc29sdmVyLCBzdHlsZSwgZSk7CisgICAgICAgIHJldHVy biBhZGp1c3RTZWFyY2hGaWVsZERlY29yYXRpb25QYXJ0U3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5 bGUsIGVsZW1lbnQpOwogICAgIGNhc2UgU2VhcmNoRmllbGRSZXN1bHRzRGVjb3JhdGlvblBhcnQ6 Ci0gICAgICAgIHJldHVybiBhZGp1c3RTZWFyY2hGaWVsZFJlc3VsdHNEZWNvcmF0aW9uUGFydFN0 eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdFNlYXJj aEZpZWxkUmVzdWx0c0RlY29yYXRpb25QYXJ0U3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVs ZW1lbnQpOwogICAgIGNhc2UgU2VhcmNoRmllbGRSZXN1bHRzQnV0dG9uUGFydDoKLSAgICAgICAg cmV0dXJuIGFkanVzdFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRvblN0eWxlKHN0eWxlUmVzb2x2ZXIs IHN0eWxlLCBlKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdFNlYXJjaEZpZWxkUmVzdWx0c0J1dHRv blN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBlbGVtZW50KTsKICAgICBjYXNlIFByb2dyZXNz QmFyUGFydDoKLSAgICAgICAgcmV0dXJuIGFkanVzdFByb2dyZXNzQmFyU3R5bGUoc3R5bGVSZXNv bHZlciwgc3R5bGUsIGUpOworICAgICAgICByZXR1cm4gYWRqdXN0UHJvZ3Jlc3NCYXJTdHlsZShz dHlsZVJlc29sdmVyLCBzdHlsZSwgZWxlbWVudCk7CiAjaWYgRU5BQkxFKE1FVEVSX0VMRU1FTlQp CiAgICAgY2FzZSBNZXRlclBhcnQ6CiAgICAgY2FzZSBSZWxldmFuY3lMZXZlbEluZGljYXRvclBh cnQ6CiAgICAgY2FzZSBDb250aW51b3VzQ2FwYWNpdHlMZXZlbEluZGljYXRvclBhcnQ6CiAgICAg Y2FzZSBEaXNjcmV0ZUNhcGFjaXR5TGV2ZWxJbmRpY2F0b3JQYXJ0OgogICAgIGNhc2UgUmF0aW5n TGV2ZWxJbmRpY2F0b3JQYXJ0OgotICAgICAgICByZXR1cm4gYWRqdXN0TWV0ZXJTdHlsZShzdHls ZVJlc29sdmVyLCBzdHlsZSwgZSk7CisgICAgICAgIHJldHVybiBhZGp1c3RNZXRlclN0eWxlKHN0 eWxlUmVzb2x2ZXIsIHN0eWxlLCBlbGVtZW50KTsKICNlbmRpZgogI2lmIEVOQUJMRShTRVJWSUNF X0NPTlRST0xTKQogICAgIGNhc2UgSW1hZ2VDb250cm9sc0J1dHRvblBhcnQ6CiAgICAgICAgIGJy ZWFrOwogI2VuZGlmCiAgICAgY2FzZSBDYXBzTG9ja0luZGljYXRvclBhcnQ6Ci0gICAgICAgIHJl dHVybiBhZGp1c3RDYXBzTG9ja0luZGljYXRvclN0eWxlKHN0eWxlUmVzb2x2ZXIsIHN0eWxlLCBl KTsKKyAgICAgICAgcmV0dXJuIGFkanVzdENhcHNMb2NrSW5kaWNhdG9yU3R5bGUoc3R5bGVSZXNv bHZlciwgc3R5bGUsIGVsZW1lbnQpOwogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAg ICAgY2FzZSBBdHRhY2htZW50UGFydDoKLSAgICAgICAgcmV0dXJuIGFkanVzdEF0dGFjaG1lbnRT dHlsZShzdHlsZVJlc29sdmVyLCBzdHlsZSwgZSk7CisgICAgICAgIHJldHVybiBhZGp1c3RBdHRh Y2htZW50U3R5bGUoc3R5bGVSZXNvbHZlciwgc3R5bGUsIGVsZW1lbnQpOwogI2VuZGlmCiAgICAg ZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CkBAIC0xMjIwLDYgKzEyMjMsOCBAQCBDb2xvciBSZW5k ZXJUaGVtZTo6c3lzdGVtQ29sb3IoQ1NTVmFsdWVJRCBjc3NWYWx1ZUlkKSBjb25zdAogICAgIHN3 aXRjaCAoY3NzVmFsdWVJZCkgewogICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVib3JkZXI6CiAgICAg ICAgIHJldHVybiAweEZGRkZGRkZGOworICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVidXR0b250ZXh0 OgorICAgICAgICByZXR1cm4gMHhGRjAwMDAwMDsKICAgICBjYXNlIENTU1ZhbHVlQWN0aXZlY2Fw dGlvbjoKICAgICAgICAgcmV0dXJuIDB4RkZDQ0NDQ0M7CiAgICAgY2FzZSBDU1NWYWx1ZUFwcHdv cmtzcGFjZToKQEAgLTEyMzQsOCArMTIzOSw2IEBAIENvbG9yIFJlbmRlclRoZW1lOjpzeXN0ZW1D b2xvcihDU1NWYWx1ZUlEIGNzc1ZhbHVlSWQpIGNvbnN0CiAgICAgICAgIHJldHVybiAweEZGODg4 ODg4OwogICAgIGNhc2UgQ1NTVmFsdWVCdXR0b250ZXh0OgogICAgICAgICByZXR1cm4gMHhGRjAw MDAwMDsKLSAgICBjYXNlIENTU1ZhbHVlQWN0aXZlYnV0dG9udGV4dDoKLSAgICAgICAgcmV0dXJu IDB4RkYwMDAwMDA7CiAgICAgY2FzZSBDU1NWYWx1ZUNhcHRpb250ZXh0OgogICAgICAgICByZXR1 cm4gMHhGRjAwMDAwMDsKICAgICBjYXNlIENTU1ZhbHVlR3JheXRleHQ6CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggM2I2MDdlMDc1M2I3N2VlNjRjNjNj MWY5YzM5YjBkMGZiNTM5NTYzOS4uYmVhMjM1MjAxMWQ0NzA3YmIwMjVmYTNiNGVhZWQyNTVkODg5 NzM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAt NDY3LDYgKzQ2NywxNCBAQCBDb2xvciBSZW5kZXJUaGVtZU1hYzo6c3lzdGVtQ29sb3IoQ1NTVmFs dWVJRCBjc3NWYWx1ZUlkKSBjb25zdAogICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVib3JkZXI6CiAg ICAgICAgIGNvbG9yID0gY29udmVydE5TQ29sb3JUb0NvbG9yKFtOU0NvbG9yIGtleWJvYXJkRm9j dXNJbmRpY2F0b3JDb2xvcl0pOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIENTU1ZhbHVlQWN0 aXZlYnV0dG9udGV4dDoKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEw MTAwMAorICAgICAgICAvLyBUaGVyZSBpcyBubyBjb3JyZXNwb25kaW5nIE5TQ29sb3IgZm9yIHRo aXMgc28gd2UgdXNlIGEgaGFyZCBjb2RlZCB2YWx1ZS4KKyAgICAgICAgY29sb3IgPSAweEMwRkZG RkZGOworI2Vsc2UKKyAgICAgICAgY29sb3IgPSBjb252ZXJ0TlNDb2xvclRvQ29sb3IoW05TQ29s b3IgY29udHJvbFRleHRDb2xvcl0pOworI2VuZGlmCisgICAgICAgIGJyZWFrOwogICAgIGNhc2Ug Q1NTVmFsdWVBY3RpdmVjYXB0aW9uOgogICAgICAgICBjb2xvciA9IGNvbnZlcnROU0NvbG9yVG9D b2xvcihbTlNDb2xvciB3aW5kb3dGcmFtZVRleHRDb2xvcl0pOwogICAgICAgICBicmVhazsKQEAg LTQ5MCwxMSArNDk4LDYgQEAgQ29sb3IgUmVuZGVyVGhlbWVNYWM6OnN5c3RlbUNvbG9yKENTU1Zh bHVlSUQgY3NzVmFsdWVJZCkgY29uc3QKICAgICBjYXNlIENTU1ZhbHVlQnV0dG9udGV4dDoKICAg ICAgICAgY29sb3IgPSBjb252ZXJ0TlNDb2xvclRvQ29sb3IoW05TQ29sb3IgY29udHJvbFRleHRD b2xvcl0pOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIENTU1ZhbHVlQWN0aXZlYnV0dG9udGV4 dDoKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAotICAgICAg ICBjb2xvciA9IDB4QzBGRkZGRkY7Ci0jZW5kaWYKLSAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBD U1NWYWx1ZUNhcHRpb250ZXh0OgogICAgICAgICBjb2xvciA9IGNvbnZlcnROU0NvbG9yVG9Db2xv cihbTlNDb2xvciB0ZXh0Q29sb3JdKTsKICAgICAgICAgYnJlYWs7Cg==