82946 2012-04-02 14:25:22 -0700 Rename GraphicsContext::drawLineForTextChecking() to GraphicsContext::drawLineForDocumentMarker() 2012-04-03 10:43:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac (Intel) OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 82503 1 jiapu.mail jiapu.mail webkit.review.bot oldest_to_newest 593843 0 jiapu.mail 2012-04-02 14:25:22 -0700 On OSX, we draw similar underline on dictated text that has alternative text. We should rename this function, so that we can reuse it with dictation. 593861 1 jiapu.mail 2012-04-02 14:37:12 -0700 <rdar://problem/11169336> 594009 2 135227 jiapu.mail 2012-04-02 16:44:28 -0700 Created attachment 135227 Patch (V1) 594149 3 mrowe 2012-04-02 19:43:57 -0700 It is OS X, not OSX. 594153 4 135227 simon.fraser 2012-04-02 19:51:36 -0700 Comment on attachment 135227 Patch (V1) View in context: https://bugs.webkit.org/attachment.cgi?id=135227&action=review > Source/WebCore/ChangeLog:8 > + On OSX, we draw similar underline on dictated text that has alternative text. We rename OS X 594538 5 135338 jiapu.mail 2012-04-03 09:02:04 -0700 Created attachment 135338 Fixed a typo. 594596 6 135338 enrica 2012-04-03 10:16:21 -0700 Comment on attachment 135338 Fixed a typo. Looks good. 594629 7 135338 webkit.review.bot 2012-04-03 10:43:03 -0700 Comment on attachment 135338 Fixed a typo. Clearing flags on attachment: 135338 Committed r113059: <http://trac.webkit.org/changeset/113059> 594631 8 webkit.review.bot 2012-04-03 10:43:07 -0700 All reviewed patches have been landed. Closing bug. 135227 2012-04-02 16:44:28 -0700 2012-04-03 09:02:01 -0700 Patch (V1) bug-82946-20120402164427.patch text/plain 15138 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQ4MjQxYTJkYTRjYmIx NzEwNDU2OGEyYzk2ZjgwMzgzMTUyZTNhMy4uNjQ3ODg5YjVlMGQ3YzI2YTU0ODlhY2VkZGU4ZjE0 NzI5ZDU1MThmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA0LTAyICBKaWEg UHUgIDxqcHVAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBHcmFwaGljc0NvbnRleHQ6OmRy YXdMaW5lRm9yVGV4dENoZWNraW5nKCkgdG8gR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRv Y3VtZW50TWFya2VyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgyOTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gT1NYLCB3ZSBkcmF3IHNpbWlsYXIgdW5kZXJsaW5lIG9uIGRpY3RhdGVkIHRleHQg dGhhdCBoYXMgYWx0ZXJuYXRpdmUgdGV4dC4gV2UgcmVuYW1lCisgICAgICAgIHRoaXMgZnVuY3Rp b24sIHNvIHRoYXQgd2UgY2FuIHJldXNlIGl0IGZvciBkaWN0YXRpb24gdW5kZXJsaW5lLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cywgc2luY2UgdGhlcmUncyBubyBjaGFuZ2Ugb2YgZnVuY3Rpb25h bGl0eS4gCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1l bnRNYXJrZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFwaGljc0NvbnRl eHRNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9y RG9jdW1lbnRNYXJrZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9HcmFw aGljc0NvbnRleHRPcGVuVkcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIpOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNFLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1h cmtlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd3gvR3JhcGhpY3NDb250ZXh0V3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3Vt ZW50TWFya2VyKToKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpsaW5lU3R5bGVGb3JNYXJrZXJUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZVRleHRCb3g6OnBhaW50U3BlbGxpbmdPckdyYW1tYXJNYXJrZXIpOgorCiAyMDEyLTA0 LTAyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEFT U0VSVElPTiBGQUlMRUQ6IG1fcHVyZ2VQcmV2ZW50Q291bnQgaW4gRm9udENhY2hlOjpnZXRDYWNo ZWRGb250RGF0YSBydW5uaW5nIHN2Zy9jdXN0b20vYW5pbWF0ZS1kaXNhbGxvd2VkLXVzZS1lbGVt ZW50LnN2ZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3Jh cGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuaAppbmRleCBjNzIyY2JjZTQ3YjYwNWVlZjFiZGU4Y2M5OWExNGYwZWEzNmQzMjAx Li45ZTQ2OTk5MjQ4MTc1OTk1NWQ1NzYyYjAyNzQ5ZTI4Y2Q0ZDQ3ZWY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaApAQCAtMzU1 LDEyICszNTUsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBGbG9hdFJlY3Qgcm91 bmRUb0RldmljZVBpeGVscyhjb25zdCBGbG9hdFJlY3QmLCBSb3VuZGluZ01vZGUgPSBSb3VuZEFs bFNpZGVzKTsKIAogICAgICAgICB2b2lkIGRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFBvaW50 JiwgZmxvYXQgd2lkdGgsIGJvb2wgcHJpbnRpbmcpOwotICAgICAgICBlbnVtIFRleHRDaGVja2lu Z0xpbmVTdHlsZSB7Ci0gICAgICAgICAgICBUZXh0Q2hlY2tpbmdTcGVsbGluZ0xpbmVTdHlsZSwK LSAgICAgICAgICAgIFRleHRDaGVja2luZ0dyYW1tYXJMaW5lU3R5bGUsCi0gICAgICAgICAgICBU ZXh0Q2hlY2tpbmdSZXBsYWNlbWVudExpbmVTdHlsZQorICAgICAgICBlbnVtIERvY3VtZW50TWFy a2VyTGluZVN0eWxlIHsKKyAgICAgICAgICAgIERvY3VtZW50TWFya2VyU3BlbGxpbmdMaW5lU3R5 bGUsCisgICAgICAgICAgICBEb2N1bWVudE1hcmtlckdyYW1tYXJMaW5lU3R5bGUsCisgICAgICAg ICAgICBEb2N1bWVudE1hcmtlckF1dG9jb3JyZWN0aW9uUmVwbGFjZW1lbnRMaW5lU3R5bGUsCisg ICAgICAgICAgICBEb2N1bWVudE1hcmtlckRpY3RhdGlvbkFsdGVybmF0aXZlc0xpbmVTdHlsZQog ICAgICAgICB9OwotICAgICAgICB2b2lkIGRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0IEZs b2F0UG9pbnQmLCBmbG9hdCB3aWR0aCwgVGV4dENoZWNraW5nTGluZVN0eWxlKTsKKyAgICAgICAg dm9pZCBkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0UG9pbnQmLCBmbG9hdCB3 aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUpOwogCiAgICAgICAgIGJvb2wgcGFpbnRpbmdE aXNhYmxlZCgpIGNvbnN0OwogICAgICAgICB2b2lkIHNldFBhaW50aW5nRGlzYWJsZWQoYm9vbCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9HcmFw aGljc0NvbnRleHRDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKaW5kZXggYmE4ODZhMDNjMmM5MDYyMjM0MzNh MzNjMDJlNjQwNTM3NzY5MzkwZi4uZWM4NDZmMTRiOTZkZjI2NThhYzc5ODBkOGQ0YjVhOTRiMGMy MzAxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8v R3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcApAQCAtNjgyLDcgKzY4Miw3IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQb2ludCYg b3JpZ2luLCBmbG9hdCB3aWR0aCwgYm9vCiAjaW5jbHVkZSAiRHJhd0Vycm9yVW5kZXJsaW5lLmgi CiAjZW5kaWYKIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5n KGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVT dHlsZSBzdHlsZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFy a2VyKGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQgd2lkdGgsIERvY3VtZW50TWFya2Vy TGluZVN0eWxlIHN0eWxlKQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAg IHJldHVybjsKQEAgLTY5MSwxMCArNjkxLDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 TGluZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpCiAg ICAgY2Fpcm9fc2F2ZShjcik7CiAKICAgICBzd2l0Y2ggKHN0eWxlKSB7Ci0gICAgY2FzZSBUZXh0 Q2hlY2tpbmdTcGVsbGluZ0xpbmVTdHlsZToKKyAgICBjYXNlIERvY3VtZW50TWFya2VyU3BlbGxp bmdMaW5lU3R5bGU6CiAgICAgICAgIGNhaXJvX3NldF9zb3VyY2VfcmdiKGNyLCAxLCAwLCAwKTsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBUZXh0Q2hlY2tpbmdHcmFtbWFyTGluZVN0eWxlOgor ICAgIGNhc2UgRG9jdW1lbnRNYXJrZXJHcmFtbWFyTGluZVN0eWxlOgogICAgICAgICBjYWlyb19z ZXRfc291cmNlX3JnYihjciwgMCwgMSwgMCk7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhp Y3NDb250ZXh0TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dy YXBoaWNzQ29udGV4dE1hYy5tbQppbmRleCBhY2VkOTZiMmY0ZTdmZmMzODNjZWZlNzFkYjc5YTY2 YTlhYzY2ODIyLi5lMDg1OTFkZjQ2MDFjMjIyMTFiMTA0MjI5NmE1Yzc1N2Q3MmEwYzNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250 ZXh0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HcmFw aGljc0NvbnRleHRNYWMubW0KQEAgLTk5LDcgKzk5LDcgQEAgc3RhdGljIE5TQ29sb3IqIGNyZWF0 ZVBhdHRlcm5Db2xvcihOU1N0cmluZyogZmlyc3RDaG9pY2VOYW1lLCBOU1N0cmluZyogc2Vjb25k Q2gKIH0KIAogLy8gV2ViS2l0IG9uIE1hYyBpcyBhIHN0YW5kYXJkIHBsYXRmb3JtIGNvbXBvbmVu dCwgc28gaXQgbXVzdCB1c2UgdGhlIHN0YW5kYXJkIHBsYXRmb3JtIGFydHdvcmsgZm9yIHVuZGVy bGluZS4KLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25z dCBGbG9hdFBvaW50JiBwb2ludCwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSBz dHlsZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNv bnN0IEZsb2F0UG9pbnQmIHBvaW50LCBmbG9hdCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5 bGUgc3R5bGUpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJu OwpAQCAtMTExLDcgKzExMSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRl eHRDaGVja2luZyhjb25zdCBGbG9hdFBvaW50JiBwb2ludCwgZmxvYXQgd2lkCiAgICAgYm9vbCB1 c2luZ0RvdDsKICAgICBOU0NvbG9yICpwYXR0ZXJuQ29sb3I7CiAgICAgc3dpdGNoIChzdHlsZSkg ewotICAgICAgICBjYXNlIFRleHRDaGVja2luZ1NwZWxsaW5nTGluZVN0eWxlOgorICAgICAgICBj YXNlIERvY3VtZW50TWFya2VyU3BlbGxpbmdMaW5lU3R5bGU6CiAgICAgICAgIHsKICAgICAgICAg ICAgIC8vIENvbnN0YW50cyBmb3Igc3BlbGxpbmcgcGF0dGVybiBjb2xvci4KICAgICAgICAgICAg IHN0YXRpYyBib29sIHVzaW5nRG90Rm9yU3BlbGxpbmcgPSBmYWxzZTsKQEAgLTEyMCw3ICsxMjAs NyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3Qg RmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZAogICAgICAgICAgICAgcGF0dGVybkNvbG9yID0g c3BlbGxpbmdQYXR0ZXJuQ29sb3IuZ2V0KCk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQotICAgICAgICBjYXNlIFRleHRDaGVja2luZ0dyYW1tYXJMaW5lU3R5bGU6CisgICAgICAgIGNh c2UgRG9jdW1lbnRNYXJrZXJHcmFtbWFyTGluZVN0eWxlOgogICAgICAgICB7CiAgICAgICAgICAg ICAvLyBDb25zdGFudHMgZm9yIGdyYW1tYXIgcGF0dGVybiBjb2xvci4KICAgICAgICAgICAgIHN0 YXRpYyBib29sIHVzaW5nRG90Rm9yR3JhbW1hciA9IGZhbHNlOwpAQCAtMTMxLDcgKzEzMSw4IEBA IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9h dFBvaW50JiBwb2ludCwgZmxvYXQgd2lkCiAgICAgICAgIH0KICNpZiBQTEFURk9STShNQUMpICYm ICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1NO T1dfTEVPUEFSRCkKICAgICAgICAgLy8gVG8gc3VwcG9ydCBjb3JyZWN0aW9uIHBhbmVsLgotICAg ICAgICBjYXNlIFRleHRDaGVja2luZ1JlcGxhY2VtZW50TGluZVN0eWxlOgorICAgICAgICBjYXNl IERvY3VtZW50TWFya2VyQXV0b2NvcnJlY3Rpb25SZXBsYWNlbWVudExpbmVTdHlsZToKKyAgICAg ICAgY2FzZSBEb2N1bWVudE1hcmtlckRpY3RhdGlvbkFsdGVybmF0aXZlc0xpbmVTdHlsZToKICAg ICAgICAgewogICAgICAgICAgICAgLy8gQ29uc3RhbnRzIGZvciBzcGVsbGluZyBwYXR0ZXJuIGNv bG9yLgogICAgICAgICAgICAgc3RhdGljIGJvb2wgdXNpbmdEb3RGb3JTcGVsbGluZyA9IGZhbHNl OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dy YXBoaWNzQ29udGV4dE9wZW5WRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9vcGVudmcvR3JhcGhpY3NDb250ZXh0T3BlblZHLmNwcAppbmRleCA0NDE3ZDdiODExNzYyMzFi ZTc0ZTFjNmViYzE0YWNiNjM4ZGMxZTVkLi43NGM5NGYzZDQwZThlYmIxYTQ4ZTI1Y2YyNDk1OTE4 ZDJlMzc2ODE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9v cGVudmcvR3JhcGhpY3NDb250ZXh0T3BlblZHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVudmcvR3JhcGhpY3NDb250ZXh0T3BlblZHLmNwcApAQCAtMjQ2LDcg KzI0Niw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgSW50 UG9pbnQmIG9yaWdpbiwgaW50IHdpZHRoLCBib29sIHByCiAgICAgVU5VU0VEX1BBUkFNKHByaW50 aW5nKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5n KGNvbnN0IEludFBvaW50JiBvcmlnaW4sIGludCB3aWR0aCwgVGV4dENoZWNraW5nTGluZVN0eWxl IHN0eWxlKQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIo Y29uc3QgSW50UG9pbnQmIG9yaWdpbiwgaW50IHdpZHRoLCBEb2N1bWVudE1hcmtlckxpbmVTdHls ZSBzdHlsZSkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHRRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHRRdC5jcHAKaW5kZXggYWE0OWUyZGRmZjIyYzg0NGRhYzQ2YWI4ZGQ2ZDQ0ODE1 MTRiMmIzNy4uYjhlOTVmMjVmODFkMzg5OTFiNTMzYmY4NTAyZmM5YjEwZTA1MzZjYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0 UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNz Q29udGV4dFF0LmNwcApAQCAtOTc1LDcgKzk3NSw3IEBAIHN0YXRpYyB2b2lkIGRyYXdFcnJvclVu ZGVybGluZShRUGFpbnRlciAqcGFpbnRlciwgcXJlYWwgeCwgcXJlYWwgeSwgcXJlYWwgd2lkdGgs CiB9CiAKIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNv bnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHls ZSBzdHlsZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2Vy KGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQgd2lkdGgsIERvY3VtZW50TWFya2VyTGlu ZVN0eWxlIHN0eWxlKQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJl dHVybjsKQEAgLTk4NCwxMCArOTg0LDEwIEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGlu ZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpCiAgICAg Y29uc3QgUVBlbiBvcmlnaW5hbFBlbiA9IHBhaW50ZXItPnBlbigpOwogCiAgICAgc3dpdGNoIChz dHlsZSkgewotICAgIGNhc2UgVGV4dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGU6CisgICAgY2Fz ZSBEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0eWxlOgogICAgICAgICBwYWludGVyLT5zZXRQ ZW4oUXQ6OnJlZCk7CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgVGV4dENoZWNraW5nR3JhbW1h ckxpbmVTdHlsZToKKyAgICBjYXNlIERvY3VtZW50TWFya2VyR3JhbW1hckxpbmVTdHlsZToKICAg ICAgICAgcGFpbnRlci0+c2V0UGVuKFF0OjpncmVlbik7CiAgICAgICAgIGJyZWFrOwogICAgIGRl ZmF1bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAppbmRleCA0Mzg5YjA0N2IwMGIyYzBhZDBh MjNhNzMzYTNhMGY5OTU4MWRlZmUzLi5hZDQzM2UxZDQxZTc1YjNkMDBhMGFhNTZhNzdjY2U3YzM2 YzljZjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAKQEAgLTUxMCw3ICs1MTAsNyBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmUoY29uc3QgSW50UG9pbnQmIHBvaW50MSwgY29u c3QgSW50UG9pbnQmIHBvaW50MikKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+ZGlkRHJhd1BvaW50 cyhTa0NhbnZhczo6a0xpbmVzX1BvaW50TW9kZSwgMiwgcHRzLCBwYWludCk7CiB9CiAKLXZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9hdFBvaW50 JiBwdCwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSBzdHlsZSkKK3ZvaWQgR3Jh cGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0UG9pbnQm IHB0LCBmbG9hdCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgc3R5bGUpCiB7CiAgICAg aWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRD R1dpbi5jcHAKaW5kZXggZjNhOTE5ZDcxM2JhNmU3MzQ2ZDVlMzFhYTA2MjE0N2U2NTllNDIzZC4u MDYzZjdjYjY5YTkwOTkxMWExNjUwOWU4NjU3OGQ0NjcwMGRjMjhlNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29udGV4dENHV2luLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250 ZXh0Q0dXaW4uY3BwCkBAIC0xODEsMTIgKzE4MSwxMiBAQCBzdGF0aWMgY29uc3QgQ29sb3ImIGdy YW1tYXJQYXR0ZXJuQ29sb3IoKSB7CiAgICAgcmV0dXJuIGdyYW1tYXJDb2xvcjsKIH0KIAotdm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0IEZsb2F0UG9p bnQmIHBvaW50LCBmbG9hdCB3aWR0aCwgVGV4dENoZWNraW5nTGluZVN0eWxlIHN0eWxlKQordm9p ZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIoY29uc3QgRmxvYXRQ b2ludCYgcG9pbnQsIGZsb2F0IHdpZHRoLCBEb2N1bWVudE1hcmtlckxpbmVTdHlsZSBzdHlsZSkK IHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBp ZiAoc3R5bGUgIT0gVGV4dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGUgJiYgc3R5bGUgIT0gVGV4 dENoZWNraW5nR3JhbW1hckxpbmVTdHlsZSkKKyAgICBpZiAoc3R5bGUgIT0gRG9jdW1lbnRNYXJr ZXJTcGVsbGluZ0xpbmVTdHlsZSAmJiBzdHlsZSAhPSBEb2N1bWVudE1hcmtlckdyYW1tYXJMaW5l U3R5bGUpCiAgICAgICAgIHJldHVybjsKIAogICAgIC8vIFRoZXNlIGFyZSB0aGUgc2FtZSBmb3Ig bWlzc3BlbGxpbmcgb3IgYmFkIGdyYW1tYXIKQEAgLTIwOSw3ICsyMDksNyBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2ludCYgcG9p bnQsIGZsb2F0IHdpZAogICAgIENHQ29udGV4dFJlZiBjb250ZXh0ID0gcGxhdGZvcm1Db250ZXh0 KCk7CiAgICAgQ0dDb250ZXh0U2F2ZUdTdGF0ZShjb250ZXh0KTsKIAotICAgIGNvbnN0IENvbG9y JiBwYXR0ZXJuQ29sb3IgPSBzdHlsZSA9PSBUZXh0Q2hlY2tpbmdHcmFtbWFyTGluZVN0eWxlID8g Z3JhbW1hclBhdHRlcm5Db2xvcigpIDogc3BlbGxpbmdQYXR0ZXJuQ29sb3IoKTsKKyAgICBjb25z dCBDb2xvciYgcGF0dGVybkNvbG9yID0gc3R5bGUgPT0gRG9jdW1lbnRNYXJrZXJHcmFtbWFyTGlu ZVN0eWxlID8gZ3JhbW1hclBhdHRlcm5Db2xvcigpIDogc3BlbGxpbmdQYXR0ZXJuQ29sb3IoKTsK ICAgICBzZXRDR1N0cm9rZUNvbG9yKGNvbnRleHQsIHBhdHRlcm5Db2xvcik7CiAKICAgICB3a1Nl dFBhdHRlcm5QaGFzZUluVXNlclNwYWNlKGNvbnRleHQsIHBvaW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29udGV4dFdpbkNF LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dyYXBoaWNzQ29u dGV4dFdpbkNFLmNwcAppbmRleCA5NmJjM2RjNTU0NzBlOGU3ZTM4NzA5ZGJkZTMyMjY0NDlhODZj NWEwLi45MmUwMmEwNTZhZWViZDBjMDg4Yzg2OGE5MzRlODY5MTIwNWVjMzYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRleHRX aW5DRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3Jh cGhpY3NDb250ZXh0V2luQ0UuY3BwCkBAIC0xMDMyLDcgKzEwMzIsNyBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQg d2lkdGgsIGJvbwogICAgIHNldFN0cm9rZVN0eWxlKG9sZFN0eWxlKTsKIH0KIAotdm9pZCBHcmFw aGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0IEZsb2F0UG9pbnQmLCBm bG9hdCB3aWR0aCwgVGV4dENoZWNraW5nTGluZVN0eWxlIHN0eWxlKQordm9pZCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIoY29uc3QgRmxvYXRQb2ludCYsIGZsb2F0 IHdpZHRoLCBEb2N1bWVudE1hcmtlckxpbmVTdHlsZSBzdHlsZSkKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d3gvR3JhcGhpY3NDb250ZXh0V3guY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd3gvR3JhcGhpY3NDb250ZXh0V3guY3BwCmluZGV4IDQ1MjYzOGIwMTAzOGU3YjcyNWM3MzJh OTcyYWI2NjdlMTA2ZTg0MjYuLjU0YzBkOThiNmQyYjI1ZGRiOGRhNWQ3MGI0NTJmNzdlNzBkNzk3 MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3d4L0dyYXBo aWNzQ29udGV4dFd4LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 eC9HcmFwaGljc0NvbnRleHRXeC5jcHAKQEAgLTQ0MiwxMyArNDQyLDEzIEBAIHZvaWQgR3JhcGhp Y3NDb250ZXh0OjpkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9h dCB3aWR0aCwgYm9vCiAgICAgcmVzdG9yZSgpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6 ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3 aWR0aCwgVGV4dENoZWNraW5nTGluZVN0eWxlIHN0eWxlKQordm9pZCBHcmFwaGljc0NvbnRleHQ6 OmRyYXdMaW5lRm9yRG9jdW1lbnRNYXJrZXIoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9h dCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgc3R5bGUpCiB7CiAgICAgc3dpdGNoIChz dHlsZSkgewotICAgIGNhc2UgVGV4dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGU6CisgICAgY2Fz ZSBEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0eWxlOgogICAgICAgICBtX2RhdGEtPmNvbnRl eHQtPlNldFBlbih3eFBlbigqd3hSRUQsIDIsIHd4TE9OR19EQVNIKSk7CiAgICAgICAgIGJyZWFr OwotICAgIGNhc2UgVGV4dENoZWNraW5nR3JhbW1hckxpbmVTdHlsZToKKyAgICBjYXNlIERvY3Vt ZW50TWFya2VyR3JhbW1hckxpbmVTdHlsZToKICAgICAgICAgbV9kYXRhLT5jb250ZXh0LT5TZXRQ ZW4od3hQZW4oKnd4R1JFRU4sIDIsIHd4TE9OR19EQVNIKSk7CiAgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4 dEJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKaW5k ZXggN2E2YzU2MTQ5MjY0NTJmNTBlNjRhZDY5ZGRlY2IxY2IwYWQyNjU5Zi4uMTU0Y2U4MTJhZTkz OTk0ZGYzYTA2MDY3NjUxODI1ODU0MzBmYmM3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9JbmxpbmVUZXh0Qm94LmNwcApAQCAtOTgzLDE4ICs5ODMsMTggQEAgdm9pZCBJbmxpbmVUZXh0 Qm94OjpwYWludERlY29yYXRpb24oR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBGbG9h dFBvaW50JgogICAgICAgICBjb250ZXh0LT5jbGVhclNoYWRvdygpOwogfQogCi1zdGF0aWMgR3Jh cGhpY3NDb250ZXh0OjpUZXh0Q2hlY2tpbmdMaW5lU3R5bGUgdGV4dENoZWNraW5nTGluZVN0eWxl Rm9yTWFya2VyVHlwZShEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZSBtYXJrZXJUeXBlKQorc3Rh dGljIEdyYXBoaWNzQ29udGV4dDo6RG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgbGluZVN0eWxlRm9y TWFya2VyVHlwZShEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZSBtYXJrZXJUeXBlKQogewogICAg IHN3aXRjaCAobWFya2VyVHlwZSkgewogICAgIGNhc2UgRG9jdW1lbnRNYXJrZXI6OlNwZWxsaW5n OgotICAgICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0OjpUZXh0Q2hlY2tpbmdTcGVsbGluZ0xp bmVTdHlsZTsKKyAgICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6RG9jdW1lbnRNYXJrZXJT cGVsbGluZ0xpbmVTdHlsZTsKICAgICBjYXNlIERvY3VtZW50TWFya2VyOjpHcmFtbWFyOgotICAg ICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0OjpUZXh0Q2hlY2tpbmdHcmFtbWFyTGluZVN0eWxl OworICAgICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtlckdyYW1tYXJM aW5lU3R5bGU7CiAgICAgY2FzZSBEb2N1bWVudE1hcmtlcjo6Q29ycmVjdGlvbkluZGljYXRvcjoK LSAgICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6VGV4dENoZWNraW5nUmVwbGFjZW1lbnRM aW5lU3R5bGU7CisgICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQ6OkRvY3VtZW50TWFya2Vy QXV0b2NvcnJlY3Rpb25SZXBsYWNlbWVudExpbmVTdHlsZTsKICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6 VGV4dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGU7CisgICAgICAgIHJldHVybiBHcmFwaGljc0Nv bnRleHQ6OkRvY3VtZW50TWFya2VyU3BlbGxpbmdMaW5lU3R5bGU7CiAgICAgfQogfQogCkBAIC0x MDYzLDcgKzEwNjMsNyBAQCB2b2lkIElubGluZVRleHRCb3g6OnBhaW50U3BlbGxpbmdPckdyYW1t YXJNYXJrZXIoR3JhcGhpY3NDb250ZXh0KiBwdCwgY29uc3QgRmxvYQogICAgICAgICAvLyBJbiBs YXJnZXIgZm9udHMsIHRob3VnaCwgcGxhY2UgdGhlIHVuZGVybGluZSB1cCBuZWFyIHRoZSBiYXNl bGluZSB0byBwcmV2ZW50IGEgYmlnIGdhcC4KICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ID0gYmFz ZWxpbmUgKyAyOwogICAgIH0KLSAgICBwdC0+ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoRmxvYXRQ b2ludChib3hPcmlnaW4ueCgpICsgc3RhcnQsIGJveE9yaWdpbi55KCkgKyB1bmRlcmxpbmVPZmZz ZXQpLCB3aWR0aCwgdGV4dENoZWNraW5nTGluZVN0eWxlRm9yTWFya2VyVHlwZShtYXJrZXItPnR5 cGUoKSkpOworICAgIHB0LT5kcmF3TGluZUZvckRvY3VtZW50TWFya2VyKEZsb2F0UG9pbnQoYm94 T3JpZ2luLngoKSArIHN0YXJ0LCBib3hPcmlnaW4ueSgpICsgdW5kZXJsaW5lT2Zmc2V0KSwgd2lk dGgsIGxpbmVTdHlsZUZvck1hcmtlclR5cGUobWFya2VyLT50eXBlKCkpKTsKIH0KIAogdm9pZCBJ bmxpbmVUZXh0Qm94OjpwYWludFRleHRNYXRjaE1hcmtlcihHcmFwaGljc0NvbnRleHQqIHB0LCBj b25zdCBGbG9hdFBvaW50JiBib3hPcmlnaW4sIERvY3VtZW50TWFya2VyKiBtYXJrZXIsIFJlbmRl clN0eWxlKiBzdHlsZSwgY29uc3QgRm9udCYgZm9udCkK 135338 2012-04-03 09:02:04 -0700 2012-04-03 10:43:02 -0700 Fixed a typo. bug-82946-20120403090203.patch text/plain 15139 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQ4MjQxYTJkYTRjYmIx NzEwNDU2OGEyYzk2ZjgwMzgzMTUyZTNhMy4uZGI3OWJiYmJkMDZiNzhkODQwZTg0MjU1NzU2NDc3 ZGVlM2NlNmU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA0LTAyICBKaWEg UHUgIDxqcHVAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBHcmFwaGljc0NvbnRleHQ6OmRy YXdMaW5lRm9yVGV4dENoZWNraW5nKCkgdG8gR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRv Y3VtZW50TWFya2VyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgyOTQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgT24gT1MgWCwgd2UgZHJhdyBzaW1pbGFyIHVuZGVybGluZSBvbiBkaWN0YXRlZCB0ZXh0 IHRoYXQgaGFzIGFsdGVybmF0aXZlIHRleHQuIFdlIHJlbmFtZQorICAgICAgICB0aGlzIGZ1bmN0 aW9uLCBzbyB0aGF0IHdlIGNhbiByZXVzZSBpdCBmb3IgZGljdGF0aW9uIHVuZGVybGluZS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMsIHNpbmNlIHRoZXJlJ3Mgbm8gY2hhbmdlIG9mIGZ1bmN0aW9u YWxpdHkuIAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3Vt ZW50TWFya2VyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3JhcGhpY3NDb250 ZXh0TWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZv ckRvY3VtZW50TWFya2VyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVudmcvR3Jh cGhpY3NDb250ZXh0T3BlblZHLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4 dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0Q0dXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRleHRXaW5DRS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yRG9jdW1lbnRN YXJrZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3d4L0dyYXBoaWNzQ29udGV4dFd4 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1 bWVudE1hcmtlcik6CisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bGluZVN0eWxlRm9yTWFya2VyVHlwZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbmxpbmVUZXh0Qm94OjpwYWludFNwZWxsaW5nT3JHcmFtbWFyTWFya2VyKToKKwogMjAxMi0w NC0wMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBB U1NFUlRJT04gRkFJTEVEOiBtX3B1cmdlUHJldmVudENvdW50IGluIEZvbnRDYWNoZTo6Z2V0Q2Fj aGVkRm9udERhdGEgcnVubmluZyBzdmcvY3VzdG9tL2FuaW1hdGUtZGlzYWxsb3dlZC11c2UtZWxl bWVudC5zdmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhp Y3NDb250ZXh0LmgKaW5kZXggYzcyMmNiY2U0N2I2MDVlZWYxYmRlOGNjOTlhMTRmMGVhMzZkMzIw MS4uOWU0Njk5OTI0ODE3NTk5NTVkNTc2MmIwMjc0OWUyOGNkNGQ0N2VmNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKQEAgLTM1 NSwxMiArMzU1LDEzIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgRmxvYXRSZWN0IHJv dW5kVG9EZXZpY2VQaXhlbHMoY29uc3QgRmxvYXRSZWN0JiwgUm91bmRpbmdNb2RlID0gUm91bmRB bGxTaWRlcyk7CiAKICAgICAgICAgdm9pZCBkcmF3TGluZUZvclRleHQoY29uc3QgRmxvYXRQb2lu dCYsIGZsb2F0IHdpZHRoLCBib29sIHByaW50aW5nKTsKLSAgICAgICAgZW51bSBUZXh0Q2hlY2tp bmdMaW5lU3R5bGUgewotICAgICAgICAgICAgVGV4dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGUs Ci0gICAgICAgICAgICBUZXh0Q2hlY2tpbmdHcmFtbWFyTGluZVN0eWxlLAotICAgICAgICAgICAg VGV4dENoZWNraW5nUmVwbGFjZW1lbnRMaW5lU3R5bGUKKyAgICAgICAgZW51bSBEb2N1bWVudE1h cmtlckxpbmVTdHlsZSB7CisgICAgICAgICAgICBEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0 eWxlLAorICAgICAgICAgICAgRG9jdW1lbnRNYXJrZXJHcmFtbWFyTGluZVN0eWxlLAorICAgICAg ICAgICAgRG9jdW1lbnRNYXJrZXJBdXRvY29ycmVjdGlvblJlcGxhY2VtZW50TGluZVN0eWxlLAor ICAgICAgICAgICAgRG9jdW1lbnRNYXJrZXJEaWN0YXRpb25BbHRlcm5hdGl2ZXNMaW5lU3R5bGUK ICAgICAgICAgfTsKLSAgICAgICAgdm9pZCBkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25zdCBG bG9hdFBvaW50JiwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSk7CisgICAgICAg IHZvaWQgZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihjb25zdCBGbG9hdFBvaW50JiwgZmxvYXQg d2lkdGgsIERvY3VtZW50TWFya2VyTGluZVN0eWxlKTsKIAogICAgICAgICBib29sIHBhaW50aW5n RGlzYWJsZWQoKSBjb25zdDsKICAgICAgICAgdm9pZCBzZXRQYWludGluZ0Rpc2FibGVkKGJvb2wp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vR3Jh cGhpY3NDb250ZXh0Q2Fpcm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2Fpcm8vR3JhcGhpY3NDb250ZXh0Q2Fpcm8uY3BwCmluZGV4IGJhODg2YTAzYzJjOTA2MjIzNDMz YTMzYzAyZTY0MDUzNzc2OTM5MGYuLmVjODQ2ZjE0Yjk2ZGYyNjU4YWM3OTgwZDhkNGI1YTk0YjBj MjMwMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJv L0dyYXBoaWNzQ29udGV4dENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9HcmFwaGljc0NvbnRleHRDYWlyby5jcHAKQEAgLTY4Miw3ICs2ODIsNyBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQm IG9yaWdpbiwgZmxvYXQgd2lkdGgsIGJvbwogI2luY2x1ZGUgIkRyYXdFcnJvclVuZGVybGluZS5o IgogI2VuZGlmCiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2lu Zyhjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpZHRoLCBUZXh0Q2hlY2tpbmdMaW5l U3R5bGUgc3R5bGUpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1h cmtlcihjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpZHRoLCBEb2N1bWVudE1hcmtl ckxpbmVTdHlsZSBzdHlsZSkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAg ICByZXR1cm47CkBAIC02OTEsMTAgKzY5MSwxMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJh d0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3aQog ICAgIGNhaXJvX3NhdmUoY3IpOwogCiAgICAgc3dpdGNoIChzdHlsZSkgewotICAgIGNhc2UgVGV4 dENoZWNraW5nU3BlbGxpbmdMaW5lU3R5bGU6CisgICAgY2FzZSBEb2N1bWVudE1hcmtlclNwZWxs aW5nTGluZVN0eWxlOgogICAgICAgICBjYWlyb19zZXRfc291cmNlX3JnYihjciwgMSwgMCwgMCk7 CiAgICAgICAgIGJyZWFrOwotICAgIGNhc2UgVGV4dENoZWNraW5nR3JhbW1hckxpbmVTdHlsZToK KyAgICBjYXNlIERvY3VtZW50TWFya2VyR3JhbW1hckxpbmVTdHlsZToKICAgICAgICAgY2Fpcm9f c2V0X3NvdXJjZV9yZ2IoY3IsIDAsIDEsIDApOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0 OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBo aWNzQ29udGV4dE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9H cmFwaGljc0NvbnRleHRNYWMubW0KaW5kZXggYWNlZDk2YjJmNGU3ZmZjMzgzY2VmZTcxZGI3OWE2 NmE5YWM2NjgyMi4uZTA4NTkxZGY0NjAxYzIyMjExYjEwNDIyOTZhNWM3NTdkNzJhMGMzZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dyYXBoaWNzQ29u dGV4dE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvR3Jh cGhpY3NDb250ZXh0TWFjLm1tCkBAIC05OSw3ICs5OSw3IEBAIHN0YXRpYyBOU0NvbG9yKiBjcmVh dGVQYXR0ZXJuQ29sb3IoTlNTdHJpbmcqIGZpcnN0Q2hvaWNlTmFtZSwgTlNTdHJpbmcqIHNlY29u ZENoCiB9CiAKIC8vIFdlYktpdCBvbiBNYWMgaXMgYSBzdGFuZGFyZCBwbGF0Zm9ybSBjb21wb25l bnQsIHNvIGl0IG11c3QgdXNlIHRoZSBzdGFuZGFyZCBwbGF0Zm9ybSBhcnR3b3JrIGZvciB1bmRl cmxpbmUuCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29u c3QgRmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZHRoLCBUZXh0Q2hlY2tpbmdMaW5lU3R5bGUg c3R5bGUpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihj b25zdCBGbG9hdFBvaW50JiBwb2ludCwgZmxvYXQgd2lkdGgsIERvY3VtZW50TWFya2VyTGluZVN0 eWxlIHN0eWxlKQogewogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVy bjsKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JU ZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZAogICAgIGJvb2wg dXNpbmdEb3Q7CiAgICAgTlNDb2xvciAqcGF0dGVybkNvbG9yOwogICAgIHN3aXRjaCAoc3R5bGUp IHsKLSAgICAgICAgY2FzZSBUZXh0Q2hlY2tpbmdTcGVsbGluZ0xpbmVTdHlsZToKKyAgICAgICAg Y2FzZSBEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0eWxlOgogICAgICAgICB7CiAgICAgICAg ICAgICAvLyBDb25zdGFudHMgZm9yIHNwZWxsaW5nIHBhdHRlcm4gY29sb3IuCiAgICAgICAgICAg ICBzdGF0aWMgYm9vbCB1c2luZ0RvdEZvclNwZWxsaW5nID0gZmFsc2U7CkBAIC0xMjAsNyArMTIw LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0 IEZsb2F0UG9pbnQmIHBvaW50LCBmbG9hdCB3aWQKICAgICAgICAgICAgIHBhdHRlcm5Db2xvciA9 IHNwZWxsaW5nUGF0dGVybkNvbG9yLmdldCgpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KLSAgICAgICAgY2FzZSBUZXh0Q2hlY2tpbmdHcmFtbWFyTGluZVN0eWxlOgorICAgICAgICBj YXNlIERvY3VtZW50TWFya2VyR3JhbW1hckxpbmVTdHlsZToKICAgICAgICAgewogICAgICAgICAg ICAgLy8gQ29uc3RhbnRzIGZvciBncmFtbWFyIHBhdHRlcm4gY29sb3IuCiAgICAgICAgICAgICBz dGF0aWMgYm9vbCB1c2luZ0RvdEZvckdyYW1tYXIgPSBmYWxzZTsKQEAgLTEzMSw3ICsxMzEsOCBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxv YXRQb2ludCYgcG9pbnQsIGZsb2F0IHdpZAogICAgICAgICB9CiAjaWYgUExBVEZPUk0oTUFDKSAm JiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAhZGVmaW5lZChCVUlMRElOR19PTl9T Tk9XX0xFT1BBUkQpCiAgICAgICAgIC8vIFRvIHN1cHBvcnQgY29ycmVjdGlvbiBwYW5lbC4KLSAg ICAgICAgY2FzZSBUZXh0Q2hlY2tpbmdSZXBsYWNlbWVudExpbmVTdHlsZToKKyAgICAgICAgY2Fz ZSBEb2N1bWVudE1hcmtlckF1dG9jb3JyZWN0aW9uUmVwbGFjZW1lbnRMaW5lU3R5bGU6CisgICAg ICAgIGNhc2UgRG9jdW1lbnRNYXJrZXJEaWN0YXRpb25BbHRlcm5hdGl2ZXNMaW5lU3R5bGU6CiAg ICAgICAgIHsKICAgICAgICAgICAgIC8vIENvbnN0YW50cyBmb3Igc3BlbGxpbmcgcGF0dGVybiBj b2xvci4KICAgICAgICAgICAgIHN0YXRpYyBib29sIHVzaW5nRG90Rm9yU3BlbGxpbmcgPSBmYWxz ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW52Zy9H cmFwaGljc0NvbnRleHRPcGVuVkcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9wZW5WRy5jcHAKaW5kZXggNDQxN2Q3YjgxMTc2MjMx YmU3NGUxYzZlYmMxNGFjYjYzOGRjMWU1ZC4uNzRjOTRmM2Q0MGU4ZWJiMWE0OGUyNWNmMjQ5NTkx OGQyZTM3NjgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv b3BlbnZnL0dyYXBoaWNzQ29udGV4dE9wZW5WRy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbnZnL0dyYXBoaWNzQ29udGV4dE9wZW5WRy5jcHAKQEAgLTI0Niw3 ICsyNDYsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IElu dFBvaW50JiBvcmlnaW4sIGludCB3aWR0aCwgYm9vbCBwcgogICAgIFVOVVNFRF9QQVJBTShwcmlu dGluZyk7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2lu Zyhjb25zdCBJbnRQb2ludCYgb3JpZ2luLCBpbnQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHls ZSBzdHlsZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2Vy KGNvbnN0IEludFBvaW50JiBvcmlnaW4sIGludCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5 bGUgc3R5bGUpCiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJu OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhp Y3NDb250ZXh0UXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3Jh cGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IGFhNDllMmRkZmYyMmM4NDRkYWM0NmFiOGRkNmQ0NDgx NTE0YjJiMzcuLmI4ZTk1ZjI1ZjgxZDM4OTkxYjUzM2JmODUwMmZjOWIxMGUwNTM2Y2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4 dFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHRRdC5jcHAKQEAgLTk3NSw3ICs5NzUsNyBAQCBzdGF0aWMgdm9pZCBkcmF3RXJyb3JV bmRlcmxpbmUoUVBhaW50ZXIgKnBhaW50ZXIsIHFyZWFsIHgsIHFyZWFsIHksIHFyZWFsIHdpZHRo LAogfQogCiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhj b25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpZHRoLCBUZXh0Q2hlY2tpbmdMaW5lU3R5 bGUgc3R5bGUpCit2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtl cihjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0IHdpZHRoLCBEb2N1bWVudE1hcmtlckxp bmVTdHlsZSBzdHlsZSkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAgICBy ZXR1cm47CkBAIC05ODQsMTAgKzk4NCwxMCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xp bmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2ludCYgb3JpZ2luLCBmbG9hdCB3aQogICAg IGNvbnN0IFFQZW4gb3JpZ2luYWxQZW4gPSBwYWludGVyLT5wZW4oKTsKIAogICAgIHN3aXRjaCAo c3R5bGUpIHsKLSAgICBjYXNlIFRleHRDaGVja2luZ1NwZWxsaW5nTGluZVN0eWxlOgorICAgIGNh c2UgRG9jdW1lbnRNYXJrZXJTcGVsbGluZ0xpbmVTdHlsZToKICAgICAgICAgcGFpbnRlci0+c2V0 UGVuKFF0OjpyZWQpOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIFRleHRDaGVja2luZ0dyYW1t YXJMaW5lU3R5bGU6CisgICAgY2FzZSBEb2N1bWVudE1hcmtlckdyYW1tYXJMaW5lU3R5bGU6CiAg ICAgICAgIHBhaW50ZXItPnNldFBlbihRdDo6Z3JlZW4pOwogICAgICAgICBicmVhazsKICAgICBk ZWZhdWx0OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAKaW5kZXggNDM4OWIwNDdiMDBiMmMwYWQw YTIzYTczM2EzYTBmOTk1ODFkZWZlMy4uYWQ0MzNlMWQ0MWU3NWIzZDAwYTBhYTU2YTc3Y2NlN2Mz NmM5Y2Y2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCkBAIC01MTAsNyArNTEwLDcgQEAg dm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdMaW5lKGNvbnN0IEludFBvaW50JiBwb2ludDEsIGNv bnN0IEludFBvaW50JiBwb2ludDIpCiAgICAgcGxhdGZvcm1Db250ZXh0KCktPmRpZERyYXdQb2lu dHMoU2tDYW52YXM6OmtMaW5lc19Qb2ludE1vZGUsIDIsIHB0cywgcGFpbnQpOwogfQogCi12b2lk IEdyYXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0Q2hlY2tpbmcoY29uc3QgRmxvYXRQb2lu dCYgcHQsIGZsb2F0IHdpZHRoLCBUZXh0Q2hlY2tpbmdMaW5lU3R5bGUgc3R5bGUpCit2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihjb25zdCBGbG9hdFBvaW50 JiBwdCwgZmxvYXQgd2lkdGgsIERvY3VtZW50TWFya2VyTGluZVN0eWxlIHN0eWxlKQogewogICAg IGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vR3JhcGhpY3NDb250ZXh0 Q0dXaW4uY3BwCmluZGV4IGYzYTkxOWQ3MTNiYTZlNzM0NmQ1ZTMxYWEwNjIxNDdlNjU5ZTQyM2Qu LjA2M2Y3Y2I2OWE5MDk5MTFhMTY1MDllODY1NzhkNDY3MDBkYzI4ZTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9HcmFwaGljc0NvbnRleHRDR1dpbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL0dyYXBoaWNzQ29u dGV4dENHV2luLmNwcApAQCAtMTgxLDEyICsxODEsMTIgQEAgc3RhdGljIGNvbnN0IENvbG9yJiBn cmFtbWFyUGF0dGVybkNvbG9yKCkgewogICAgIHJldHVybiBncmFtbWFyQ29sb3I7CiB9CiAKLXZv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9hdFBv aW50JiBwb2ludCwgZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSBzdHlsZSkKK3Zv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0 UG9pbnQmIHBvaW50LCBmbG9hdCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgc3R5bGUp CiB7CiAgICAgaWYgKHBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKHN0eWxlICE9IFRleHRDaGVja2luZ1NwZWxsaW5nTGluZVN0eWxlICYmIHN0eWxlICE9IFRl eHRDaGVja2luZ0dyYW1tYXJMaW5lU3R5bGUpCisgICAgaWYgKHN0eWxlICE9IERvY3VtZW50TWFy a2VyU3BlbGxpbmdMaW5lU3R5bGUgJiYgc3R5bGUgIT0gRG9jdW1lbnRNYXJrZXJHcmFtbWFyTGlu ZVN0eWxlKQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBUaGVzZSBhcmUgdGhlIHNhbWUgZm9y IG1pc3NwZWxsaW5nIG9yIGJhZCBncmFtbWFyCkBAIC0yMDksNyArMjA5LDcgQEAgdm9pZCBHcmFw aGljc0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0IEZsb2F0UG9pbnQmIHBv aW50LCBmbG9hdCB3aWQKICAgICBDR0NvbnRleHRSZWYgY29udGV4dCA9IHBsYXRmb3JtQ29udGV4 dCgpOwogICAgIENHQ29udGV4dFNhdmVHU3RhdGUoY29udGV4dCk7CiAKLSAgICBjb25zdCBDb2xv ciYgcGF0dGVybkNvbG9yID0gc3R5bGUgPT0gVGV4dENoZWNraW5nR3JhbW1hckxpbmVTdHlsZSA/ IGdyYW1tYXJQYXR0ZXJuQ29sb3IoKSA6IHNwZWxsaW5nUGF0dGVybkNvbG9yKCk7CisgICAgY29u c3QgQ29sb3ImIHBhdHRlcm5Db2xvciA9IHN0eWxlID09IERvY3VtZW50TWFya2VyR3JhbW1hckxp bmVTdHlsZSA/IGdyYW1tYXJQYXR0ZXJuQ29sb3IoKSA6IHNwZWxsaW5nUGF0dGVybkNvbG9yKCk7 CiAgICAgc2V0Q0dTdHJva2VDb2xvcihjb250ZXh0LCBwYXR0ZXJuQ29sb3IpOwogCiAgICAgd2tT ZXRQYXR0ZXJuUGhhc2VJblVzZXJTcGFjZShjb250ZXh0LCBwb2ludCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0NvbnRleHRXaW5D RS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9HcmFwaGljc0Nv bnRleHRXaW5DRS5jcHAKaW5kZXggOTZiYzNkYzU1NDcwZThlN2UzODcwOWRiZGUzMjI2NDQ5YTg2 YzVhMC4uOTJlMDJhMDU2YWVlYmQwYzA4OGM4NjhhOTM0ZTg2OTEyMDVlYzM2MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2UvR3JhcGhpY3NDb250ZXh0 V2luQ0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbmNlL0dy YXBoaWNzQ29udGV4dFdpbkNFLmNwcApAQCAtMTAzMiw3ICsxMDMyLDcgQEAgdm9pZCBHcmFwaGlj c0NvbnRleHQ6OmRyYXdMaW5lRm9yVGV4dChjb25zdCBGbG9hdFBvaW50JiBvcmlnaW4sIGZsb2F0 IHdpZHRoLCBib28KICAgICBzZXRTdHJva2VTdHlsZShvbGRTdHlsZSk7CiB9CiAKLXZvaWQgR3Jh cGhpY3NDb250ZXh0OjpkcmF3TGluZUZvclRleHRDaGVja2luZyhjb25zdCBGbG9hdFBvaW50Jiwg ZmxvYXQgd2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSBzdHlsZSkKK3ZvaWQgR3JhcGhpY3ND b250ZXh0OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0UG9pbnQmLCBmbG9h dCB3aWR0aCwgRG9jdW1lbnRNYXJrZXJMaW5lU3R5bGUgc3R5bGUpCiB7CiAgICAgbm90SW1wbGVt ZW50ZWQoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3d4L0dyYXBoaWNzQ29udGV4dFd4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3d4L0dyYXBoaWNzQ29udGV4dFd4LmNwcAppbmRleCA0NTI2MzhiMDEwMzhlN2I3MjVjNzMy YTk3MmFiNjY3ZTEwNmU4NDI2Li41NGMwZDk4YjZkMmIyNWRkYjhkYTVkNzBiNDUyZjc3ZTcwZDc5 NzM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93eC9HcmFw aGljc0NvbnRleHRXeC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d3gvR3JhcGhpY3NDb250ZXh0V3guY3BwCkBAIC00NDIsMTMgKzQ0MiwxMyBAQCB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0xpbmVGb3JUZXh0KGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxv YXQgd2lkdGgsIGJvbwogICAgIHJlc3RvcmUoKTsKIH0KIAotdm9pZCBHcmFwaGljc0NvbnRleHQ6 OmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxvYXQg d2lkdGgsIFRleHRDaGVja2luZ0xpbmVTdHlsZSBzdHlsZSkKK3ZvaWQgR3JhcGhpY3NDb250ZXh0 OjpkcmF3TGluZUZvckRvY3VtZW50TWFya2VyKGNvbnN0IEZsb2F0UG9pbnQmIG9yaWdpbiwgZmxv YXQgd2lkdGgsIERvY3VtZW50TWFya2VyTGluZVN0eWxlIHN0eWxlKQogewogICAgIHN3aXRjaCAo c3R5bGUpIHsKLSAgICBjYXNlIFRleHRDaGVja2luZ1NwZWxsaW5nTGluZVN0eWxlOgorICAgIGNh c2UgRG9jdW1lbnRNYXJrZXJTcGVsbGluZ0xpbmVTdHlsZToKICAgICAgICAgbV9kYXRhLT5jb250 ZXh0LT5TZXRQZW4od3hQZW4oKnd4UkVELCAyLCB3eExPTkdfREFTSCkpOwogICAgICAgICBicmVh azsKLSAgICBjYXNlIFRleHRDaGVja2luZ0dyYW1tYXJMaW5lU3R5bGU6CisgICAgY2FzZSBEb2N1 bWVudE1hcmtlckdyYW1tYXJMaW5lU3R5bGU6CiAgICAgICAgIG1fZGF0YS0+Y29udGV4dC0+U2V0 UGVuKHd4UGVuKCp3eEdSRUVOLCAyLCB3eExPTkdfREFTSCkpOwogICAgICAgICBicmVhazsKICAg ICBkZWZhdWx0OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRl eHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCmlu ZGV4IDdhNmM1NjE0OTI2NDUyZjUwZTY0YWQ2OWRkZWNiMWNiMGFkMjY1OWYuLjE1NGNlODEyYWU5 Mzk5NGRmM2EwNjA2NzY1MTgyNTg1NDMwZmJjNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvSW5saW5lVGV4dEJveC5jcHAKQEAgLTk4MywxOCArOTgzLDE4IEBAIHZvaWQgSW5saW5lVGV4 dEJveDo6cGFpbnREZWNvcmF0aW9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgRmxv YXRQb2ludCYKICAgICAgICAgY29udGV4dC0+Y2xlYXJTaGFkb3coKTsKIH0KIAotc3RhdGljIEdy YXBoaWNzQ29udGV4dDo6VGV4dENoZWNraW5nTGluZVN0eWxlIHRleHRDaGVja2luZ0xpbmVTdHls ZUZvck1hcmtlclR5cGUoRG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGUgbWFya2VyVHlwZSkKK3N0 YXRpYyBHcmFwaGljc0NvbnRleHQ6OkRvY3VtZW50TWFya2VyTGluZVN0eWxlIGxpbmVTdHlsZUZv ck1hcmtlclR5cGUoRG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGUgbWFya2VyVHlwZSkKIHsKICAg ICBzd2l0Y2ggKG1hcmtlclR5cGUpIHsKICAgICBjYXNlIERvY3VtZW50TWFya2VyOjpTcGVsbGlu ZzoKLSAgICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6VGV4dENoZWNraW5nU3BlbGxpbmdM aW5lU3R5bGU7CisgICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQ6OkRvY3VtZW50TWFya2Vy U3BlbGxpbmdMaW5lU3R5bGU7CiAgICAgY2FzZSBEb2N1bWVudE1hcmtlcjo6R3JhbW1hcjoKLSAg ICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6VGV4dENoZWNraW5nR3JhbW1hckxpbmVTdHls ZTsKKyAgICAgICAgcmV0dXJuIEdyYXBoaWNzQ29udGV4dDo6RG9jdW1lbnRNYXJrZXJHcmFtbWFy TGluZVN0eWxlOwogICAgIGNhc2UgRG9jdW1lbnRNYXJrZXI6OkNvcnJlY3Rpb25JbmRpY2F0b3I6 Ci0gICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQ6OlRleHRDaGVja2luZ1JlcGxhY2VtZW50 TGluZVN0eWxlOworICAgICAgICByZXR1cm4gR3JhcGhpY3NDb250ZXh0OjpEb2N1bWVudE1hcmtl ckF1dG9jb3JyZWN0aW9uUmVwbGFjZW1lbnRMaW5lU3R5bGU7CiAgICAgZGVmYXVsdDoKICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybiBHcmFwaGljc0NvbnRleHQ6 OlRleHRDaGVja2luZ1NwZWxsaW5nTGluZVN0eWxlOworICAgICAgICByZXR1cm4gR3JhcGhpY3ND b250ZXh0OjpEb2N1bWVudE1hcmtlclNwZWxsaW5nTGluZVN0eWxlOwogICAgIH0KIH0KIApAQCAt MTA2Myw3ICsxMDYzLDcgQEAgdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFNwZWxsaW5nT3JHcmFt bWFyTWFya2VyKEdyYXBoaWNzQ29udGV4dCogcHQsIGNvbnN0IEZsb2EKICAgICAgICAgLy8gSW4g bGFyZ2VyIGZvbnRzLCB0aG91Z2gsIHBsYWNlIHRoZSB1bmRlcmxpbmUgdXAgbmVhciB0aGUgYmFz ZWxpbmUgdG8gcHJldmVudCBhIGJpZyBnYXAuCiAgICAgICAgIHVuZGVybGluZU9mZnNldCA9IGJh c2VsaW5lICsgMjsKICAgICB9Ci0gICAgcHQtPmRyYXdMaW5lRm9yVGV4dENoZWNraW5nKEZsb2F0 UG9pbnQoYm94T3JpZ2luLngoKSArIHN0YXJ0LCBib3hPcmlnaW4ueSgpICsgdW5kZXJsaW5lT2Zm c2V0KSwgd2lkdGgsIHRleHRDaGVja2luZ0xpbmVTdHlsZUZvck1hcmtlclR5cGUobWFya2VyLT50 eXBlKCkpKTsKKyAgICBwdC0+ZHJhd0xpbmVGb3JEb2N1bWVudE1hcmtlcihGbG9hdFBvaW50KGJv eE9yaWdpbi54KCkgKyBzdGFydCwgYm94T3JpZ2luLnkoKSArIHVuZGVybGluZU9mZnNldCksIHdp ZHRoLCBsaW5lU3R5bGVGb3JNYXJrZXJUeXBlKG1hcmtlci0+dHlwZSgpKSk7CiB9CiAKIHZvaWQg SW5saW5lVGV4dEJveDo6cGFpbnRUZXh0TWF0Y2hNYXJrZXIoR3JhcGhpY3NDb250ZXh0KiBwdCwg Y29uc3QgRmxvYXRQb2ludCYgYm94T3JpZ2luLCBEb2N1bWVudE1hcmtlciogbWFya2VyLCBSZW5k ZXJTdHlsZSogc3R5bGUsIGNvbnN0IEZvbnQmIGZvbnQpCg==