113816 2013-04-02 12:03:39 -0700 [BlackBerry] Adjustments to media controls appearance 2013-04-03 13:04:16 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Other Other RESOLVED FIXED P2 Minor --- 1 jgriggs jgriggs mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 868145 0 jgriggs 2013-04-02 12:03:39 -0700 Update the media controls for the BlackBerry platform 868826 1 196385 jgriggs 2013-04-03 12:06:40 -0700 Created attachment 196385 Patch 868828 2 196385 rwlbuis 2013-04-03 12:09:57 -0700 Comment on attachment 196385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196385&action=review Please fix the ChangeLog. > Source/WebCore/ChangeLog:3 > + 2013-04-02 John Griggs <jgriggs@blackberry.com> Why the double author lines? One is enough. > Source/WebCore/ChangeLog:8 > + - upstream some other cosmetic changes to media controls that were not previously upstreamed. This should be part of your commit message below, not the bug titles. 868831 3 196387 jgriggs 2013-04-03 12:14:41 -0700 Created attachment 196387 Updated Patch with ChangeLog fixes. 868847 4 196387 rwlbuis 2013-04-03 12:40:12 -0700 Comment on attachment 196387 Updated Patch with ChangeLog fixes. Ok. 868870 5 196387 webkit.review.bot 2013-04-03 13:04:12 -0700 Comment on attachment 196387 Updated Patch with ChangeLog fixes. Clearing flags on attachment: 196387 Committed r147578: <http://trac.webkit.org/changeset/147578> 868871 6 webkit.review.bot 2013-04-03 13:04:16 -0700 All reviewed patches have been landed. Closing bug. 196385 2013-04-03 12:06:40 -0700 2013-04-03 12:14:38 -0700 Patch bug-113816-20130403150630.patch text/plain 9810 jgriggs U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUxNjU2Njk3MTBkOTI3 NTNlMDliOGI5MzA2Y2VmZDE3ODZhZWE3OS4uZTJmOGRlOGE0ZjQzY2JmMzg1MzYxZWI4Y2U1MTFm Y2NiZTE3YTk4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA0LTAyICBKb2hu IEdyaWdncyAgPGpncmlnZ3NAYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgMjAxMy0wNC0wMiAg Sm9obiBHcmlnZ3MgIDxqZ3JpZ2dzQGJsYWNrYmVycnkuY29tPgorCisgICAgICAgIFtCbGFja0Jl cnJ5XSBVcGRhdGVzIHRvIHRoZSBCbGFja0JlcnJ5IG1lZGlhIGNvbnRyb2xzOgorICAgICAgICAg LSBleHRlbmQgdGhlIHRpbWVsaW5lIHNsaWRlci4KKyAgICAgICAgIC0gbW92ZSB0aGUgdm9sdW1l IHNsaWRlciBmb3IgYXVkaW8gZWxlbWVudHMgdXAgc28gaXQgZG9lcyBub3Qgb3ZlcmxhcCB0aGUg bWFpbiBwYW5lbC4KKyAgICAgICAgIC0gdXBzdHJlYW0gc29tZSBvdGhlciBjb3NtZXRpYyBjaGFu Z2VzIHRvIG1lZGlhIGNvbnRyb2xzIHRoYXQgd2VyZSBub3QgcHJldmlvdXNseSB1cHN0cmVhbWVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEzODE2 CisgICAgICAgIGh0dHBzOi8vcHJ6aWxsYS5vdHQucW54LmNvbS9idWd6aWxsYS9zaG93X2J1Zy5j Z2k/aWQ9MzE2Mzk4CisgICAgICAgIGh0dHBzOi8vcHJ6aWxsYS5vdHQucW54LmNvbS9idWd6aWxs YS9zaG93X2J1Zy5jZ2k/aWQ9MzE2NDM4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQmxhY2tCZXJyeS1zcGVjaWZpYywgY29zbWV0aWMgY2hhbmdlOyBO byBuZXcgdGVzdHMgcmVxdWlyZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L1Jl bmRlclRoZW1lQmxhY2tCZXJyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJs YWNrQmVycnk6OmFkanVzdE1lZGlhQ29udHJvbFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVBsYXlCdXR0b24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhTXV0ZUJ1dHRvbik6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFTbGlkZXJUcmFj ayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFW b2x1bWVTbGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVy cnk6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUaHVtYik6CisKIDIwMTMtMDQtMDIgIEFuZHJleSBM dXNobmlrb3YgIDxsdXNobmlrb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDb2RlTWlycm9yXSBQb3BvdmVyIGZvciBjb2RlbWlycm9yCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJy eS5jcHAKaW5kZXggOWY3YTFhNmVlNzNiNDQ1YmUzMjllNWFkZjdjNTZmNjg2NjFiNThhMS4uZWM2 MzliMTRjMTdjZTcyOWViYzhiMTI5YWYyZGQ0YTIyN2FkOTIxOCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0Jl cnJ5LmNwcApAQCAtNTEsNyArNTEsNyBAQCBjb25zdCBmbG9hdCBtZWRpYUJhY2tCdXR0b25IZWln aHQgPSAzMzsKIC8vIFNjYWxlIGV4aXQtZnVsbHNjcmVlbiBidXR0b24gc2l6ZS4KIGNvbnN0IGZs b2F0IG1lZGlhRnVsbHNjcmVlbkJ1dHRvbkhlaWdodFJhdGlvID0gNSAvIDExLjA7CiBjb25zdCBm bG9hdCBtZWRpYUZ1bGxzY3JlZW5CdXR0b25XaWR0aFJhdGlvID0gMyAvIDExLjA7Ci1jb25zdCBm bG9hdCBtZWRpYVNsaWRlck91dGxpbmVXaWR0aCA9IDI7Citjb25zdCBmbG9hdCBtZWRpYVNsaWRl ckVuZEFkanVzdCA9IDI7CiBjb25zdCBmbG9hdCBtZWRpYVNsaWRlclRyYWNrUmFkaXVzID0gMzsK IGNvbnN0IGZsb2F0IG1lZGlhU2xpZGVyVGh1bWJXaWR0aCA9IDI1OwogY29uc3QgZmxvYXQgbWVk aWFTbGlkZXJUaHVtYkhlaWdodCA9IDI1OwpAQCAtODQ2LDE2ICs4NDYsMjAgQEAgdm9pZCBSZW5k ZXJUaGVtZUJsYWNrQmVycnk6OmFkanVzdE1lZGlhQ29udHJvbFN0eWxlKFN0eWxlUmVzb2x2ZXIq LCBSZW5kZXJTdHlsZSoKICAgICBMZW5ndGggY29udHJvbHNIZWlnaHQobWVkaWFDb250cm9sc0hl aWdodCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyLCBGaXhlZCk7CiAgICAgTGVuZ3RoIGhhbGZDb250 cm9sc1dpZHRoKG1lZGlhQ29udHJvbHNIZWlnaHQgLyAyICogZnVsbFNjcmVlbk11bHRpcGxpZXIs IEZpeGVkKTsKICAgICBMZW5ndGggZGlzcGxheUhlaWdodChtZWRpYUNvbnRyb2xzSGVpZ2h0IC8g MyAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyLCBGaXhlZCk7CisgICAgTGVuZ3RoIHZvbE9mZnNldCht ZWRpYUNvbnRyb2xzSGVpZ2h0ICogZnVsbFNjcmVlbk11bHRpcGxpZXIgKyA1LCBGaXhlZCk7CiAg ICAgTGVuZ3RoIHBhZGRpbmcobWVkaWFDb250cm9sc0hlaWdodCAvIDEwICogZnVsbFNjcmVlbk11 bHRpcGxpZXIsIEZpeGVkKTsKICAgICBmbG9hdCBmb250U2l6ZSA9IG1lZGlhQ29udHJvbHNIZWln aHQgLyAzICogZnVsbFNjcmVlbk11bHRpcGxpZXI7CiAKICAgICBzd2l0Y2ggKHN0eWxlLT5hcHBl YXJhbmNlKCkpIHsKKyAgICBjYXNlIE1lZGlhQ29udHJvbHNCYWNrZ3JvdW5kUGFydDoKKyAgICAg ICAgaWYgKGVsZW1lbnQtPnNoYWRvd1BzZXVkb0lkKCkgPT0gIi13ZWJraXQtbWVkaWEtY29udHJv bHMtcGxhY2Vob2xkZXIiKQorICAgICAgICAgICAgc3R5bGUtPnNldEhlaWdodChjb250cm9sc0hl aWdodCk7CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFQbGF5QnV0dG9uUGFydDoKICAg ICAgICAgc3R5bGUtPnNldFdpZHRoKGNvbnRyb2xzSGVpZ2h0KTsKICAgICAgICAgc3R5bGUtPnNl dEhlaWdodChjb250cm9sc0hlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFN dXRlQnV0dG9uUGFydDoKLSAgICAgICAgc3R5bGUtPnNldFBhZGRpbmdMZWZ0KHBhZGRpbmcpOwog ICAgICAgICBzdHlsZS0+c2V0V2lkdGgoY29udHJvbHNIZWlnaHQpOwogICAgICAgICBzdHlsZS0+ c2V0SGVpZ2h0KGNvbnRyb2xzSGVpZ2h0KTsKICAgICAgICAgYnJlYWs7CkBAIC04NjUsNyArODY5 LDYgQEAgdm9pZCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OmFkanVzdE1lZGlhQ29udHJvbFN0eWxl KFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSoKICAgICAgICAgc3R5bGUtPnNldEhlaWdodChj b250cm9sc0hlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFFbnRlckZ1bGxz Y3JlZW5CdXR0b25QYXJ0OgotICAgICAgICBzdHlsZS0+c2V0UGFkZGluZ1JpZ2h0KHBhZGRpbmcp OwogICAgICAgICBzdHlsZS0+c2V0V2lkdGgoY29udHJvbHNIZWlnaHQpOwogICAgICAgICBzdHls ZS0+c2V0SGVpZ2h0KGNvbnRyb2xzSGVpZ2h0KTsKICAgICAgICAgYnJlYWs7CkBAIC04ODQsNyAr ODg3LDcgQEAgdm9pZCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OmFkanVzdE1lZGlhQ29udHJvbFN0 eWxlKFN0eWxlUmVzb2x2ZXIqLCBSZW5kZXJTdHlsZSoKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBNZWRpYVZvbHVtZVNsaWRlckNvbnRhaW5lclBhcnQ6CiAgICAgICAgIHN0eWxlLT5zZXRIZWln aHQoY29udHJvbHNIZWlnaHQpOwotICAgICAgICBzdHlsZS0+c2V0Qm90dG9tKGNvbnRyb2xzSGVp Z2h0KTsKKyAgICAgICAgc3R5bGUtPnNldEJvdHRvbSh2b2xPZmZzZXQpOwogICAgICAgICBicmVh azsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKQEAgLTkyMyw4ICs5MjYsMTcgQEAgYm9v bCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVj dCogb2JqZWN0LCBjb25zdCBQYWkKIAogICAgIHN0YXRpYyBJbWFnZSogbWVkaWFQbGF5ID0gSW1h Z2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJwbGF5IikubGVha1JlZigpOwogICAgIHN0YXRpYyBJ bWFnZSogbWVkaWFQYXVzZSA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgicGF1c2UiKS5s ZWFrUmVmKCk7CisgICAgc3RhdGljIEltYWdlKiBtZWRpYVN0b3AgPSBJbWFnZTo6bG9hZFBsYXRm b3JtUmVzb3VyY2UoInN0b3AiKS5sZWFrUmVmKCk7CisgICAgSW1hZ2UqIG5vblBsYXlJbWFnZTsK KworICAgIC8vIFRoZSBCbGFja0JlcnJ5IHBvcnQgc2V0cyB0aGUgbW92aWVMb2FkVHlwZSB0byBM aXZlU3RyZWFtIGlmIGFuZCBvbmx5IGlmCisgICAgLy8gInN0b3AiIG11c3QgYmUgdXNlZCBpbnN0 ZWFkIG9mICJwYXVzZSIuCisgICAgaWYgKG1lZGlhRWxlbWVudC0+bW92aWVMb2FkVHlwZSgpID09 IE1lZGlhUGxheWVyOjpMaXZlU3RyZWFtKQorICAgICAgICBub25QbGF5SW1hZ2UgPSBtZWRpYVN0 b3A7CisgICAgZWxzZQorICAgICAgICBub25QbGF5SW1hZ2UgPSBtZWRpYVBhdXNlOwogCi0gICAg cmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhRWxl bWVudC0+Y2FuUGxheSgpID8gbWVkaWFQbGF5IDogbWVkaWFQYXVzZSk7CisgICAgcmV0dXJuIHBh aW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhRWxlbWVudC0+Y2Fu UGxheSgpID8gbWVkaWFQbGF5IDogbm9uUGxheUltYWdlKTsKICNlbHNlCiAgICAgVU5VU0VEX1BB UkFNKG9iamVjdCk7CiAgICAgVU5VU0VEX1BBUkFNKHBhaW50SW5mbyk7CkBAIC05NjQsOSArOTc2 LDkgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFNdXRlQnV0dG9uKFJl bmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWkKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgc3RhdGljIEltYWdlKiBkaXZpZGVyID0gSW1hZ2U6 OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJzcGVha2VyIikubGVha1JlZigpOworICAgIHN0YXRpYyBJ bWFnZSogc3BlYWtlciA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgic3BlYWtlciIpLmxl YWtSZWYoKTsKIAotICAgIHJldHVybiBwYWludE1lZGlhQnV0dG9uKHBhaW50SW5mby5jb250ZXh0 LCByZWN0LCBkaXZpZGVyKTsKKyAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8u Y29udGV4dCwgcmVjdCwgc3BlYWtlcik7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvYmplY3Qp OwogICAgIFVOVVNFRF9QQVJBTShwYWludEluZm8pOwpAQCAtMTAxNiwxNyArMTAyOCwyNCBAQCBi b29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9i amVjdCogb2JqZWN0LCBjb25zdCBQYQogICAgIGZsb2F0IHBvc2l0aW9uID0gbWVkaWFFbGVtZW50 LT5kdXJhdGlvbigpID4gMCA/IChtZWRpYUVsZW1lbnQtPmN1cnJlbnRUaW1lKCkgLyBtZWRpYUVs ZW1lbnQtPmR1cmF0aW9uKCkpIDogMDsKIAogICAgIGludCBpbnRyaW5zaWNIZWlnaHQgPSBjZWls KG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgLyA0KTsKLSAgICBpbnQgeCA9IGNlaWwocmVjdC54KCkg KyAobWVkaWFDb250cm9sc0hlaWdodCAtIGludHJpbnNpY0hlaWdodCkgLyAyICogZnVsbFNjcmVl bk11bHRpcGxpZXIgLSBmdWxsU2NyZWVuTXVsdGlwbGllciAvIDIpOworICAgIGludCB4ID0gY2Vp bChyZWN0LngoKSArIG1lZGlhU2xpZGVyRW5kQWRqdXN0ICogZnVsbFNjcmVlbk11bHRpcGxpZXIp OwogICAgIGludCB5ID0gY2VpbChyZWN0LnkoKSArIChtZWRpYUNvbnRyb2xzSGVpZ2h0IC8gMiAt IGludHJpbnNpY0hlaWdodCkgLyAyICogZnVsbFNjcmVlbk11bHRpcGxpZXIgKyBmdWxsU2NyZWVu TXVsdGlwbGllciAvIDIpOwotICAgIGludCB3ID0gY2VpbChyZWN0LndpZHRoKCkgLSAobWVkaWFD b250cm9sc0hlaWdodCAtIGludHJpbnNpY0hlaWdodCkgKiBmdWxsU2NyZWVuTXVsdGlwbGllciAr IGZ1bGxTY3JlZW5NdWx0aXBsaWVyIC8gMik7CisgICAgaW50IHcgPSBjZWlsKHJlY3Qud2lkdGgo KSAtIG1lZGlhU2xpZGVyRW5kQWRqdXN0ICogMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKTsKICAg ICBpbnQgaCA9IGNlaWwoaW50cmluc2ljSGVpZ2h0ICogZnVsbFNjcmVlbk11bHRpcGxpZXIpOwog ICAgIEludFJlY3QgcmVjdDIoeCwgeSwgdywgaCk7CiAKLSAgICBpbnQgd1BsYXllZCA9IGNlaWwo dyAqIHBvc2l0aW9uKTsKLSAgICBpbnQgd0xvYWRlZCA9IGNlaWwoKHcgLSBtZWRpYVNsaWRlclRo dW1iV2lkdGggKiBmdWxsU2NyZWVuTXVsdGlwbGllcikgKiBsb2FkZWQgKyBtZWRpYVNsaWRlclRo dW1iV2lkdGggKiBmdWxsU2NyZWVuTXVsdGlwbGllcik7CisgICAgLy8gV2Ugc3VidHJhY3QgYSBz bWFsbCBhbW91bnQgZnJvbSB0aGUgd2lkdGggaW4gdGhlIGNhbGN1bGF0aW9uIGJlbG93IHRvCisg ICAgLy8gcHJldmVudCB0aGUgcGxheWVkIGJhciBmcm9tIHBva2luZyBvdXQgcGFzdCB0aGUgdGh1 bWIgYWNjaWRlbnRhbGx5LgorICAgIGludCB3UGxheWVkID0gY2VpbCgodyAtIG1lZGlhU2xpZGVy RW5kQWRqdXN0KSAqIHBvc2l0aW9uKTsKKyAgICAvLyBXZSBhZGp1c3QgdGhlIGJ1ZmZlcmVkIGJh ciB0byBtYWtlIGl0IHZpc2libGUgdG8gdGhlIHJpZ2h0IG9mIHRoZSB0aHVtYi4KKyAgICAvLyBB IHNtYWxsIGFtb3VudCBpcyBzdWJ0cmFjdGVkIGZyb20gdGhlIG1lZGlhU2xpZGVyVGh1bWJXaWR0 aCBpbiB0aGUgZmlyc3QKKyAgICAvLyBwYXJ0IG9mIHRoZSBleHByZXNzaW9uIHRvIGFjY291bnQg Zm9yIHRoZSBmYWN0IHRoYXQgdGhlIHNsaWRlciB0cmFjaydzCisgICAgLy8gd2lkdGggd2FzIHNo b3J0ZW5lZCBhbmQgeCBwb3NpdGlvbiB3YXMgaW5jcmVtZW50ZWQgYWJvdmUgKHRvIG1ha2Ugc3Vy ZQorICAgIC8vIGl0cyByb3VuZGVkIGVuZHMgZ2V0IGNvdmVyZWQgYnkgdGhlIHRodW1iKS4KKyAg ICBpbnQgd0xvYWRlZCA9IGNlaWwoKHcgLSAobWVkaWFTbGlkZXJUaHVtYldpZHRoIC0gbWVkaWFT bGlkZXJFbmRBZGp1c3QpICogZnVsbFNjcmVlbk11bHRpcGxpZXIpICogbG9hZGVkICsgbWVkaWFT bGlkZXJUaHVtYldpZHRoICogZnVsbFNjcmVlbk11bHRpcGxpZXIpOwogCiAgICAgSW50UmVjdCBw bGF5ZWQoeCwgeSwgd1BsYXllZCwgaCk7Ci0gICAgSW50UmVjdCBidWZmZXJlZCh4LCB5LCB3TG9h ZGVkLCBoKTsKKyAgICBJbnRSZWN0IGJ1ZmZlcmVkKHgsIHksIHdMb2FkZWQgPiB3ID8gdyA6IHdM b2FkZWQsIGgpOwogI2lmIFVTRShTS0lBKQogICAgIC8vIFRoaXMgaXMgdG8gcGFpbnQgbWFpbiBz bGlkZXIgYmFyLgogICAgIGJvb2wgcmVzdWx0ID0gcGFpbnRTbGlkZXJUcmFja1JlY3Qob2JqZWN0 LCBwYWludEluZm8sIHJlY3QyKTsKQEAgLTExMTksNyArMTEzOCw3IEBAIGJvb2wgUmVuZGVyVGhl bWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBv YmplY3QsIGNvCiAKICAgICBpbnQgaW50cmluc2ljSGVpZ2h0ID0gY2VpbChtZWRpYVNsaWRlclRo dW1iSGVpZ2h0IC8gNCk7CiAgICAgaW50IHggPSBjZWlsKHJlY3QueCgpICsgKG1lZGlhQ29udHJv bHNIZWlnaHQgLSBpbnRyaW5zaWNIZWlnaHQpIC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyIC0g ZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyKTsKLSAgICBpbnQgeSA9IGNlaWwocmVjdC55KCkgKyAo bWVkaWFDb250cm9sc0hlaWdodCAvIDIgLSBpbnRyaW5zaWNIZWlnaHQpIC8gMiAqIGZ1bGxTY3Jl ZW5NdWx0aXBsaWVyICsgZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyKTsKKyAgICBpbnQgeSA9IGNl aWwocmVjdC55KCkgKyAobWVkaWFDb250cm9sc0hlaWdodCAtIGludHJpbnNpY0hlaWdodCkgLyAy ICogZnVsbFNjcmVlbk11bHRpcGxpZXIgKyBmdWxsU2NyZWVuTXVsdGlwbGllciAvIDIpOwogICAg IGludCB3ID0gY2VpbChyZWN0LndpZHRoKCkgLSAobWVkaWFDb250cm9sc0hlaWdodCAtIGludHJp bnNpY0hlaWdodCkgKiBmdWxsU2NyZWVuTXVsdGlwbGllciArIGZ1bGxTY3JlZW5NdWx0aXBsaWVy IC8gMik7CiAgICAgaW50IGggPSBjZWlsKGludHJpbnNpY0hlaWdodCAqIGZ1bGxTY3JlZW5NdWx0 aXBsaWVyKTsKICAgICBJbnRSZWN0IHJlY3QyKHgsIHksIHcsIGgpOwpAQCAtMTE1NywxMyArMTE3 NiwxMCBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRl clRyYWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBjbwogYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVy cnk6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29u c3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAjaWYgRU5B QkxFKFZJREVPKQotI2lmIFVTRShTS0lBKQogICAgIFJlbmRlclNsaWRlciogc2xpZGVyID0gZGV0 ZXJtaW5lUmVuZGVyU2xpZGVyKG9iamVjdCk7Ci0gICAgaWYgKCFzbGlkZXIpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQotICAgIGZsb2F0IGZ1bGxTY3JlZW5NdWx0aXBsaWVyID0gZGV0ZXJtaW5l RnVsbFNjcmVlbk11bHRpcGxpZXIodG9FbGVtZW50KHNsaWRlci0+bm9kZSgpKSk7CisgICAgZmxv YXQgZnVsbFNjcmVlbk11bHRpcGxpZXIgPSBzbGlkZXIgPyBkZXRlcm1pbmVGdWxsU2NyZWVuTXVs dGlwbGllcih0b0VsZW1lbnQoc2xpZGVyLT5ub2RlKCkpKSA6IDE7CiAKKyNpZiBVU0UoU0tJQSkK ICAgICBwYWludEluZm8uY29udGV4dC0+c2F2ZSgpOwogICAgIFBhdGggbWVkaWFUaHVtYlJvdW5k ZWRSZWN0YW5nbGU7CiAgICAgbWVkaWFUaHVtYlJvdW5kZWRSZWN0YW5nbGUuYWRkUm91bmRlZFJl Y3QocmVjdCwgRmxvYXRTaXplKG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgLyAyICogZnVsbFNjcmVl bk11bHRpcGxpZXIsIG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgLyAyICogZnVsbFNjcmVlbk11bHRp cGxpZXIpKTsKQEAgLTExNzgsNyArMTE5NCwxMSBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJy eTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlclRodW1iKFJlbmRlck9iamVjdCogb2JqZWN0LCBjbwog CiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZSAvLyBHTCByZW5kZXJlcgotICAgIHJldHVybiBwYWlu dE1lZGlhU2xpZGVyVGh1bWIob2JqZWN0LCBwYWludEluZm8sIHJlY3QpOworICAgIGludCBpbnRy aW5zaWNIZWlnaHQgPSBjZWlsKG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgLyA0KTsKKyAgICBpbnQg eSA9IGNlaWwocmVjdC55KCkgKyAobWVkaWFDb250cm9sc0hlaWdodCAvIDIgLSBpbnRyaW5zaWNI ZWlnaHQgLyAyKSAvIDIgKiBmdWxsU2NyZWVuTXVsdGlwbGllcik7CisgICAgSW50UmVjdCBhZGp1 c3RlZFJlY3QocmVjdC54KCksIHksIHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7CisKKyAg ICByZXR1cm4gcGFpbnRNZWRpYVNsaWRlclRodW1iKG9iamVjdCwgcGFpbnRJbmZvLCBhZGp1c3Rl ZFJlY3QpOwogI2VuZGlmIC8vIFVTRShTS0lBKQogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ob2Jq ZWN0KTsK 196387 2013-04-03 12:14:41 -0700 2013-04-03 13:04:12 -0700 Updated Patch with ChangeLog fixes. bug-113816-20130403151431.patch text/plain 9802 jgriggs U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NDIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUxNjU2Njk3MTBkOTI3 NTNlMDliOGI5MzA2Y2VmZDE3ODZhZWE3OS4uMTBhZjE2MmE2NTAwZjQwYjk4YjhjNjg3ZWEzNjYw ZGExMTgyMmM2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA0LTAyICBKb2hu IEdyaWdncyAgPGpncmlnZ3NAYmxhY2tiZXJyeS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEFkanVzdG1lbnRzIHRvIG1lZGlhIGNvbnRyb2xzIGFwcGVhcmFuY2UuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTM4MTYKKyAgICAgICAgaHR0cHM6 Ly9wcnppbGxhLm90dC5xbnguY29tL2J1Z3ppbGxhL3Nob3dfYnVnLmNnaT9pZD0zMTYzOTgKKyAg ICAgICAgaHR0cHM6Ly9wcnppbGxhLm90dC5xbnguY29tL2J1Z3ppbGxhL3Nob3dfYnVnLmNnaT9p ZD0zMTY0MzgKKworICAgICAgICBVcGRhdGVzIHRvIHRoZSBCbGFja0JlcnJ5IG1lZGlhIGNvbnRy b2xzOgorICAgICAgICAgLSBleHRlbmQgdGhlIHRpbWVsaW5lIHNsaWRlci4KKyAgICAgICAgIC0g bW92ZSB0aGUgdm9sdW1lIHNsaWRlciBmb3IgYXVkaW8gZWxlbWVudHMgdXAgc28gaXQgZG9lcyBu b3Qgb3ZlcmxhcCB0aGUgbWFpbiBwYW5lbC4KKyAgICAgICAgIC0gdXBzdHJlYW0gc29tZSBvdGhl ciBjb3NtZXRpYyBjaGFuZ2VzIHRvIG1lZGlhIGNvbnRyb2xzIHRoYXQgd2VyZSBub3QgcHJldmlv dXNseSB1cHN0cmVhbWVkLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEJsYWNrQmVycnktc3BlY2lmaWMsIGNvc21ldGljIGNoYW5nZTsgTm8gbmV3IHRl c3RzIHJlcXVpcmVkLgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVt ZUJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5 OjphZGp1c3RNZWRpYUNvbnRyb2xTdHlsZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZUJsYWNrQmVycnk6OnBhaW50TWVkaWFQbGF5QnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYU11dGVCdXR0b24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhU2xpZGVyVHJhY2spOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9sdW1lU2xp ZGVyVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWlu dE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIpOgorCiAyMDEzLTA0LTAyICBBbmRyZXkgTHVzaG5pa292 ICA8bHVzaG5pa292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbQ29k ZU1pcnJvcl0gUG9wb3ZlciBmb3IgY29kZW1pcnJvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwCmlu ZGV4IDlmN2ExYTZlZTczYjQ0NWJlMzI5ZTVhZGY3YzU2ZjY4NjYxYjU4YTEuLmVjNjM5YjE0YzE3 Y2U3MjllYmM4YjEyOWFmMmRkNGEyMjdhZDkyMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAK QEAgLTUxLDcgKzUxLDcgQEAgY29uc3QgZmxvYXQgbWVkaWFCYWNrQnV0dG9uSGVpZ2h0ID0gMzM7 CiAvLyBTY2FsZSBleGl0LWZ1bGxzY3JlZW4gYnV0dG9uIHNpemUuCiBjb25zdCBmbG9hdCBtZWRp YUZ1bGxzY3JlZW5CdXR0b25IZWlnaHRSYXRpbyA9IDUgLyAxMS4wOwogY29uc3QgZmxvYXQgbWVk aWFGdWxsc2NyZWVuQnV0dG9uV2lkdGhSYXRpbyA9IDMgLyAxMS4wOwotY29uc3QgZmxvYXQgbWVk aWFTbGlkZXJPdXRsaW5lV2lkdGggPSAyOworY29uc3QgZmxvYXQgbWVkaWFTbGlkZXJFbmRBZGp1 c3QgPSAyOwogY29uc3QgZmxvYXQgbWVkaWFTbGlkZXJUcmFja1JhZGl1cyA9IDM7CiBjb25zdCBm bG9hdCBtZWRpYVNsaWRlclRodW1iV2lkdGggPSAyNTsKIGNvbnN0IGZsb2F0IG1lZGlhU2xpZGVy VGh1bWJIZWlnaHQgPSAyNTsKQEAgLTg0NiwxNiArODQ2LDIwIEBAIHZvaWQgUmVuZGVyVGhlbWVC bGFja0JlcnJ5OjphZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVy U3R5bGUqCiAgICAgTGVuZ3RoIGNvbnRyb2xzSGVpZ2h0KG1lZGlhQ29udHJvbHNIZWlnaHQgKiBm dWxsU2NyZWVuTXVsdGlwbGllciwgRml4ZWQpOwogICAgIExlbmd0aCBoYWxmQ29udHJvbHNXaWR0 aChtZWRpYUNvbnRyb2xzSGVpZ2h0IC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyLCBGaXhlZCk7 CiAgICAgTGVuZ3RoIGRpc3BsYXlIZWlnaHQobWVkaWFDb250cm9sc0hlaWdodCAvIDMgKiBmdWxs U2NyZWVuTXVsdGlwbGllciwgRml4ZWQpOworICAgIExlbmd0aCB2b2xPZmZzZXQobWVkaWFDb250 cm9sc0hlaWdodCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyICsgNSwgRml4ZWQpOwogICAgIExlbmd0 aCBwYWRkaW5nKG1lZGlhQ29udHJvbHNIZWlnaHQgLyAxMCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVy LCBGaXhlZCk7CiAgICAgZmxvYXQgZm9udFNpemUgPSBtZWRpYUNvbnRyb2xzSGVpZ2h0IC8gMyAq IGZ1bGxTY3JlZW5NdWx0aXBsaWVyOwogCiAgICAgc3dpdGNoIChzdHlsZS0+YXBwZWFyYW5jZSgp KSB7CisgICAgY2FzZSBNZWRpYUNvbnRyb2xzQmFja2dyb3VuZFBhcnQ6CisgICAgICAgIGlmIChl bGVtZW50LT5zaGFkb3dQc2V1ZG9JZCgpID09ICItd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYWNl aG9sZGVyIikKKyAgICAgICAgICAgIHN0eWxlLT5zZXRIZWlnaHQoY29udHJvbHNIZWlnaHQpOwor ICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhUGxheUJ1dHRvblBhcnQ6CiAgICAgICAgIHN0 eWxlLT5zZXRXaWR0aChjb250cm9sc0hlaWdodCk7CiAgICAgICAgIHN0eWxlLT5zZXRIZWlnaHQo Y29udHJvbHNIZWlnaHQpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhTXV0ZUJ1dHRv blBhcnQ6Ci0gICAgICAgIHN0eWxlLT5zZXRQYWRkaW5nTGVmdChwYWRkaW5nKTsKICAgICAgICAg c3R5bGUtPnNldFdpZHRoKGNvbnRyb2xzSGVpZ2h0KTsKICAgICAgICAgc3R5bGUtPnNldEhlaWdo dChjb250cm9sc0hlaWdodCk7CiAgICAgICAgIGJyZWFrOwpAQCAtODY1LDcgKzg2OSw2IEBAIHZv aWQgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShTdHlsZVJl c29sdmVyKiwgUmVuZGVyU3R5bGUqCiAgICAgICAgIHN0eWxlLT5zZXRIZWlnaHQoY29udHJvbHNI ZWlnaHQpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhRW50ZXJGdWxsc2NyZWVuQnV0 dG9uUGFydDoKLSAgICAgICAgc3R5bGUtPnNldFBhZGRpbmdSaWdodChwYWRkaW5nKTsKICAgICAg ICAgc3R5bGUtPnNldFdpZHRoKGNvbnRyb2xzSGVpZ2h0KTsKICAgICAgICAgc3R5bGUtPnNldEhl aWdodChjb250cm9sc0hlaWdodCk7CiAgICAgICAgIGJyZWFrOwpAQCAtODg0LDcgKzg4Nyw3IEBA IHZvaWQgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RNZWRpYUNvbnRyb2xTdHlsZShTdHls ZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTWVkaWFW b2x1bWVTbGlkZXJDb250YWluZXJQYXJ0OgogICAgICAgICBzdHlsZS0+c2V0SGVpZ2h0KGNvbnRy b2xzSGVpZ2h0KTsKLSAgICAgICAgc3R5bGUtPnNldEJvdHRvbShjb250cm9sc0hlaWdodCk7Cisg ICAgICAgIHN0eWxlLT5zZXRCb3R0b20odm9sT2Zmc2V0KTsKICAgICAgICAgYnJlYWs7CiAgICAg ZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CkBAIC05MjMsOCArOTI2LDE3IEBAIGJvb2wgUmVuZGVy VGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhUGxheUJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVj dCwgY29uc3QgUGFpCiAKICAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhUGxheSA9IEltYWdlOjpsb2Fk UGxhdGZvcm1SZXNvdXJjZSgicGxheSIpLmxlYWtSZWYoKTsKICAgICBzdGF0aWMgSW1hZ2UqIG1l ZGlhUGF1c2UgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInBhdXNlIikubGVha1JlZigp OworICAgIHN0YXRpYyBJbWFnZSogbWVkaWFTdG9wID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291 cmNlKCJzdG9wIikubGVha1JlZigpOworICAgIEltYWdlKiBub25QbGF5SW1hZ2U7CisKKyAgICAv LyBUaGUgQmxhY2tCZXJyeSBwb3J0IHNldHMgdGhlIG1vdmllTG9hZFR5cGUgdG8gTGl2ZVN0cmVh bSBpZiBhbmQgb25seSBpZgorICAgIC8vICJzdG9wIiBtdXN0IGJlIHVzZWQgaW5zdGVhZCBvZiAi cGF1c2UiLgorICAgIGlmIChtZWRpYUVsZW1lbnQtPm1vdmllTG9hZFR5cGUoKSA9PSBNZWRpYVBs YXllcjo6TGl2ZVN0cmVhbSkKKyAgICAgICAgbm9uUGxheUltYWdlID0gbWVkaWFTdG9wOworICAg IGVsc2UKKyAgICAgICAgbm9uUGxheUltYWdlID0gbWVkaWFQYXVzZTsKIAotICAgIHJldHVybiBw YWludE1lZGlhQnV0dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBtZWRpYUVsZW1lbnQtPmNh blBsYXkoKSA/IG1lZGlhUGxheSA6IG1lZGlhUGF1c2UpOworICAgIHJldHVybiBwYWludE1lZGlh QnV0dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBtZWRpYUVsZW1lbnQtPmNhblBsYXkoKSA/ IG1lZGlhUGxheSA6IG5vblBsYXlJbWFnZSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvYmpl Y3QpOwogICAgIFVOVVNFRF9QQVJBTShwYWludEluZm8pOwpAQCAtOTY0LDkgKzk3Niw5IEBAIGJv b2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmpl Y3QqIG9iamVjdCwgY29uc3QgUGFpCiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKIAotICAgIHN0YXRpYyBJbWFnZSogZGl2aWRlciA9IEltYWdlOjpsb2FkUGxh dGZvcm1SZXNvdXJjZSgic3BlYWtlciIpLmxlYWtSZWYoKTsKKyAgICBzdGF0aWMgSW1hZ2UqIHNw ZWFrZXIgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInNwZWFrZXIiKS5sZWFrUmVmKCk7 CiAKLSAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8uY29udGV4dCwgcmVjdCwg ZGl2aWRlcik7CisgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQs IHJlY3QsIHNwZWFrZXIpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ob2JqZWN0KTsKICAgICBV TlVTRURfUEFSQU0ocGFpbnRJbmZvKTsKQEAgLTEwMTYsMTcgKzEwMjgsMjQgQEAgYm9vbCBSZW5k ZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9i amVjdCwgY29uc3QgUGEKICAgICBmbG9hdCBwb3NpdGlvbiA9IG1lZGlhRWxlbWVudC0+ZHVyYXRp b24oKSA+IDAgPyAobWVkaWFFbGVtZW50LT5jdXJyZW50VGltZSgpIC8gbWVkaWFFbGVtZW50LT5k dXJhdGlvbigpKSA6IDA7CiAKICAgICBpbnQgaW50cmluc2ljSGVpZ2h0ID0gY2VpbChtZWRpYVNs aWRlclRodW1iSGVpZ2h0IC8gNCk7Ci0gICAgaW50IHggPSBjZWlsKHJlY3QueCgpICsgKG1lZGlh Q29udHJvbHNIZWlnaHQgLSBpbnRyaW5zaWNIZWlnaHQpIC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBs aWVyIC0gZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyKTsKKyAgICBpbnQgeCA9IGNlaWwocmVjdC54 KCkgKyBtZWRpYVNsaWRlckVuZEFkanVzdCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKTsKICAgICBp bnQgeSA9IGNlaWwocmVjdC55KCkgKyAobWVkaWFDb250cm9sc0hlaWdodCAvIDIgLSBpbnRyaW5z aWNIZWlnaHQpIC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyICsgZnVsbFNjcmVlbk11bHRpcGxp ZXIgLyAyKTsKLSAgICBpbnQgdyA9IGNlaWwocmVjdC53aWR0aCgpIC0gKG1lZGlhQ29udHJvbHNI ZWlnaHQgLSBpbnRyaW5zaWNIZWlnaHQpICogZnVsbFNjcmVlbk11bHRpcGxpZXIgKyBmdWxsU2Ny ZWVuTXVsdGlwbGllciAvIDIpOworICAgIGludCB3ID0gY2VpbChyZWN0LndpZHRoKCkgLSBtZWRp YVNsaWRlckVuZEFkanVzdCAqIDIgKiBmdWxsU2NyZWVuTXVsdGlwbGllcik7CiAgICAgaW50IGgg PSBjZWlsKGludHJpbnNpY0hlaWdodCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKTsKICAgICBJbnRS ZWN0IHJlY3QyKHgsIHksIHcsIGgpOwogCi0gICAgaW50IHdQbGF5ZWQgPSBjZWlsKHcgKiBwb3Np dGlvbik7Ci0gICAgaW50IHdMb2FkZWQgPSBjZWlsKCh3IC0gbWVkaWFTbGlkZXJUaHVtYldpZHRo ICogZnVsbFNjcmVlbk11bHRpcGxpZXIpICogbG9hZGVkICsgbWVkaWFTbGlkZXJUaHVtYldpZHRo ICogZnVsbFNjcmVlbk11bHRpcGxpZXIpOworICAgIC8vIFdlIHN1YnRyYWN0IGEgc21hbGwgYW1v dW50IGZyb20gdGhlIHdpZHRoIGluIHRoZSBjYWxjdWxhdGlvbiBiZWxvdyB0bworICAgIC8vIHBy ZXZlbnQgdGhlIHBsYXllZCBiYXIgZnJvbSBwb2tpbmcgb3V0IHBhc3QgdGhlIHRodW1iIGFjY2lk ZW50YWxseS4KKyAgICBpbnQgd1BsYXllZCA9IGNlaWwoKHcgLSBtZWRpYVNsaWRlckVuZEFkanVz dCkgKiBwb3NpdGlvbik7CisgICAgLy8gV2UgYWRqdXN0IHRoZSBidWZmZXJlZCBiYXIgdG8gbWFr ZSBpdCB2aXNpYmxlIHRvIHRoZSByaWdodCBvZiB0aGUgdGh1bWIuCisgICAgLy8gQSBzbWFsbCBh bW91bnQgaXMgc3VidHJhY3RlZCBmcm9tIHRoZSBtZWRpYVNsaWRlclRodW1iV2lkdGggaW4gdGhl IGZpcnN0CisgICAgLy8gcGFydCBvZiB0aGUgZXhwcmVzc2lvbiB0byBhY2NvdW50IGZvciB0aGUg ZmFjdCB0aGF0IHRoZSBzbGlkZXIgdHJhY2sncworICAgIC8vIHdpZHRoIHdhcyBzaG9ydGVuZWQg YW5kIHggcG9zaXRpb24gd2FzIGluY3JlbWVudGVkIGFib3ZlICh0byBtYWtlIHN1cmUKKyAgICAv LyBpdHMgcm91bmRlZCBlbmRzIGdldCBjb3ZlcmVkIGJ5IHRoZSB0aHVtYikuCisgICAgaW50IHdM b2FkZWQgPSBjZWlsKCh3IC0gKG1lZGlhU2xpZGVyVGh1bWJXaWR0aCAtIG1lZGlhU2xpZGVyRW5k QWRqdXN0KSAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKSAqIGxvYWRlZCArIG1lZGlhU2xpZGVyVGh1 bWJXaWR0aCAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKTsKIAogICAgIEludFJlY3QgcGxheWVkKHgs IHksIHdQbGF5ZWQsIGgpOwotICAgIEludFJlY3QgYnVmZmVyZWQoeCwgeSwgd0xvYWRlZCwgaCk7 CisgICAgSW50UmVjdCBidWZmZXJlZCh4LCB5LCB3TG9hZGVkID4gdyA/IHcgOiB3TG9hZGVkLCBo KTsKICNpZiBVU0UoU0tJQSkKICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IG1haW4gc2xpZGVyIGJh ci4KICAgICBib29sIHJlc3VsdCA9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJ bmZvLCByZWN0Mik7CkBAIC0xMTE5LDcgKzExMzgsNyBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tC ZXJyeTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBj bwogCiAgICAgaW50IGludHJpbnNpY0hlaWdodCA9IGNlaWwobWVkaWFTbGlkZXJUaHVtYkhlaWdo dCAvIDQpOwogICAgIGludCB4ID0gY2VpbChyZWN0LngoKSArIChtZWRpYUNvbnRyb2xzSGVpZ2h0 IC0gaW50cmluc2ljSGVpZ2h0KSAvIDIgKiBmdWxsU2NyZWVuTXVsdGlwbGllciAtIGZ1bGxTY3Jl ZW5NdWx0aXBsaWVyIC8gMik7Ci0gICAgaW50IHkgPSBjZWlsKHJlY3QueSgpICsgKG1lZGlhQ29u dHJvbHNIZWlnaHQgLyAyIC0gaW50cmluc2ljSGVpZ2h0KSAvIDIgKiBmdWxsU2NyZWVuTXVsdGlw bGllciArIGZ1bGxTY3JlZW5NdWx0aXBsaWVyIC8gMik7CisgICAgaW50IHkgPSBjZWlsKHJlY3Qu eSgpICsgKG1lZGlhQ29udHJvbHNIZWlnaHQgLSBpbnRyaW5zaWNIZWlnaHQpIC8gMiAqIGZ1bGxT Y3JlZW5NdWx0aXBsaWVyICsgZnVsbFNjcmVlbk11bHRpcGxpZXIgLyAyKTsKICAgICBpbnQgdyA9 IGNlaWwocmVjdC53aWR0aCgpIC0gKG1lZGlhQ29udHJvbHNIZWlnaHQgLSBpbnRyaW5zaWNIZWln aHQpICogZnVsbFNjcmVlbk11bHRpcGxpZXIgKyBmdWxsU2NyZWVuTXVsdGlwbGllciAvIDIpOwog ICAgIGludCBoID0gY2VpbChpbnRyaW5zaWNIZWlnaHQgKiBmdWxsU2NyZWVuTXVsdGlwbGllcik7 CiAgICAgSW50UmVjdCByZWN0Mih4LCB5LCB3LCBoKTsKQEAgLTExNTcsMTMgKzExNzYsMTAgQEAg Ym9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhS ZW5kZXJPYmplY3QqIG9iamVjdCwgY28KIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWlu dE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50 SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogI2lmIEVOQUJMRShWSURF TykKLSNpZiBVU0UoU0tJQSkKICAgICBSZW5kZXJTbGlkZXIqIHNsaWRlciA9IGRldGVybWluZVJl bmRlclNsaWRlcihvYmplY3QpOwotICAgIGlmICghc2xpZGVyKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KLSAgICBmbG9hdCBmdWxsU2NyZWVuTXVsdGlwbGllciA9IGRldGVybWluZUZ1bGxTY3Jl ZW5NdWx0aXBsaWVyKHRvRWxlbWVudChzbGlkZXItPm5vZGUoKSkpOworICAgIGZsb2F0IGZ1bGxT Y3JlZW5NdWx0aXBsaWVyID0gc2xpZGVyID8gZGV0ZXJtaW5lRnVsbFNjcmVlbk11bHRpcGxpZXIo dG9FbGVtZW50KHNsaWRlci0+bm9kZSgpKSkgOiAxOwogCisjaWYgVVNFKFNLSUEpCiAgICAgcGFp bnRJbmZvLmNvbnRleHQtPnNhdmUoKTsKICAgICBQYXRoIG1lZGlhVGh1bWJSb3VuZGVkUmVjdGFu Z2xlOwogICAgIG1lZGlhVGh1bWJSb3VuZGVkUmVjdGFuZ2xlLmFkZFJvdW5kZWRSZWN0KHJlY3Qs IEZsb2F0U2l6ZShtZWRpYVNsaWRlclRodW1iSGVpZ2h0IC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBs aWVyLCBtZWRpYVNsaWRlclRodW1iSGVpZ2h0IC8gMiAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKSk7 CkBAIC0xMTc4LDcgKzExOTQsMTEgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50 TWVkaWFWb2x1bWVTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwgY28KIAogICAgIHJl dHVybiB0cnVlOwogI2Vsc2UgLy8gR0wgcmVuZGVyZXIKLSAgICByZXR1cm4gcGFpbnRNZWRpYVNs aWRlclRodW1iKG9iamVjdCwgcGFpbnRJbmZvLCByZWN0KTsKKyAgICBpbnQgaW50cmluc2ljSGVp Z2h0ID0gY2VpbChtZWRpYVNsaWRlclRodW1iSGVpZ2h0IC8gNCk7CisgICAgaW50IHkgPSBjZWls KHJlY3QueSgpICsgKG1lZGlhQ29udHJvbHNIZWlnaHQgLyAyIC0gaW50cmluc2ljSGVpZ2h0IC8g MikgLyAyICogZnVsbFNjcmVlbk11bHRpcGxpZXIpOworICAgIEludFJlY3QgYWRqdXN0ZWRSZWN0 KHJlY3QueCgpLCB5LCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworCisgICAgcmV0dXJu IHBhaW50TWVkaWFTbGlkZXJUaHVtYihvYmplY3QsIHBhaW50SW5mbywgYWRqdXN0ZWRSZWN0KTsK ICNlbmRpZiAvLyBVU0UoU0tJQSkKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG9iamVjdCk7Cg==