139425 2014-12-08 17:26:59 -0800 Use the new storage namespace provider in WebKit1 2014-12-10 17:31:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 139464 1 andersca andersca commit-queue oldest_to_newest 1053602 0 andersca 2014-12-08 17:26:59 -0800 Use the new storage namespace provider in WebKit1 1053604 1 242867 andersca 2014-12-08 17:27:59 -0800 Created attachment 242867 Patch 1053786 2 242920 andersca 2014-12-09 07:58:34 -0800 Created attachment 242920 Patch 1053796 3 242924 andersca 2014-12-09 08:33:19 -0800 Created attachment 242924 Patch 1053910 4 242958 andersca 2014-12-09 12:28:52 -0800 Created attachment 242958 Patch 1053925 5 242958 thorton 2014-12-09 13:39:43 -0800 Comment on attachment 242958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242958&action=review > Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj:422 > + <CLInclude Include="..\..\Storage\WebStorageNamespaceProvider.h" /> this looks capitalized and indented wrong 1053930 6 andersca 2014-12-09 13:48:52 -0800 Committed r177037: <http://trac.webkit.org/changeset/177037> 1053983 7 commit-queue 2014-12-09 16:16:42 -0800 Re-opened since this is blocked by bug 139464 1054366 8 andersca 2014-12-10 17:31:15 -0800 Committed r177119: <http://trac.webkit.org/changeset/177119> 242867 2014-12-08 17:27:59 -0800 2014-12-09 07:58:31 -0800 Patch bug-139425-20141208172838.patch text/plain 5608 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZjFlOTJiZTM3 ZTNjOTA5NzM4MDU2OWY1ZDYxZGMwYmRkYjMxNjZhNy4uZDdhNTkzYWM3NWM4OGQyN2FkY2Q5ODM3 NWU1MWRkYzhhMGQyYTdmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0 LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg VXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgaW4gV2ViS2l0MQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1l TmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgICgtW1dlYlZpZXcgaW5pdFNpbXBsZUhUTUxEb2N1 bWVudFdpdGhTdHlsZTpmcmFtZTpwcmVmZXJlbmNlczpncm91cE5hbWU6XSk6CisgICAgICAgIFNl dCB0aGUgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgZnJvbSB0aGUgd2ViIHBhZ2UgZ3JvdXAu CisKKzIwMTQtMTItMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGRpbmcgdXNlciBjb250ZW50IHRvIGEgZ3JvdXAgc2hvdWxkIGZvcmNlIHRoYXQg Z3JvdXAgdG8gYmUgY3JlYXRlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM5NDIxCiAgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5MTgwMTA4CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKaW5kZXggM2I4MWQ4OGVkYmRiNmUzY2FiMGRkZGNmYWE4ZDdmMjg5OWNkN2JmMC4u NzVhMWM1MTM0MDQ5ZDQwNTAxODQwMDE0OWJiNGUxMGE0YTc5OWQ4NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJv dmlkZXIgaW4gV2ViS2l0MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0 aCk6CisgICAgICAgIEhlbHBlciBmcm9tIGdldHRpbmcgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJh c2UgcGF0aCBnaXZlbiBhIFdlYlByZWZlcmVuY2VzIGluc3RhbmNlLgorCisgICAgICAgIChXZWJW aWV3Ojppbml0V2l0aEZyYW1lKToKKyAgICAgICAgQ3JlYXRlIGEgc3RvcmFnZSBuYW1lc3BhY2Ug cHJvdmlkZXIuCisKIDIwMTQtMTItMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIGNvbmZpZy5oIGluY2x1ZGVzIGFuZCBpbmNsdWRl IGNvbmZpZy5oIGluIHRoZSBwcmVmaXggaGVhZGVyIGluc3RlYWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlldy5tbQppbmRleCBlNjhhNzdkYjFjMGQ0NGUyNmMyOWM0YjhhNGViNGI1Y2E1NTEz ODdlLi41MTcyYmZjYjNmODlhMWQ1OWVlOTFlYzk4ZTBmODA1ZjUzNDY1M2QxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0xMDAsNiArMTAwLDcgQEAKICNpbXBvcnQgIldl YlNjcmlwdFdvcmxkSW50ZXJuYWwuaCIKICNpbXBvcnQgIldlYlNlbGVjdGlvblNlcnZpY2VDb250 cm9sbGVyLmgiCiAjaW1wb3J0ICJXZWJTdG9yYWdlTWFuYWdlckludGVybmFsLmgiCisjaW1wb3J0 ICJXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIKICNpbXBvcnQgIldlYlN5c3RlbUludGVy ZmFjZS5oIgogI2ltcG9ydCAiV2ViVGV4dENvbXBsZXRpb25Db250cm9sbGVyLmgiCiAjaW1wb3J0 ICJXZWJUZXh0SXRlcmF0b3IuaCIKQEAgLTk1Miw2ICs5NTMsNyBAQCBzdGF0aWMgdm9pZCBXZWJL aXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZOZWNlc3NhcnkoKQogICAgIHBhZ2VDb25maWd1 cmF0aW9uLmFsdGVybmF0aXZlVGV4dENsaWVudCA9IG5ldyBXZWJBbHRlcm5hdGl2ZVRleHRDbGll bnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xpZW50Rm9yTWFpbkZyYW1l ID0gbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnByb2dy ZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9ncmVzc1RyYWNrZXJDbGllbnQoc2VsZik7Cisg ICAgcGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyID0gJl9wcml2YXRl LT5ncm91cC0+c3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRp b24udXNlckNvbnRlbnRDb250cm9sbGVyID0gJl9wcml2YXRlLT5ncm91cC0+dXNlckNvbnRlbnRD b250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udmlzaXRlZExpbmtTdG9yZSA9ICZf cHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsKICAgICBfcHJpdmF0ZS0+cGFnZSA9 IG5ldyBQYWdlKHBhZ2VDb25maWd1cmF0aW9uKTsKQEAgLTExODcsNiArMTE4OSw3IEBAIHN0YXRp YyB2b2lkIFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlkZXJJZk5lY2Vzc2FyeSgpCiAgICAg cGFnZUNvbmZpZ3VyYXRpb24uaW5zcGVjdG9yQ2xpZW50ID0gbmV3IFdlYkluc3BlY3RvckNsaWVu dChzZWxmKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJhbWUg PSBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ucHJvZ3Jl c3NUcmFja2VyQ2xpZW50ID0gbmV3IFdlYlByb2dyZXNzVHJhY2tlckNsaWVudChzZWxmKTsKKyAg ICBwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIgPSAmX3ByaXZhdGUt Pmdyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsKICAgICBwYWdlQ29uZmlndXJhdGlv bi51c2VyQ29udGVudENvbnRyb2xsZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT51c2VyQ29udGVudENv bnRyb2xsZXIoKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi52aXNpdGVkTGlua1N0b3JlID0gJl9w cml2YXRlLT5ncm91cC0+dmlzaXRlZExpbmtTdG9yZSgpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCmlu ZGV4IGNlMWQyZmRhZTc1ZTFkYzcyM2ZmNmQ2MDc3NDNjM2NhYjg2Yjg2NjIuLmFkMjYxNmY2YWE1 ZmNkZDhmN2ExMzM0OGFkYzgyMTFmZjA2YWE5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCkBAIC02 NCw2ICs2NCw3IEBACiAjaW5jbHVkZSAiV2ViUGxhdGZvcm1TdHJhdGVnaWVzLmgiCiAjaW5jbHVk ZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJXZWJTY3JpcHRXb3JsZC5oIgorI2luY2x1 ZGUgIldlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5oIgogI2luY2x1ZGUgIldlYlZpc2l0ZWRM aW5rU3RvcmUuaCIKICNpbmNsdWRlICJyZXNvdXJjZS5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRD b3JlL0FQSUNhc3QuaD4KQEAgLTI3MjYsNyArMjcyNywxNiBAQCBib29sIFdlYlZpZXc6OnNob3Vs ZEluaXRpYWxpemVUcmFja1BvaW50SGFjaygpCiAKICAgICByZXR1cm4gc2hvdWxkQ3JlYXRlU2Ny b2xsYmFyczsKIH0KLSAgICAKKworc3RhdGljIFN0cmluZyBsb2NhbFN0b3JhZ2VEYXRhYmFzZVBh dGgoV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQoreworICAgIEJTdHJpbmcgbG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoOworICAgIGlmIChGQUlMRUQobV9wcmVmZXJlbmNlcy0+bG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoKCZsb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgpKSkKKyAgICAgICAgcmV0 dXJuIFN0cmluZygpOworCisgICAgcmV0dXJuIHRvU3RyaW5nKGxvY2FsU3RvcmFnZURhdGFiYXNl UGF0aCk7Cit9CisKIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6aW5pdFdpdGhG cmFtZSggCiAgICAgLyogW2luXSAqLyBSRUNUIGZyYW1lLAogICAgIC8qIFtpbl0gKi8gQlNUUiBm cmFtZU5hbWUsCkBAIC0yODAxLDYgKzI4MTEsNyBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IFdlYlZpZXc6OmluaXRXaXRoRnJhbWUoCiAgICAgY29uZmlndXJhdGlvbi5pbnNwZWN0b3JDbGll bnQgPSBtX2luc3BlY3RvckNsaWVudDsKICNlbmRpZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQogICAg IGNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xpZW50Rm9yTWFpbkZyYW1lID0gbmV3IFdlYkZyYW1lTG9h ZGVyQ2xpZW50OworICAgIGNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyID0g V2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjcmVhdGUobG9jYWxTdG9yYWdlRGF0YWJhc2VQ YXRoKG1fd2ViUHJlZmVyZW5jZXMuZ2V0KCkpKTsKICAgICBjb25maWd1cmF0aW9uLnByb2dyZXNz VHJhY2tlckNsaWVudCA9IHN0YXRpY19jYXN0PFdlYkZyYW1lTG9hZGVyQ2xpZW50Kj4oY29uZmln dXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJhbWUpOwogICAgIGNvbmZpZ3VyYXRpb24udmlz aXRlZExpbmtTdG9yZSA9ICZXZWJWaXNpdGVkTGlua1N0b3JlOjpzaGFyZWQoKTsKIApAQCAtMjgx MCw5ICsyODIxLDYgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3Ojppbml0V2l0 aEZyYW1lKAogICAgIHVuc2lnbmVkIGxheW91dE1pbGVzdG9uZXMgPSBEaWRGaXJzdExheW91dCB8 IERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dDsKICAgICBtX3BhZ2UtPmFkZExheW91dE1p bGVzdG9uZXMoc3RhdGljX2Nhc3Q8TGF5b3V0TWlsZXN0b25lcz4obGF5b3V0TWlsZXN0b25lcykp OwogCi0gICAgQlN0cmluZyBsb2NhbFN0b3JhZ2VQYXRoOwotICAgIGlmIChTVUNDRUVERUQobV9w cmVmZXJlbmNlcy0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCZsb2NhbFN0b3JhZ2VQYXRoKSkp Ci0gICAgICAgIG1fcGFnZS0+c2V0dGluZ3MoKS5zZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgo dG9TdHJpbmcobG9jYWxTdG9yYWdlUGF0aCkpOwogCiAgICAgaWYgKG1fdWlEZWxlZ2F0ZSkgewog ICAgICAgICBCU3RyaW5nIHBhdGg7Cg== 242920 2014-12-09 07:58:34 -0800 2014-12-09 08:33:17 -0800 Patch bug-139425-20141209075914.patch text/plain 7966 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZjFlOTJiZTM3 ZTNjOTA5NzM4MDU2OWY1ZDYxZGMwYmRkYjMxNjZhNy4uZDdhNTkzYWM3NWM4OGQyN2FkY2Q5ODM3 NWU1MWRkYzhhMGQyYTdmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0 LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg VXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgaW4gV2ViS2l0MQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1l TmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgICgtW1dlYlZpZXcgaW5pdFNpbXBsZUhUTUxEb2N1 bWVudFdpdGhTdHlsZTpmcmFtZTpwcmVmZXJlbmNlczpncm91cE5hbWU6XSk6CisgICAgICAgIFNl dCB0aGUgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgZnJvbSB0aGUgd2ViIHBhZ2UgZ3JvdXAu CisKKzIwMTQtMTItMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGRpbmcgdXNlciBjb250ZW50IHRvIGEgZ3JvdXAgc2hvdWxkIGZvcmNlIHRoYXQg Z3JvdXAgdG8gYmUgY3JlYXRlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM5NDIxCiAgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5MTgwMTA4CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKaW5kZXggM2I4MWQ4OGVkYmRiNmUzY2FiMGRkZGNmYWE4ZDdmMjg5OWNkN2JmMC4u NzVhMWM1MTM0MDQ5ZDQwNTAxODQwMDE0OWJiNGUxMGE0YTc5OWQ4NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJv dmlkZXIgaW4gV2ViS2l0MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0 aCk6CisgICAgICAgIEhlbHBlciBmcm9tIGdldHRpbmcgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJh c2UgcGF0aCBnaXZlbiBhIFdlYlByZWZlcmVuY2VzIGluc3RhbmNlLgorCisgICAgICAgIChXZWJW aWV3Ojppbml0V2l0aEZyYW1lKToKKyAgICAgICAgQ3JlYXRlIGEgc3RvcmFnZSBuYW1lc3BhY2Ug cHJvdmlkZXIuCisKIDIwMTQtMTItMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIGNvbmZpZy5oIGluY2x1ZGVzIGFuZCBpbmNsdWRl IGNvbmZpZy5oIGluIHRoZSBwcmVmaXggaGVhZGVyIGluc3RlYWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdENvbW1vbi5wcm9wcyBiL1NvdXJj ZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdENvbW1vbi5wcm9wcwppbmRleCAw ZTNiNDc1Njc1ZmMwZTllZGQ0YzNmYWIyOTA4ZTYxOTM3NjBkY2UwLi5kMWM3YTQxZmVlYjUyMTFi YzEwMWQxNzU0YzQ1NDdmYzhjMDBkODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktp dC52Y3hwcm9qL1dlYktpdC9XZWJLaXRDb21tb24ucHJvcHMKKysrIGIvU291cmNlL1dlYktpdC9X ZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0Q29tbW9uLnByb3BzCkBAIC01LDcgKzUsNyBAQAog ICA8L1Byb3BlcnR5R3JvdXA+CiAgIDxJdGVtRGVmaW5pdGlvbkdyb3VwPgogICAgIDxDbENvbXBp bGU+Ci0gICAgICA8QWRkaXRpb25hbEluY2x1ZGVEaXJlY3Rvcmllcz4kKFByb2plY3REaXIpOyQo UHJvamVjdERpcilcLi5cLi5cd2luOyQoUHJvamVjdERpcilcLi5cLi5cd2luXFdlYkNvcmVTdXBw b3J0OyQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxpbmNsdWRlXFdlYktpdDskKENvbmZpZ3VyYXRp b25CdWlsZERpcilcSW5jbHVkZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcSW5jbHVkZVxwcml2 YXRlOyQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXFdlYkNvcmU7JChDb25maWd1cmF0 aW9uQnVpbGREaXIpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVyczskKENvbmZpZ3Vy YXRpb25CdWlsZERpcilcSW5jbHVkZVxKYXZhU2NyaXB0Q29yZTskKENvbmZpZ3VyYXRpb25CdWls ZERpcilcSW5jbHVkZVxwcml2YXRlXEphdmFTY3JpcHRDb3JlOyQoQ29uZmlndXJhdGlvbkJ1aWxk RGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVxXZWJLaXRcRGVyaXZlZFNvdXJjZXM7JChX ZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRlOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZVxwcml2 YXRlOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZVxXZWJDb3JlOyQoV2ViS2l0X0xpYnJhcmll cylcSW5jbHVkZVxXZWJDb3JlXEZvcndhcmRpbmdIZWFkZXJzOyQoV2ViS2l0X0xpYnJhcmllcylc SW5jbHVkZVxKYXZhU2NyaXB0Q29yZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVccHJpdmF0 ZVxKYXZhU2NyaXB0Q29yZTskKEludERpcilpbmNsdWRlOyUoQWRkaXRpb25hbEluY2x1ZGVEaXJl Y3Rvcmllcyk8L0FkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM+CisgICAgICA8QWRkaXRpb25h bEluY2x1ZGVEaXJlY3Rvcmllcz4kKFByb2plY3REaXIpOyQoUHJvamVjdERpcilcLi5cLi5cd2lu OyQoUHJvamVjdERpcilcLi5cLi5cd2luXFdlYkNvcmVTdXBwb3J0OyQoUHJvamVjdERpcilcLi5c Li5cU3RvcmFnZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcaW5jbHVkZVxXZWJLaXQ7JChDb25m aWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGU7JChDb25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1 ZGVccHJpdmF0ZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcSW5jbHVkZVxXZWJDb3JlOyQoQ29u ZmlndXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXFdlYkNvcmVcRm9yd2FyZGluZ0hlYWRlcnM7JChD b25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGVcSmF2YVNjcmlwdENvcmU7JChDb25maWd1cmF0 aW9uQnVpbGREaXIpXEluY2x1ZGVccHJpdmF0ZVxKYXZhU2NyaXB0Q29yZTskKENvbmZpZ3VyYXRp b25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcV2ViS2l0XERlcml2ZWRTb3Vy Y2VzOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1 ZGVccHJpdmF0ZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVcV2ViQ29yZTskKFdlYktpdF9M aWJyYXJpZXMpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVyczskKFdlYktpdF9MaWJy YXJpZXMpXEluY2x1ZGVcSmF2YVNjcmlwdENvcmU7JChXZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRl XHByaXZhdGVcSmF2YVNjcmlwdENvcmU7JChJbnREaXIpaW5jbHVkZTslKEFkZGl0aW9uYWxJbmNs dWRlRGlyZWN0b3JpZXMpPC9BZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9yaWVzPgogICAgICAgPFBy ZXByb2Nlc3NvckRlZmluaXRpb25zPldFQktJVF9FWFBPUlRTO0ZSQU1FV09SS19OQU1FPVdlYktp dDslKFByZXByb2Nlc3NvckRlZmluaXRpb25zKTwvUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM+CiAg ICAgICA8UHJlY29tcGlsZWRIZWFkZXI+VXNlPC9QcmVjb21waWxlZEhlYWRlcj4KICAgICAgIDxQ cmVjb21waWxlZEhlYWRlckZpbGU+V2ViS2l0UHJlZml4Lmg8L1ByZWNvbXBpbGVkSGVhZGVyRmls ZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCBlNjhhNzdkYjFjMGQ0NGUy NmMyOWM0YjhhNGViNGI1Y2E1NTEzODdlLi41MTcyYmZjYjNmODlhMWQ1OWVlOTFlYzk4ZTBmODA1 ZjUzNDY1M2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0xMDAsNiAr MTAwLDcgQEAKICNpbXBvcnQgIldlYlNjcmlwdFdvcmxkSW50ZXJuYWwuaCIKICNpbXBvcnQgIldl YlNlbGVjdGlvblNlcnZpY2VDb250cm9sbGVyLmgiCiAjaW1wb3J0ICJXZWJTdG9yYWdlTWFuYWdl ckludGVybmFsLmgiCisjaW1wb3J0ICJXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIKICNp bXBvcnQgIldlYlN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCAiV2ViVGV4dENvbXBsZXRpb25D b250cm9sbGVyLmgiCiAjaW1wb3J0ICJXZWJUZXh0SXRlcmF0b3IuaCIKQEAgLTk1Miw2ICs5NTMs NyBAQCBzdGF0aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZOZWNlc3Nh cnkoKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLmFsdGVybmF0aXZlVGV4dENsaWVudCA9IG5ldyBX ZWJBbHRlcm5hdGl2ZVRleHRDbGllbnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ubG9h ZGVyQ2xpZW50Rm9yTWFpbkZyYW1lID0gbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50OwogICAgIHBh Z2VDb25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9ncmVzc1Ry YWNrZXJDbGllbnQoc2VsZik7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFj ZVByb3ZpZGVyID0gJl9wcml2YXRlLT5ncm91cC0+c3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKCk7 CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udXNlckNvbnRlbnRDb250cm9sbGVyID0gJl9wcml2YXRl LT5ncm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24u dmlzaXRlZExpbmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsK ICAgICBfcHJpdmF0ZS0+cGFnZSA9IG5ldyBQYWdlKHBhZ2VDb25maWd1cmF0aW9uKTsKQEAgLTEx ODcsNiArMTE4OSw3IEBAIHN0YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlk ZXJJZk5lY2Vzc2FyeSgpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uaW5zcGVjdG9yQ2xpZW50ID0g bmV3IFdlYkluc3BlY3RvckNsaWVudChzZWxmKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2Fk ZXJDbGllbnRGb3JNYWluRnJhbWUgPSBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CiAgICAgcGFn ZUNvbmZpZ3VyYXRpb24ucHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gbmV3IFdlYlByb2dyZXNzVHJh Y2tlckNsaWVudChzZWxmKTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNl UHJvdmlkZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsK ICAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIgPSAmX3ByaXZhdGUt Pmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi52 aXNpdGVkTGlua1N0b3JlID0gJl9wcml2YXRlLT5ncm91cC0+dmlzaXRlZExpbmtTdG9yZSgpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGNlMWQyZmRhZTc1ZTFkYzcyM2ZmNmQ2MDc3NDNjM2Nh Yjg2Yjg2NjIuLmFkMjYxNmY2YWE1ZmNkZDhmN2ExMzM0OGFkYzgyMTFmZjA2YWE5YjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCkBAIC02NCw2ICs2NCw3IEBACiAjaW5jbHVkZSAiV2ViUGxhdGZvcm1T dHJhdGVnaWVzLmgiCiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJXZWJT Y3JpcHRXb3JsZC5oIgorI2luY2x1ZGUgIldlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5oIgog I2luY2x1ZGUgIldlYlZpc2l0ZWRMaW5rU3RvcmUuaCIKICNpbmNsdWRlICJyZXNvdXJjZS5oIgog I2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0FQSUNhc3QuaD4KQEAgLTI3MjYsNyArMjcyNywxNiBA QCBib29sIFdlYlZpZXc6OnNob3VsZEluaXRpYWxpemVUcmFja1BvaW50SGFjaygpCiAKICAgICBy ZXR1cm4gc2hvdWxkQ3JlYXRlU2Nyb2xsYmFyczsKIH0KLSAgICAKKworc3RhdGljIFN0cmluZyBs b2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQorewor ICAgIEJTdHJpbmcgbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoOworICAgIGlmIChGQUlMRUQobV9w cmVmZXJlbmNlcy0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCZsb2NhbFN0b3JhZ2VEYXRhYmFz ZVBhdGgpKSkKKyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgcmV0dXJuIHRvU3RyaW5n KGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCk7Cit9CisKIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZ UEUgV2ViVmlldzo6aW5pdFdpdGhGcmFtZSggCiAgICAgLyogW2luXSAqLyBSRUNUIGZyYW1lLAog ICAgIC8qIFtpbl0gKi8gQlNUUiBmcmFtZU5hbWUsCkBAIC0yODAxLDYgKzI4MTEsNyBAQCBIUkVT VUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZpZXc6OmluaXRXaXRoRnJhbWUoCiAgICAgY29uZmln dXJhdGlvbi5pbnNwZWN0b3JDbGllbnQgPSBtX2luc3BlY3RvckNsaWVudDsKICNlbmRpZiAvLyBF TkFCTEUoSU5TUEVDVE9SKQogICAgIGNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xpZW50Rm9yTWFpbkZy YW1lID0gbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50OworICAgIGNvbmZpZ3VyYXRpb24uc3RvcmFn ZU5hbWVzcGFjZVByb3ZpZGVyID0gV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyOjpjcmVhdGUo bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKG1fd2ViUHJlZmVyZW5jZXMuZ2V0KCkpKTsKICAgICBj b25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IHN0YXRpY19jYXN0PFdlYkZyYW1l TG9hZGVyQ2xpZW50Kj4oY29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJhbWUpOwog ICAgIGNvbmZpZ3VyYXRpb24udmlzaXRlZExpbmtTdG9yZSA9ICZXZWJWaXNpdGVkTGlua1N0b3Jl OjpzaGFyZWQoKTsKIApAQCAtMjgxMCw5ICsyODIxLDYgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxM VFlQRSBXZWJWaWV3Ojppbml0V2l0aEZyYW1lKAogICAgIHVuc2lnbmVkIGxheW91dE1pbGVzdG9u ZXMgPSBEaWRGaXJzdExheW91dCB8IERpZEZpcnN0VmlzdWFsbHlOb25FbXB0eUxheW91dDsKICAg ICBtX3BhZ2UtPmFkZExheW91dE1pbGVzdG9uZXMoc3RhdGljX2Nhc3Q8TGF5b3V0TWlsZXN0b25l cz4obGF5b3V0TWlsZXN0b25lcykpOwogCi0gICAgQlN0cmluZyBsb2NhbFN0b3JhZ2VQYXRoOwot ICAgIGlmIChTVUNDRUVERUQobV9wcmVmZXJlbmNlcy0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRo KCZsb2NhbFN0b3JhZ2VQYXRoKSkpCi0gICAgICAgIG1fcGFnZS0+c2V0dGluZ3MoKS5zZXRMb2Nh bFN0b3JhZ2VEYXRhYmFzZVBhdGgodG9TdHJpbmcobG9jYWxTdG9yYWdlUGF0aCkpOwogCiAgICAg aWYgKG1fdWlEZWxlZ2F0ZSkgewogICAgICAgICBCU3RyaW5nIHBhdGg7Cg== 242924 2014-12-09 08:33:19 -0800 2014-12-09 12:28:49 -0800 Patch bug-139425-20141209083400.patch text/plain 7961 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggZjFlOTJiZTM3 ZTNjOTA5NzM4MDU2OWY1ZDYxZGMwYmRkYjMxNjZhNy4uZDdhNTkzYWM3NWM4OGQyN2FkY2Q5ODM3 NWU1MWRkYzhhMGQyYTdmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE0 LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAg VXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgaW4gV2ViS2l0MQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1l TmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgICgtW1dlYlZpZXcgaW5pdFNpbXBsZUhUTUxEb2N1 bWVudFdpdGhTdHlsZTpmcmFtZTpwcmVmZXJlbmNlczpncm91cE5hbWU6XSk6CisgICAgICAgIFNl dCB0aGUgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgZnJvbSB0aGUgd2ViIHBhZ2UgZ3JvdXAu CisKKzIwMTQtMTItMDggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwog ICAgICAgICBBZGRpbmcgdXNlciBjb250ZW50IHRvIGEgZ3JvdXAgc2hvdWxkIGZvcmNlIHRoYXQg Z3JvdXAgdG8gYmUgY3JlYXRlZAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTM5NDIxCiAgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzE5MTgwMTA4CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKaW5kZXggM2I4MWQ4OGVkYmRiNmUzY2FiMGRkZGNmYWE4ZDdmMjg5OWNkN2JmMC4u NzVhMWM1MTM0MDQ5ZDQwNTAxODQwMDE0OWJiNGUxMGE0YTc5OWQ4NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJv dmlkZXIgaW4gV2ViS2l0MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0 aCk6CisgICAgICAgIEhlbHBlciBmcm9tIGdldHRpbmcgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJh c2UgcGF0aCBnaXZlbiBhIFdlYlByZWZlcmVuY2VzIGluc3RhbmNlLgorCisgICAgICAgIChXZWJW aWV3Ojppbml0V2l0aEZyYW1lKToKKyAgICAgICAgQ3JlYXRlIGEgc3RvcmFnZSBuYW1lc3BhY2Ug cHJvdmlkZXIuCisKIDIwMTQtMTItMDUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KIAogICAgICAgICBHZXQgcmlkIG9mIGNvbmZpZy5oIGluY2x1ZGVzIGFuZCBpbmNsdWRl IGNvbmZpZy5oIGluIHRoZSBwcmVmaXggaGVhZGVyIGluc3RlYWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdENvbW1vbi5wcm9wcyBiL1NvdXJj ZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdENvbW1vbi5wcm9wcwppbmRleCAw ZTNiNDc1Njc1ZmMwZTllZGQ0YzNmYWIyOTA4ZTYxOTM3NjBkY2UwLi5kMWM3YTQxZmVlYjUyMTFi YzEwMWQxNzU0YzQ1NDdmYzhjMDBkODIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYktp dC52Y3hwcm9qL1dlYktpdC9XZWJLaXRDb21tb24ucHJvcHMKKysrIGIvU291cmNlL1dlYktpdC9X ZWJLaXQudmN4cHJvai9XZWJLaXQvV2ViS2l0Q29tbW9uLnByb3BzCkBAIC01LDcgKzUsNyBAQAog ICA8L1Byb3BlcnR5R3JvdXA+CiAgIDxJdGVtRGVmaW5pdGlvbkdyb3VwPgogICAgIDxDbENvbXBp bGU+Ci0gICAgICA8QWRkaXRpb25hbEluY2x1ZGVEaXJlY3Rvcmllcz4kKFByb2plY3REaXIpOyQo UHJvamVjdERpcilcLi5cLi5cd2luOyQoUHJvamVjdERpcilcLi5cLi5cd2luXFdlYkNvcmVTdXBw b3J0OyQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxpbmNsdWRlXFdlYktpdDskKENvbmZpZ3VyYXRp b25CdWlsZERpcilcSW5jbHVkZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcSW5jbHVkZVxwcml2 YXRlOyQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXFdlYkNvcmU7JChDb25maWd1cmF0 aW9uQnVpbGREaXIpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVyczskKENvbmZpZ3Vy YXRpb25CdWlsZERpcilcSW5jbHVkZVxKYXZhU2NyaXB0Q29yZTskKENvbmZpZ3VyYXRpb25CdWls ZERpcilcSW5jbHVkZVxwcml2YXRlXEphdmFTY3JpcHRDb3JlOyQoQ29uZmlndXJhdGlvbkJ1aWxk RGlyKVxvYmokKFBsYXRmb3JtQXJjaGl0ZWN0dXJlKVxXZWJLaXRcRGVyaXZlZFNvdXJjZXM7JChX ZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRlOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZVxwcml2 YXRlOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZVxXZWJDb3JlOyQoV2ViS2l0X0xpYnJhcmll cylcSW5jbHVkZVxXZWJDb3JlXEZvcndhcmRpbmdIZWFkZXJzOyQoV2ViS2l0X0xpYnJhcmllcylc SW5jbHVkZVxKYXZhU2NyaXB0Q29yZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVccHJpdmF0 ZVxKYXZhU2NyaXB0Q29yZTskKEludERpcilpbmNsdWRlOyUoQWRkaXRpb25hbEluY2x1ZGVEaXJl Y3Rvcmllcyk8L0FkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM+CisgICAgICA8QWRkaXRpb25h bEluY2x1ZGVEaXJlY3Rvcmllcz4kKFByb2plY3REaXIpOyQoUHJvamVjdERpcilcLi5cLi5cd2lu OyQoUHJvamVjdERpcilcLi5cLi5cd2luXFdlYkNvcmVTdXBwb3J0OyQoUHJvamVjdERpcilcLi5c Li5cU3RvcmFnZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcaW5jbHVkZVxXZWJLaXQ7JChDb25m aWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGU7JChDb25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1 ZGVccHJpdmF0ZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilcSW5jbHVkZVxXZWJDb3JlOyQoQ29u ZmlndXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXFdlYkNvcmVcRm9yd2FyZGluZ0hlYWRlcnM7JChD b25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGVcSmF2YVNjcmlwdENvcmU7JChDb25maWd1cmF0 aW9uQnVpbGREaXIpXEluY2x1ZGVccHJpdmF0ZVxKYXZhU2NyaXB0Q29yZTskKENvbmZpZ3VyYXRp b25CdWlsZERpcilcb2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcV2ViS2l0XERlcml2ZWRTb3Vy Y2VzOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1 ZGVccHJpdmF0ZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVcV2ViQ29yZTskKFdlYktpdF9M aWJyYXJpZXMpXEluY2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVyczskKFdlYktpdF9MaWJy YXJpZXMpXEluY2x1ZGVcSmF2YVNjcmlwdENvcmU7JChXZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRl XHByaXZhdGVcSmF2YVNjcmlwdENvcmU7JChJbnREaXIpaW5jbHVkZTslKEFkZGl0aW9uYWxJbmNs dWRlRGlyZWN0b3JpZXMpPC9BZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9yaWVzPgogICAgICAgPFBy ZXByb2Nlc3NvckRlZmluaXRpb25zPldFQktJVF9FWFBPUlRTO0ZSQU1FV09SS19OQU1FPVdlYktp dDslKFByZXByb2Nlc3NvckRlZmluaXRpb25zKTwvUHJlcHJvY2Vzc29yRGVmaW5pdGlvbnM+CiAg ICAgICA8UHJlY29tcGlsZWRIZWFkZXI+VXNlPC9QcmVjb21waWxlZEhlYWRlcj4KICAgICAgIDxQ cmVjb21waWxlZEhlYWRlckZpbGU+V2ViS2l0UHJlZml4Lmg8L1ByZWNvbXBpbGVkSGVhZGVyRmls ZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCBlNjhhNzdkYjFjMGQ0NGUy NmMyOWM0YjhhNGViNGI1Y2E1NTEzODdlLi41MTcyYmZjYjNmODlhMWQ1OWVlOTFlYzk4ZTBmODA1 ZjUzNDY1M2QxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcu bW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0xMDAsNiAr MTAwLDcgQEAKICNpbXBvcnQgIldlYlNjcmlwdFdvcmxkSW50ZXJuYWwuaCIKICNpbXBvcnQgIldl YlNlbGVjdGlvblNlcnZpY2VDb250cm9sbGVyLmgiCiAjaW1wb3J0ICJXZWJTdG9yYWdlTWFuYWdl ckludGVybmFsLmgiCisjaW1wb3J0ICJXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIKICNp bXBvcnQgIldlYlN5c3RlbUludGVyZmFjZS5oIgogI2ltcG9ydCAiV2ViVGV4dENvbXBsZXRpb25D b250cm9sbGVyLmgiCiAjaW1wb3J0ICJXZWJUZXh0SXRlcmF0b3IuaCIKQEAgLTk1Miw2ICs5NTMs NyBAQCBzdGF0aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZOZWNlc3Nh cnkoKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLmFsdGVybmF0aXZlVGV4dENsaWVudCA9IG5ldyBX ZWJBbHRlcm5hdGl2ZVRleHRDbGllbnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ubG9h ZGVyQ2xpZW50Rm9yTWFpbkZyYW1lID0gbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50OwogICAgIHBh Z2VDb25maWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9ncmVzc1Ry YWNrZXJDbGllbnQoc2VsZik7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFj ZVByb3ZpZGVyID0gJl9wcml2YXRlLT5ncm91cC0+c3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKCk7 CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udXNlckNvbnRlbnRDb250cm9sbGVyID0gJl9wcml2YXRl LT5ncm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24u dmlzaXRlZExpbmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsK ICAgICBfcHJpdmF0ZS0+cGFnZSA9IG5ldyBQYWdlKHBhZ2VDb25maWd1cmF0aW9uKTsKQEAgLTEx ODcsNiArMTE4OSw3IEBAIHN0YXRpYyB2b2lkIFdlYktpdEluaXRpYWxpemVHYW1lcGFkUHJvdmlk ZXJJZk5lY2Vzc2FyeSgpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uaW5zcGVjdG9yQ2xpZW50ID0g bmV3IFdlYkluc3BlY3RvckNsaWVudChzZWxmKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5sb2Fk ZXJDbGllbnRGb3JNYWluRnJhbWUgPSBuZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CiAgICAgcGFn ZUNvbmZpZ3VyYXRpb24ucHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gbmV3IFdlYlByb2dyZXNzVHJh Y2tlckNsaWVudChzZWxmKTsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNwYWNl UHJvdmlkZXIgPSAmX3ByaXZhdGUtPmdyb3VwLT5zdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIoKTsK ICAgICBwYWdlQ29uZmlndXJhdGlvbi51c2VyQ29udGVudENvbnRyb2xsZXIgPSAmX3ByaXZhdGUt Pmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi52 aXNpdGVkTGlua1N0b3JlID0gJl9wcml2YXRlLT5ncm91cC0+dmlzaXRlZExpbmtTdG9yZSgpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCmluZGV4IGNlMWQyZmRhZTc1ZTFkYzcyM2ZmNmQ2MDc3NDNjM2Nh Yjg2Yjg2NjIuLmM4MDRjM2NhYzg5ZTU4MjlmM2Q5MzhlMmYwMzViMDY3N2VhZWJiYTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv d2luL1dlYlZpZXcuY3BwCkBAIC02NCw2ICs2NCw3IEBACiAjaW5jbHVkZSAiV2ViUGxhdGZvcm1T dHJhdGVnaWVzLmgiCiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJXZWJT Y3JpcHRXb3JsZC5oIgorI2luY2x1ZGUgIldlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5oIgog I2luY2x1ZGUgIldlYlZpc2l0ZWRMaW5rU3RvcmUuaCIKICNpbmNsdWRlICJyZXNvdXJjZS5oIgog I2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0FQSUNhc3QuaD4KQEAgLTI3MjYsNyArMjcyNywxNiBA QCBib29sIFdlYlZpZXc6OnNob3VsZEluaXRpYWxpemVUcmFja1BvaW50SGFjaygpCiAKICAgICBy ZXR1cm4gc2hvdWxkQ3JlYXRlU2Nyb2xsYmFyczsKIH0KLSAgICAKKworc3RhdGljIFN0cmluZyBs b2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoV2ViUHJlZmVyZW5jZXMqIHByZWZlcmVuY2VzKQorewor ICAgIEJTdHJpbmcgbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoOworICAgIGlmIChGQUlMRUQocHJl ZmVyZW5jZXMtPmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCgmbG9jYWxTdG9yYWdlRGF0YWJhc2VQ YXRoKSkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIHJldHVybiB0b1N0cmluZyhs b2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgpOworfQorCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IFdlYlZpZXc6OmluaXRXaXRoRnJhbWUoIAogICAgIC8qIFtpbl0gKi8gUkVDVCBmcmFtZSwKICAg ICAvKiBbaW5dICovIEJTVFIgZnJhbWVOYW1lLApAQCAtMjgwMSw2ICsyODExLDcgQEAgSFJFU1VM VCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3Ojppbml0V2l0aEZyYW1lKAogICAgIGNvbmZpZ3Vy YXRpb24uaW5zcGVjdG9yQ2xpZW50ID0gbV9pbnNwZWN0b3JDbGllbnQ7CiAjZW5kaWYgLy8gRU5B QkxFKElOU1BFQ1RPUikKICAgICBjb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFt ZSA9IG5ldyBXZWJGcmFtZUxvYWRlckNsaWVudDsKKyAgICBjb25maWd1cmF0aW9uLnN0b3JhZ2VO YW1lc3BhY2VQcm92aWRlciA9IFdlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcjo6Y3JlYXRlKGxv Y2FsU3RvcmFnZURhdGFiYXNlUGF0aChtX3ByZWZlcmVuY2VzLmdldCgpKSk7CiAgICAgY29uZmln dXJhdGlvbi5wcm9ncmVzc1RyYWNrZXJDbGllbnQgPSBzdGF0aWNfY2FzdDxXZWJGcmFtZUxvYWRl ckNsaWVudCo+KGNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xpZW50Rm9yTWFpbkZyYW1lKTsKICAgICBj b25maWd1cmF0aW9uLnZpc2l0ZWRMaW5rU3RvcmUgPSAmV2ViVmlzaXRlZExpbmtTdG9yZTo6c2hh cmVkKCk7CiAKQEAgLTI4MTAsOSArMjgyMSw2IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUg V2ViVmlldzo6aW5pdFdpdGhGcmFtZSgKICAgICB1bnNpZ25lZCBsYXlvdXRNaWxlc3RvbmVzID0g RGlkRmlyc3RMYXlvdXQgfCBEaWRGaXJzdFZpc3VhbGx5Tm9uRW1wdHlMYXlvdXQ7CiAgICAgbV9w YWdlLT5hZGRMYXlvdXRNaWxlc3RvbmVzKHN0YXRpY19jYXN0PExheW91dE1pbGVzdG9uZXM+KGxh eW91dE1pbGVzdG9uZXMpKTsKIAotICAgIEJTdHJpbmcgbG9jYWxTdG9yYWdlUGF0aDsKLSAgICBp ZiAoU1VDQ0VFREVEKG1fcHJlZmVyZW5jZXMtPmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCgmbG9j YWxTdG9yYWdlUGF0aCkpKQotICAgICAgICBtX3BhZ2UtPnNldHRpbmdzKCkuc2V0TG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoKHRvU3RyaW5nKGxvY2FsU3RvcmFnZVBhdGgpKTsKIAogICAgIGlmICht X3VpRGVsZWdhdGUpIHsKICAgICAgICAgQlN0cmluZyBwYXRoOwo= 242958 2014-12-09 12:28:52 -0800 2014-12-09 13:39:43 -0800 Patch bug-139425-20141209122932.patch text/plain 9039 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMzdlMDNlMDQx NWQxNDdmYTFmODlmZmE5NTdjYjIzYjEyMGEzZDRhMS4uYzc4ZGE0NTU1ZjJkYzhiNjI0YmFhNmMy MDU2ODNkZWNkNTY0YmZjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0 LTEyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg VXNlIHRoZSBuZXcgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgaW4gV2ViS2l0MQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDI1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX2NvbW1vbkluaXRpYWxpemF0aW9uV2l0aEZyYW1l TmFtZTpncm91cE5hbWU6XSk6CisgICAgICAgICgtW1dlYlZpZXcgaW5pdFNpbXBsZUhUTUxEb2N1 bWVudFdpdGhTdHlsZTpmcmFtZTpwcmVmZXJlbmNlczpncm91cE5hbWU6XSk6CisgICAgICAgIFNl dCB0aGUgc3RvcmFnZSBuYW1lc3BhY2UgcHJvdmlkZXIgZnJvbSB0aGUgd2ViIHBhZ2UgZ3JvdXAu CisKIDIwMTQtMTItMDggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTiAocjE1ODAzNik6IFdlYlZpZXcgY2Fubm90IGhhbmRsZSBIVFRQIEJh c2ljIEF1dGhlbnRpY2F0aW9uIGNoYWxsZW5nZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC93 aW4vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCmluZGV4IDNiODFkODhl ZGJkYjZlM2NhYjBkZGRjZmFhOGQ3ZjI4OTljZDdiZjAuLjc1YTFjNTEzNDA0OWQ0MDUwMTg0MDAx NDliYjRlMTBhNGE3OTlkODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx NC0xMi0wOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAg IFVzZSB0aGUgbmV3IHN0b3JhZ2UgbmFtZXNwYWNlIHByb3ZpZGVyIGluIFdlYktpdDEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTQyNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy5jcHA6 CisgICAgICAgIChsb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgpOgorICAgICAgICBIZWxwZXIgZnJv bSBnZXR0aW5nIHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGggZ2l2ZW4gYSBXZWJQcmVm ZXJlbmNlcyBpbnN0YW5jZS4KKworICAgICAgICAoV2ViVmlldzo6aW5pdFdpdGhGcmFtZSk6Cisg ICAgICAgIENyZWF0ZSBhIHN0b3JhZ2UgbmFtZXNwYWNlIHByb3ZpZGVyLgorCiAyMDE0LTEyLTA1 ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgR2V0IHJp ZCBvZiBjb25maWcuaCBpbmNsdWRlcyBhbmQgaW5jbHVkZSBjb25maWcuaCBpbiB0aGUgcHJlZml4 IGhlYWRlciBpbnN0ZWFkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9q L1dlYktpdC9XZWJLaXQudmN4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2Vi S2l0L1dlYktpdC52Y3hwcm9qCmluZGV4IGRlYjBkZDE3OGY3NTA0OTljNjFlOWU1Mjg1OGIzMWY1 ZDMxY2UwOTYuLjU0NzJkNWIxNDI4MzZhNmRiYjUyMDYxNDI2MjkzZTVmYmY5ZDhkYzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9q CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0L1dlYktpdC52Y3hwcm9q CkBAIC00MTksNiArNDE5LDcgQEAKICAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXC4uXHdpblxX ZWJXb3JrZXJzUHJpdmF0ZS5jcHAiIC8+CiAgIDwvSXRlbUdyb3VwPgogICA8SXRlbUdyb3VwPgor ICA8Q0xJbmNsdWRlIEluY2x1ZGU9Ii4uXC4uXFN0b3JhZ2VcV2ViU3RvcmFnZU5hbWVzcGFjZVBy b3ZpZGVyLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlwuLlx3aW5cQWNjZXNzaWJs ZUJhc2UuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXC4uXHdpblxBY2Nlc3NpYmxl RG9jdW1lbnQuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXC4uXHdpblxBY2Nlc3Np YmxlSW1hZ2UuaCIgLz4KQEAgLTQ5OCw3ICs0OTksNiBAQAogICAgIDxDbEluY2x1ZGUgSW5jbHVk ZT0iLi5cLi5cd2luXFdlYlNjcmlwdFdvcmxkLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRl PSIuLlwuLlx3aW5cV2ViU2VjdXJpdHlPcmlnaW4uaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1 ZGU9Ii4uXC4uXHdpblxXZWJTZXJpYWxpemVkSlNWYWx1ZS5oIiAvPgotICAgIDxDbENvbXBpbGUg SW5jbHVkZT0iLi5cLi5cU3RvcmFnZVxXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIgLz4K ICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXC4uXHdpblxXZWJUZXh0UmVuZGVyZXIuaCIgLz4K ICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXC4uXHdpblxXZWJVUkxBdXRoZW50aWNhdGlvbkNo YWxsZW5nZS5oIiAvPgogICAgIDxDbEluY2x1ZGUgSW5jbHVkZT0iLi5cLi5cd2luXFdlYlVSTEF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlU2VuZGVyLmgiIC8+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9XZWJLaXRDb21tb24ucHJvcHMgYi9Tb3VyY2UvV2Vi S2l0L1dlYktpdC52Y3hwcm9qL1dlYktpdC9XZWJLaXRDb21tb24ucHJvcHMKaW5kZXggMGUzYjQ3 NTY3NWZjMGU5ZWRkNGMzZmFiMjkwOGU2MTkzNzYwZGNlMC4uZDFjN2E0MWZlZWI1MjExYmMxMDFk MTc1NGM0NTQ3ZmM4YzAwZDgyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQudmN4 cHJvai9XZWJLaXQvV2ViS2l0Q29tbW9uLnByb3BzCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViS2l0 LnZjeHByb2ovV2ViS2l0L1dlYktpdENvbW1vbi5wcm9wcwpAQCAtNSw3ICs1LDcgQEAKICAgPC9Q cm9wZXJ0eUdyb3VwPgogICA8SXRlbURlZmluaXRpb25Hcm91cD4KICAgICA8Q2xDb21waWxlPgot ICAgICAgPEFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3JpZXM+JChQcm9qZWN0RGlyKTskKFByb2pl Y3REaXIpXC4uXC4uXHdpbjskKFByb2plY3REaXIpXC4uXC4uXHdpblxXZWJDb3JlU3VwcG9ydDsk KENvbmZpZ3VyYXRpb25CdWlsZERpcilcaW5jbHVkZVxXZWJLaXQ7JChDb25maWd1cmF0aW9uQnVp bGREaXIpXEluY2x1ZGU7JChDb25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGVccHJpdmF0ZTsk KENvbmZpZ3VyYXRpb25CdWlsZERpcilcSW5jbHVkZVxXZWJDb3JlOyQoQ29uZmlndXJhdGlvbkJ1 aWxkRGlyKVxJbmNsdWRlXFdlYkNvcmVcRm9yd2FyZGluZ0hlYWRlcnM7JChDb25maWd1cmF0aW9u QnVpbGREaXIpXEluY2x1ZGVcSmF2YVNjcmlwdENvcmU7JChDb25maWd1cmF0aW9uQnVpbGREaXIp XEluY2x1ZGVccHJpdmF0ZVxKYXZhU2NyaXB0Q29yZTskKENvbmZpZ3VyYXRpb25CdWlsZERpcilc b2JqJChQbGF0Zm9ybUFyY2hpdGVjdHVyZSlcV2ViS2l0XERlcml2ZWRTb3VyY2VzOyQoV2ViS2l0 X0xpYnJhcmllcylcSW5jbHVkZTskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVccHJpdmF0ZTsk KFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGVcV2ViQ29yZTskKFdlYktpdF9MaWJyYXJpZXMpXElu Y2x1ZGVcV2ViQ29yZVxGb3J3YXJkaW5nSGVhZGVyczskKFdlYktpdF9MaWJyYXJpZXMpXEluY2x1 ZGVcSmF2YVNjcmlwdENvcmU7JChXZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRlXHByaXZhdGVcSmF2 YVNjcmlwdENvcmU7JChJbnREaXIpaW5jbHVkZTslKEFkZGl0aW9uYWxJbmNsdWRlRGlyZWN0b3Jp ZXMpPC9BZGRpdGlvbmFsSW5jbHVkZURpcmVjdG9yaWVzPgorICAgICAgPEFkZGl0aW9uYWxJbmNs dWRlRGlyZWN0b3JpZXM+JChQcm9qZWN0RGlyKTskKFByb2plY3REaXIpXC4uXC4uXHdpbjskKFBy b2plY3REaXIpXC4uXC4uXHdpblxXZWJDb3JlU3VwcG9ydDskKFByb2plY3REaXIpXC4uXC4uXFN0 b3JhZ2U7JChDb25maWd1cmF0aW9uQnVpbGREaXIpXGluY2x1ZGVcV2ViS2l0OyQoQ29uZmlndXJh dGlvbkJ1aWxkRGlyKVxJbmNsdWRlOyQoQ29uZmlndXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXHBy aXZhdGU7JChDb25maWd1cmF0aW9uQnVpbGREaXIpXEluY2x1ZGVcV2ViQ29yZTskKENvbmZpZ3Vy YXRpb25CdWlsZERpcilcSW5jbHVkZVxXZWJDb3JlXEZvcndhcmRpbmdIZWFkZXJzOyQoQ29uZmln dXJhdGlvbkJ1aWxkRGlyKVxJbmNsdWRlXEphdmFTY3JpcHRDb3JlOyQoQ29uZmlndXJhdGlvbkJ1 aWxkRGlyKVxJbmNsdWRlXHByaXZhdGVcSmF2YVNjcmlwdENvcmU7JChDb25maWd1cmF0aW9uQnVp bGREaXIpXG9iaiQoUGxhdGZvcm1BcmNoaXRlY3R1cmUpXFdlYktpdFxEZXJpdmVkU291cmNlczsk KFdlYktpdF9MaWJyYXJpZXMpXEluY2x1ZGU7JChXZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRlXHBy aXZhdGU7JChXZWJLaXRfTGlicmFyaWVzKVxJbmNsdWRlXFdlYkNvcmU7JChXZWJLaXRfTGlicmFy aWVzKVxJbmNsdWRlXFdlYkNvcmVcRm9yd2FyZGluZ0hlYWRlcnM7JChXZWJLaXRfTGlicmFyaWVz KVxJbmNsdWRlXEphdmFTY3JpcHRDb3JlOyQoV2ViS2l0X0xpYnJhcmllcylcSW5jbHVkZVxwcml2 YXRlXEphdmFTY3JpcHRDb3JlOyQoSW50RGlyKWluY2x1ZGU7JShBZGRpdGlvbmFsSW5jbHVkZURp cmVjdG9yaWVzKTwvQWRkaXRpb25hbEluY2x1ZGVEaXJlY3Rvcmllcz4KICAgICAgIDxQcmVwcm9j ZXNzb3JEZWZpbml0aW9ucz5XRUJLSVRfRVhQT1JUUztGUkFNRVdPUktfTkFNRT1XZWJLaXQ7JShQ cmVwcm9jZXNzb3JEZWZpbml0aW9ucyk8L1ByZXByb2Nlc3NvckRlZmluaXRpb25zPgogICAgICAg PFByZWNvbXBpbGVkSGVhZGVyPlVzZTwvUHJlY29tcGlsZWRIZWFkZXI+CiAgICAgICA8UHJlY29t cGlsZWRIZWFkZXJGaWxlPldlYktpdFByZWZpeC5oPC9QcmVjb21waWxlZEhlYWRlckZpbGU+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggZDE3ZTIyMTFlMTE3NzVmY2Y4MmFl ODUzNzM0ZGZmZTdhMDgwNTljNy4uOWQ4OWVkOWZhMDUwMzE5MjA0ZWExZjE1ODU1ZGU3ZmQ0YzAx NmY2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMTAwLDYgKzEwMCw3 IEBACiAjaW1wb3J0ICJXZWJTY3JpcHRXb3JsZEludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJTZWxl Y3Rpb25TZXJ2aWNlQ29udHJvbGxlci5oIgogI2ltcG9ydCAiV2ViU3RvcmFnZU1hbmFnZXJJbnRl cm5hbC5oIgorI2ltcG9ydCAiV2ViU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmgiCiAjaW1wb3J0 ICJXZWJTeXN0ZW1JbnRlcmZhY2UuaCIKICNpbXBvcnQgIldlYlRleHRDb21wbGV0aW9uQ29udHJv bGxlci5oIgogI2ltcG9ydCAiV2ViVGV4dEl0ZXJhdG9yLmgiCkBAIC05NTMsNiArOTU0LDcgQEAg c3RhdGljIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUdhbWVwYWRQcm92aWRlcklmTmVjZXNzYXJ5KCkK ICAgICBwYWdlQ29uZmlndXJhdGlvbi5hbHRlcm5hdGl2ZVRleHRDbGllbnQgPSBuZXcgV2ViQWx0 ZXJuYXRpdmVUZXh0Q2xpZW50KHNlbGYpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLmxvYWRlckNs aWVudEZvck1haW5GcmFtZSA9IG5ldyBXZWJGcmFtZUxvYWRlckNsaWVudDsKICAgICBwYWdlQ29u ZmlndXJhdGlvbi5wcm9ncmVzc1RyYWNrZXJDbGllbnQgPSBuZXcgV2ViUHJvZ3Jlc3NUcmFja2Vy Q2xpZW50KHNlbGYpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLnN0b3JhZ2VOYW1lc3BhY2VQcm92 aWRlciA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcigpOwogICAg IHBhZ2VDb25maWd1cmF0aW9uLnVzZXJDb250ZW50Q29udHJvbGxlciA9ICZfcHJpdmF0ZS0+Z3Jv dXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnZpc2l0 ZWRMaW5rU3RvcmUgPSAmX3ByaXZhdGUtPmdyb3VwLT52aXNpdGVkTGlua1N0b3JlKCk7CiAgICAg X3ByaXZhdGUtPnBhZ2UgPSBuZXcgUGFnZShwYWdlQ29uZmlndXJhdGlvbik7CkBAIC0xMTg4LDYg KzExOTAsNyBAQCBzdGF0aWMgdm9pZCBXZWJLaXRJbml0aWFsaXplR2FtZXBhZFByb3ZpZGVySWZO ZWNlc3NhcnkoKQogICAgIHBhZ2VDb25maWd1cmF0aW9uLmluc3BlY3RvckNsaWVudCA9IG5ldyBX ZWJJbnNwZWN0b3JDbGllbnQoc2VsZik7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ubG9hZGVyQ2xp ZW50Rm9yTWFpbkZyYW1lID0gbmV3IFdlYkZyYW1lTG9hZGVyQ2xpZW50OwogICAgIHBhZ2VDb25m aWd1cmF0aW9uLnByb2dyZXNzVHJhY2tlckNsaWVudCA9IG5ldyBXZWJQcm9ncmVzc1RyYWNrZXJD bGllbnQoc2VsZik7CisgICAgcGFnZUNvbmZpZ3VyYXRpb24uc3RvcmFnZU5hbWVzcGFjZVByb3Zp ZGVyID0gJl9wcml2YXRlLT5ncm91cC0+c3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyKCk7CiAgICAg cGFnZUNvbmZpZ3VyYXRpb24udXNlckNvbnRlbnRDb250cm9sbGVyID0gJl9wcml2YXRlLT5ncm91 cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24udmlzaXRl ZExpbmtTdG9yZSA9ICZfcHJpdmF0ZS0+Z3JvdXAtPnZpc2l0ZWRMaW5rU3RvcmUoKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAppbmRleCBjZTFkMmZkYWU3NWUxZGM3MjNmZjZkNjA3NzQzYzNjYWI4NmI4 NjYyLi5jODA0YzNjYWM4OWU1ODI5ZjNkOTM4ZTJmMDM1YjA2NzdlYWViYmE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L3dpbi9X ZWJWaWV3LmNwcApAQCAtNjQsNiArNjQsNyBAQAogI2luY2x1ZGUgIldlYlBsYXRmb3JtU3RyYXRl Z2llcy5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAiV2ViU2NyaXB0 V29ybGQuaCIKKyNpbmNsdWRlICJXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuaCIKICNpbmNs dWRlICJXZWJWaXNpdGVkTGlua1N0b3JlLmgiCiAjaW5jbHVkZSAicmVzb3VyY2UuaCIKICNpbmNs dWRlIDxKYXZhU2NyaXB0Q29yZS9BUElDYXN0Lmg+CkBAIC0yNzI2LDcgKzI3MjcsMTYgQEAgYm9v bCBXZWJWaWV3OjpzaG91bGRJbml0aWFsaXplVHJhY2tQb2ludEhhY2soKQogCiAgICAgcmV0dXJu IHNob3VsZENyZWF0ZVNjcm9sbGJhcnM7CiB9Ci0gICAgCisKK3N0YXRpYyBTdHJpbmcgbG9jYWxT dG9yYWdlRGF0YWJhc2VQYXRoKFdlYlByZWZlcmVuY2VzKiBwcmVmZXJlbmNlcykKK3sKKyAgICBC U3RyaW5nIGxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aDsKKyAgICBpZiAoRkFJTEVEKHByZWZlcmVu Y2VzLT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoJmxvY2FsU3RvcmFnZURhdGFiYXNlUGF0aCkp KQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICByZXR1cm4gdG9TdHJpbmcobG9jYWxT dG9yYWdlRGF0YWJhc2VQYXRoKTsKK30KKwogSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJW aWV3Ojppbml0V2l0aEZyYW1lKCAKICAgICAvKiBbaW5dICovIFJFQ1QgZnJhbWUsCiAgICAgLyog W2luXSAqLyBCU1RSIGZyYW1lTmFtZSwKQEAgLTI4MDEsNiArMjgxMSw3IEBAIEhSRVNVTFQgU1RE TUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6aW5pdFdpdGhGcmFtZSgKICAgICBjb25maWd1cmF0aW9u Lmluc3BlY3RvckNsaWVudCA9IG1faW5zcGVjdG9yQ2xpZW50OwogI2VuZGlmIC8vIEVOQUJMRShJ TlNQRUNUT1IpCiAgICAgY29uZmlndXJhdGlvbi5sb2FkZXJDbGllbnRGb3JNYWluRnJhbWUgPSBu ZXcgV2ViRnJhbWVMb2FkZXJDbGllbnQ7CisgICAgY29uZmlndXJhdGlvbi5zdG9yYWdlTmFtZXNw YWNlUHJvdmlkZXIgPSBXZWJTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXI6OmNyZWF0ZShsb2NhbFN0 b3JhZ2VEYXRhYmFzZVBhdGgobV9wcmVmZXJlbmNlcy5nZXQoKSkpOwogICAgIGNvbmZpZ3VyYXRp b24ucHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gc3RhdGljX2Nhc3Q8V2ViRnJhbWVMb2FkZXJDbGll bnQqPihjb25maWd1cmF0aW9uLmxvYWRlckNsaWVudEZvck1haW5GcmFtZSk7CiAgICAgY29uZmln dXJhdGlvbi52aXNpdGVkTGlua1N0b3JlID0gJldlYlZpc2l0ZWRMaW5rU3RvcmU6OnNoYXJlZCgp OwogCkBAIC0yODEwLDkgKzI4MjEsNiBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlZp ZXc6OmluaXRXaXRoRnJhbWUoCiAgICAgdW5zaWduZWQgbGF5b3V0TWlsZXN0b25lcyA9IERpZEZp cnN0TGF5b3V0IHwgRGlkRmlyc3RWaXN1YWxseU5vbkVtcHR5TGF5b3V0OwogICAgIG1fcGFnZS0+ YWRkTGF5b3V0TWlsZXN0b25lcyhzdGF0aWNfY2FzdDxMYXlvdXRNaWxlc3RvbmVzPihsYXlvdXRN aWxlc3RvbmVzKSk7CiAKLSAgICBCU3RyaW5nIGxvY2FsU3RvcmFnZVBhdGg7Ci0gICAgaWYgKFNV Q0NFRURFRChtX3ByZWZlcmVuY2VzLT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoJmxvY2FsU3Rv cmFnZVBhdGgpKSkKLSAgICAgICAgbV9wYWdlLT5zZXR0aW5ncygpLnNldExvY2FsU3RvcmFnZURh dGFiYXNlUGF0aCh0b1N0cmluZyhsb2NhbFN0b3JhZ2VQYXRoKSk7CiAKICAgICBpZiAobV91aURl bGVnYXRlKSB7CiAgICAgICAgIEJTdHJpbmcgcGF0aDsK