58096 2011-04-07 16:21:54 -0700 Re-land http://trac.webkit.org/changeset/83007. Needed to lock v8 before using. 2011-04-08 17:55:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 aa aa abarth dglazkov dimich eric levin webkit.review.bot oldest_to_newest 381822 0 aa 2011-04-07 16:21:54 -0700 Re-land http://trac.webkit.org/changeset/83007. Needed to lock v8 before using. 381823 1 88726 aa 2011-04-07 16:22:31 -0700 Created attachment 88726 Patch 381835 2 aa 2011-04-07 16:36:20 -0700 Adam, Darin: The only change from the previous patch you reviewed is the addition of v8::Locker in WebFrameTest.cpp > FrameForEnteredContext. 381836 3 aa 2011-04-07 16:37:17 -0700 Oh, and the reason I didn't see this earlier is that the build bots randomize the order of the test runs and in order for this CHECK to be hit, v8 has to be used with a locker once before my code ran. There is one test that does that. 381841 4 88726 abarth 2011-04-07 16:41:08 -0700 Comment on attachment 88726 Patch Yep. Sorry I didn't catch the Locker issue. It's bene a while since I worked on code that enters V8 from an empty stack. 382496 5 dimich 2011-04-08 13:14:14 -0700 With bug 58110 resolved, the Lockers are no longer needed. I've verified Aaron's patch w/o lockers does not fail on: webkit_unit_tests --gtest_repeat=-1 --gtest_shuffle which was the case before. So the patch, sans the Locker line, can be landed now. 382593 6 88883 aa 2011-04-08 15:29:22 -0700 Created attachment 88883 Patch New pach with removed references to v8.h and v8::Locker. This is the same patch that was previously reviewed and landed. 382606 7 eric 2011-04-08 15:39:13 -0700 Attachment 88883 did not build on chromium: Build output: http://queues.webkit.org/results/8377161 382619 8 abarth 2011-04-08 15:56:35 -0700 /Projects/CrMacEWS/Source/WebKit/chromium/tests/WebFrameTest.cpp:136: error: 'HandleScope' is not a member of 'v8' Looks like we still need v8.h. 382626 9 webkit.review.bot 2011-04-08 16:00:25 -0700 Attachment 88883 did not build on chromium: Build output: http://queues.webkit.org/results/8377172 382639 10 88893 aa 2011-04-08 16:35:45 -0700 Created attachment 88893 Patch fffff... 88726 2011-04-07 16:22:31 -0700 2011-04-08 15:29:19 -0700 Patch bug-58096-20110407162230.patch text/plain 8832 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODMyMjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZDI3MDQwZWZmZTVmMjM3NGUzMWFlZjg4MzVhMTE4YTdkMmU5YjBmNS4uNjZkYjk1NmIwZDRhZDI2 Y2MwNDk2MjQ1ZDUyNzc1NjI4ZDU2N2RiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAxMS0wNC0wNyAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZS1s YW5kIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzgzMDA3LiBOZWVkZWQgdG8gbG9j ayB2OCBiZWZvcmUgdXNpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01ODA5NgorCisgICAgICAgICogV2ViS2l0Lmd5cDoKKyAgICAgICAgKiBXZWJL aXQuZ3lwaToKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoKKyAgICAgICAgKiBzcmMvV2Vi RnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4 dCk6CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViRnJhbWVUZXN0OjpXZWJGcmFtZVRlc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZVRl c3Q6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lVGVz dDo6bG9hZEZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6VEVTVF9GKToKKwogMjAxMS0wNC0wNyAg QW5uYSBDYXZlbmRlciAgPGFubmFjY0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRXJpYyBDYXJsc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJL aXQuZ3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDI2M2I0OWU1 NDgyNzVkMTFhNmI0Y2MwMjRlZjFiZjVjZmQwOTY0YzcuLjgwMDNlZDRiYTQ1NTk4ODdmODk1NGZj ZWE4OTNlNzU3ODdjOTkxMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTgxNSwx MSArODE1LDEwIEBACiAgICAgICAgICAgICAgICAgICAgICdjb25kaXRpb25zJzogWwogICAgICAg ICAgICAgICAgICAgICAgICAgWydPUz09IndpbiInLCB7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJ3NvdXJjZXMnOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRklY TUU6IFBvcnQgUG9wdXBNZW51VGVzdCBhbmQgV2ViRnJhbWVUZXN0IHRvIExpbnV4IGFuZCBNYWMu CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IFBvcnQgUG9wdXBNZW51 VGVzdCB0byBMaW51eCBhbmQgTWFjLgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAn dGVzdHMvUG9wdXBNZW51VGVzdC5jcHAnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAndGVzdHMvVHJhbnNwYXJlbmN5V2luVGVzdC5jcHAnLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAndGVzdHMvVW5pc2NyaWJlSGVscGVyVGVzdC5jcHAnLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAndGVzdHMvV2ViRnJhbWVUZXN0LmNwcCcsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICd0ZXN0cy9XZWJQYWdlU2VyaWFsaXplclRlc3QuY3BwJywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICAgICAgICAg fV0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXBpIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaQppbmRleCAwMTZjZjFhMWFiYWQzMDQzNzA5 YzI4ZTA2YTE4ZjEzMWJkNzU2MTRmLi44ODEwMWEzMWU4ZGFjZjIyZTA5NGJiOWZmMzJjMDBhY2Fj NjFmMWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXBpCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cGkKQEAgLTY0LDYgKzY0LDcgQEAK ICAgICAgICAgICAgICd0ZXN0cy9UaWxpbmdEYXRhVGVzdC5jcHAnLAogICAgICAgICAgICAgJ3Rl c3RzL1RyZWVUZXN0SGVscGVycy5jcHAnLAogICAgICAgICAgICAgJ3Rlc3RzL1RyZWVUZXN0SGVs cGVycy5oJywKKyAgICAgICAgICAgICd0ZXN0cy9XZWJGcmFtZVRlc3QuY3BwJywKICAgICAgICAg XSwKICAgICB9LAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv V2ViRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKaW5k ZXggZDVkMmZmNGQyNWYzMmY3ZTQ2N2QxNjQxYTI0MzhlNTNiYmVkMTc0OS4uMTExMTQyMjQ1ZjAz YmY1OGUyNzMwZTA1MmM5MmZhZDk0YzNiZDM2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJGcmFtZS5oCkBAIC05Nyw2ICs5NywxMyBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQ SSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yRW50ZXJlZENvbnRleHQoKTsKICAgICBXRUJLSVRf QVBJIHN0YXRpYyBXZWJGcmFtZSogZnJhbWVGb3JDdXJyZW50Q29udGV4dCgpOwogCisjaWYgV0VC S0lUX1VTSU5HX1Y4CisgICAgLy8gUmV0dXJucyB0aGUgZnJhbWUgY29ycmVzcG9uZGluZyB0byB0 aGUgZ2l2ZW4gY29udGV4dC4gVGhpcyBjYW4gcmV0dXJuIDAKKyAgICAvLyBpZiB0aGUgY29udGV4 dCBpcyBkZXRhY2hlZCBmcm9tIHRoZSBmcmFtZSwgb3IgaWYgdGhlIGNvbnRleHQgZG9lc24ndAor ICAgIC8vIGNvcnJlc3BvbmQgdG8gYSBmcmFtZSAoZS5nLiwgd29ya2VycykuCisgICAgV0VCS0lU X0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yQ29udGV4dCh2ODo6SGFuZGxlPHY4OjpDb250 ZXh0Pik7CisjZW5kaWYKKwogICAgIC8vIFJldHVybnMgdGhlIGZyYW1lIGluc2lkZSBhIGdpdmVu IGZyYW1lIG9yIGlmcmFtZSBlbGVtZW50LiBSZXR1cm5zIDAgaWYKICAgICAvLyB0aGUgZ2l2ZW4g ZWxlbWVudCBpcyBub3QgYSBmcmFtZSwgaWZyYW1lIG9yIGlmIHRoZSBmcmFtZSBpcyBlbXB0eS4K ICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJGcmFtZSogZnJvbUZyYW1lT3duZXJFbGVtZW50KGNv bnN0IFdlYkVsZW1lbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUlt cGwuY3BwCmluZGV4IDljNWUwNWY1YzBkNmU4MzQ4ZTkwMGE3YTkzZDUxZDQxMzc5N2ZiZWMuLmE5 NmJiMGI2ZGY0NTFjZTc1ZmJmNzhmMGVlZWEzMzZlNmRlNGExZmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNDczLDYgKzQ3MywxMyBAQCBXZWJG cmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ3VycmVudENvbnRleHQoKQogICAgIHJldHVybiBXZWJG cmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7CiB9CiAKKyNpZiBXRUJLSVRfVVNJTkdfVjgKK1dl YkZyYW1lKiBXZWJGcmFtZTo6ZnJhbWVGb3JDb250ZXh0KHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+ IGNvbnRleHQpCit7CisgICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKFY4UHJveHk6 OnJldHJpZXZlRnJhbWUoY29udGV4dCkpOworfQorI2VuZGlmCisKIFdlYkZyYW1lKiBXZWJGcmFt ZTo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGNvbnN0IFdlYkVsZW1lbnQmIGVsZW1lbnQpCiB7CiAg ICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IDg5MWZhODM4ZDM1 YTgxM2NlMTI2MDgzMDlmYWEyOWJiYzczZjhlNWIuLjIzZmM2MzkzYmNmY2Y0YmY5MmMzNGU3MmFh NTc0YzdkY2IzNzRhYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv V2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZy YW1lVGVzdC5jcHAKQEAgLTM1LDExICszNSwxMyBAQAogI2luY2x1ZGUgPHdlYmtpdC9zdXBwb3J0 L3dlYmtpdF9zdXBwb3J0Lmg+CiAjaW5jbHVkZSAiV2ViRnJhbWUuaCIKICNpbmNsdWRlICJXZWJG cmFtZUNsaWVudC5oIgorI2luY2x1ZGUgIldlYlNldHRpbmdzLmgiCiAjaW5jbHVkZSAiV2ViU3Ry aW5nLmgiCiAjaW5jbHVkZSAiV2ViVVJMLmgiCiAjaW5jbHVkZSAiV2ViVVJMUmVxdWVzdC5oIgog I2luY2x1ZGUgIldlYlVSTFJlc3BvbnNlLmgiCiAjaW5jbHVkZSAiV2ViVmlldy5oIgorI2luY2x1 ZGUgInY4LmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTQ3LDI1ICs0OSw0NCBA QCBuYW1lc3BhY2UgewogCiBjbGFzcyBXZWJGcmFtZVRlc3QgOiBwdWJsaWMgdGVzdGluZzo6VGVz dCB7CiBwdWJsaWM6Ci0gICAgV2ViRnJhbWVUZXN0KCkge30KKyAgICBXZWJGcmFtZVRlc3QoKQor ICAgICAgICA6IGJhc2VVUkwoImh0dHA6Ly93d3cudGVzdC5jb20vIikKKyAgICB7CisgICAgfQog CiAgICAgdmlydHVhbCB2b2lkIFRlYXJEb3duKCkKICAgICB7CiAgICAgICAgIHdlYmtpdF9zdXBw b3J0OjpVbnJlZ2lzdGVyQWxsTW9ja2VkVVJMcygpOwogICAgIH0KIAotICAgIHZvaWQgcmVnaXN0 ZXJNb2NrZWRVUkxMb2FkKGNvbnN0IFdlYlVSTCYgdXJsLCBjb25zdCBXZWJVUkxSZXNwb25zZSYg cmVzcG9uc2UsIGNvbnN0IFdlYlN0cmluZyYgZmlsZU5hbWUpCisgICAgdm9pZCByZWdpc3Rlck1v Y2tlZFVSTExvYWQoY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKQogICAgIHsKKyAgICAgICAg V2ViVVJMUmVzcG9uc2UgcmVzcG9uc2U7CisgICAgICAgIHJlc3BvbnNlLmluaXRpYWxpemUoKTsK KyAgICAgICAgcmVzcG9uc2Uuc2V0TUlNRVR5cGUoInRleHQvaHRtbCIpOworCiAgICAgICAgIHN0 ZDo6c3RyaW5nIGZpbGVQYXRoID0gd2Via2l0X3N1cHBvcnQ6OkdldFdlYktpdFJvb3REaXIoKS51 dGY4KCk7Ci0gICAgICAgIGZpbGVQYXRoLmFwcGVuZCgiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v dGVzdHMvZGF0YS8iKTsKLSAgICAgICAgZmlsZVBhdGguYXBwZW5kKGZpbGVOYW1lLnV0ZjgoKSk7 Ci0gICAgICAgIHdlYmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTCh1cmwsIHJlc3BvbnNl LCBXZWJTdHJpbmc6OmZyb21VVEY4KGZpbGVQYXRoKSk7CisgICAgICAgIGZpbGVQYXRoICs9ICIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhLyI7CisgICAgICAgIGZpbGVQYXRoICs9 IGZpbGVOYW1lOworCisgICAgICAgIHdlYmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTChX ZWJVUkwoR1VSTChiYXNlVVJMICsgZmlsZU5hbWUpKSwgcmVzcG9uc2UsIFdlYlN0cmluZzo6ZnJv bVVURjgoZmlsZVBhdGgpKTsKICAgICB9CiAKICAgICB2b2lkIHNlcnZlUmVxdWVzdHMoKQogICAg IHsKICAgICAgICAgd2Via2l0X3N1cHBvcnQ6OlNlcnZlQXN5bmNocm9ub3VzTW9ja2VkUmVxdWVz dHMoKTsKICAgICB9CisKKyAgICB2b2lkIGxvYWRGcmFtZShXZWJGcmFtZSogZnJhbWUsIGNvbnN0 IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkKKyAgICB7CisgICAgICAgIFdlYlVSTFJlcXVlc3QgdXJs UmVxdWVzdDsKKyAgICAgICAgdXJsUmVxdWVzdC5pbml0aWFsaXplKCk7CisgICAgICAgIHVybFJl cXVlc3Quc2V0VVJMKFdlYlVSTChHVVJMKGJhc2VVUkwgKyBmaWxlTmFtZSkpKTsKKyAgICAgICAg ZnJhbWUtPmxvYWRSZXF1ZXN0KHVybFJlcXVlc3QpOworICAgIH0KKworcHJvdGVjdGVkOgorICAg IHN0ZDo6c3RyaW5nIGJhc2VVUkw7CiB9OwogCiBjbGFzcyBUZXN0V2ViRnJhbWVDbGllbnQgOiBw dWJsaWMgV2ViRnJhbWVDbGllbnQgewpAQCAtNzMsMzEgKzk0LDE3IEBAIGNsYXNzIFRlc3RXZWJG cmFtZUNsaWVudCA6IHB1YmxpYyBXZWJGcmFtZUNsaWVudCB7CiAKIFRFU1RfRihXZWJGcmFtZVRl c3QsIENvbnRlbnRUZXh0KQogewotICAgIC8vIFJlZ2lzdGVyIG91ciByZXNvdXJjZXMuCi0gICAg V2ViVVJMUmVzcG9uc2UgcmVzcG9uc2U7Ci0gICAgcmVzcG9uc2UuaW5pdGlhbGl6ZSgpOwotICAg IHJlc3BvbnNlLnNldE1JTUVUeXBlKCJ0ZXh0L2h0bWwiKTsKLSAgICBzdGQ6OnN0cmluZyByb290 VVJMID0gImh0dHA6Ly93d3cudGVzdC5jb20vIjsKLSAgICBjb25zdCBjaGFyKiBmaWxlc1tdID0g eyAiaWZyYW1lc190ZXN0Lmh0bWwiLCAidmlzaWJsZV9pZnJhbWUuaHRtbCIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgImludmlzaWJsZV9pZnJhbWUuaHRtbCIsICJ6ZXJvX3NpemVkX2lm cmFtZS5odG1sIiB9OwotICAgIGZvciAoaW50IGkgPSAwOyBpIDwgKHNpemVvZihmaWxlcykgLyBz aXplb2YoY2hhciopKTsgKytpKSB7Ci0gICAgICAgIFdlYlVSTCB3ZWJVUkwgPSBHVVJMKHJvb3RV UkwgKyBmaWxlc1tpXSk7Ci0gICAgICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCh3ZWJVUkwsIHJl c3BvbnNlLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZpbGVzW2ldKSk7Ci0gICAgfQorICAgIHJlZ2lz dGVyTW9ja2VkVVJMTG9hZCgiaWZyYW1lc190ZXN0Lmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tl ZFVSTExvYWQoInZpc2libGVfaWZyYW1lLmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExv YWQoImludmlzaWJsZV9pZnJhbWUuaHRtbCIpOworICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgi emVyb19zaXplZF9pZnJhbWUuaHRtbCIpOwogCi0gICAgLy8gQ3JlYXRlIGFuZCBpbml0aWFsaXpl IHRoZSBXZWJWaWV3LiAgICAKKyAgICAvLyBDcmVhdGUgYW5kIGluaXRpYWxpemUgdGhlIFdlYlZp ZXcuCiAgICAgVGVzdFdlYkZyYW1lQ2xpZW50IHdlYkZyYW1lQ2xpZW50OwogICAgIFdlYlZpZXcq IHdlYlZpZXcgPSBXZWJWaWV3OjpjcmVhdGUoMCk7CiAgICAgd2ViVmlldy0+aW5pdGlhbGl6ZU1h aW5GcmFtZSgmd2ViRnJhbWVDbGllbnQpOwogCi0gICAgLy8gTG9hZCB0aGUgbWFpbiBmcmFtZSBV UkwuCi0gICAgV2ViVVJMIHRlc3RVUkwoR1VSTChyb290VVJMICsgZmlsZXNbMF0pKTsKLSAgICBX ZWJVUkxSZXF1ZXN0IHVybFJlcXVlc3Q7Ci0gICAgdXJsUmVxdWVzdC5pbml0aWFsaXplKCk7Ci0g ICAgdXJsUmVxdWVzdC5zZXRVUkwodGVzdFVSTCk7Ci0gICAgd2ViVmlldy0+bWFpbkZyYW1lKCkt PmxvYWRSZXF1ZXN0KHVybFJlcXVlc3QpOwotCi0gICAgLy8gTG9hZCBhbGwgcGVuZGluZyBhc3lu Y2hyb25vdXMgcmVxdWVzdHMuCisgICAgbG9hZEZyYW1lKHdlYlZpZXctPm1haW5GcmFtZSgpLCAi aWZyYW1lc190ZXN0Lmh0bWwiKTsKICAgICBzZXJ2ZVJlcXVlc3RzKCk7CiAKICAgICAvLyBOb3cg cmV0cmlldmUgdGhlIGZyYW1lcyB0ZXh0IGFuZCB0ZXN0IGl0IG9ubHkgaW5jbHVkZXMgdmlzaWJs ZSBlbGVtZW50cy4KQEAgLTExMSw0ICsxMTgsMzIgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgQ29u dGVudFRleHQpCiAgICAgd2ViVmlldy0+Y2xvc2UoKTsKIH0KIAorVEVTVF9GKFdlYkZyYW1lVGVz dCwgRnJhbWVGb3JFbnRlcmVkQ29udGV4dCkKK3sKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQo ImlmcmFtZXNfdGVzdC5odG1sIik7CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJ2aXNpYmxl X2lmcmFtZS5odG1sIik7CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJpbnZpc2libGVfaWZy YW1lLmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoInplcm9fc2l6ZWRfaWZyYW1l Lmh0bWwiKTsKKworICAgIC8vIENyZWF0ZSBhbmQgaW5pdGlhbGl6ZSB0aGUgV2ViVmlldy4KKyAg ICBUZXN0V2ViRnJhbWVDbGllbnQgd2ViRnJhbWVDbGllbnQ7CisgICAgV2ViVmlldyogd2ViVmll dyA9IFdlYlZpZXc6OmNyZWF0ZSgwKTsKKyAgICB3ZWJWaWV3LT5zZXR0aW5ncygpLT5zZXRKYXZh U2NyaXB0RW5hYmxlZCh0cnVlKTsKKyAgICB3ZWJWaWV3LT5pbml0aWFsaXplTWFpbkZyYW1lKCZ3 ZWJGcmFtZUNsaWVudCk7CisKKyAgICBsb2FkRnJhbWUod2ViVmlldy0+bWFpbkZyYW1lKCksICJp ZnJhbWVzX3Rlc3QuaHRtbCIpOworICAgIHNlcnZlUmVxdWVzdHMoKTsKKworICAgIHY4OjpMb2Nr ZXIgbG9ja2VyOworICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKKyAgICBFWFBFQ1RfRVEod2Vi Vmlldy0+bWFpbkZyYW1lKCksCisgICAgICAgICAgICAgIFdlYkZyYW1lOjpmcmFtZUZvckNvbnRl eHQoCisgICAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+bWFpbldvcmxkU2Ny aXB0Q29udGV4dCgpKSk7CisgICAgRVhQRUNUX0VRKHdlYlZpZXctPm1haW5GcmFtZSgpLT5maXJz dENoaWxkKCksCisgICAgICAgICAgICAgIFdlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQoCisgICAg ICAgICAgICAgICAgICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+Zmlyc3RDaGlsZCgpLT5tYWluV29y bGRTY3JpcHRDb250ZXh0KCkpKTsKKworICAgIHdlYlZpZXctPmNsb3NlKCk7Cit9CisKIH0K 88883 2011-04-08 15:29:22 -0700 2011-04-08 16:35:42 -0700 Patch bug-58096-20110408152921.patch text/plain 8670 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODMyMjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg ZDI3MDQwZWZmZTVmMjM3NGUzMWFlZjg4MzVhMTE4YTdkMmU5YjBmNS4uNzYwNjI4NTg4YTkwMjc5 ZGM5Y2E0NjQ3NjEzZTdjZGVlNjkzZDUyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wNC0wNyAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZS1sYW5kIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzgz MDA3LiBOZWVkZWQgdG8gbG9jayB2OCBiZWZvcmUgdXNpbmcuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODA5NgorCisgICAgICAgICogV2ViS2l0Lmd5 cDoKKyAgICAgICAgKiBXZWJLaXQuZ3lwaToKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoK KyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWU6OmZyYW1lRm9yQ29udGV4dCk6CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVUZXN0LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVUZXN0OjpXZWJGcmFtZVRlc3QpOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lVGVzdDo6bG9hZEZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6VEVTVF9G KToKKwogMjAxMS0wNC0wNyAgQW5uYSBDYXZlbmRlciAgPGFubmFjY0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwCmluZGV4IDI2M2I0OWU1NDgyNzVkMTFhNmI0Y2MwMjRlZjFiZjVjZmQwOTY0YzcuLjgwMDNl ZDRiYTQ1NTk4ODdmODk1NGZjZWE4OTNlNzU3ODdjOTkxMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dl YktpdC5neXAKQEAgLTgxNSwxMSArODE1LDEwIEBACiAgICAgICAgICAgICAgICAgICAgICdjb25k aXRpb25zJzogWwogICAgICAgICAgICAgICAgICAgICAgICAgWydPUz09IndpbiInLCB7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ3NvdXJjZXMnOiBbCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICMgRklYTUU6IFBvcnQgUG9wdXBNZW51VGVzdCBhbmQgV2ViRnJhbWVUZXN0 IHRvIExpbnV4IGFuZCBNYWMuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgRklY TUU6IFBvcnQgUG9wdXBNZW51VGVzdCB0byBMaW51eCBhbmQgTWFjLgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAndGVzdHMvUG9wdXBNZW51VGVzdC5jcHAnLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAndGVzdHMvVHJhbnNwYXJlbmN5V2luVGVzdC5jcHAnLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAndGVzdHMvVW5pc2NyaWJlSGVscGVyVGVzdC5j cHAnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAndGVzdHMvV2ViRnJhbWVUZXN0 LmNwcCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0ZXN0cy9XZWJQYWdlU2Vy aWFsaXplclRlc3QuY3BwJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdLAogICAgICAg ICAgICAgICAgICAgICAgICAgfV0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC5neXBpIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaQppbmRleCAw MTZjZjFhMWFiYWQzMDQzNzA5YzI4ZTA2YTE4ZjEzMWJkNzU2MTRmLi44ODEwMWEzMWU4ZGFjZjIy ZTA5NGJiOWZmMzJjMDBhY2FjNjFmMWE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL1dlYktpdC5neXBpCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cGkK QEAgLTY0LDYgKzY0LDcgQEAKICAgICAgICAgICAgICd0ZXN0cy9UaWxpbmdEYXRhVGVzdC5jcHAn LAogICAgICAgICAgICAgJ3Rlc3RzL1RyZWVUZXN0SGVscGVycy5jcHAnLAogICAgICAgICAgICAg J3Rlc3RzL1RyZWVUZXN0SGVscGVycy5oJywKKyAgICAgICAgICAgICd0ZXN0cy9XZWJGcmFtZVRl c3QuY3BwJywKICAgICAgICAgXSwKICAgICB9LAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkZyYW1lLmgKaW5kZXggZDVkMmZmNGQyNWYzMmY3ZTQ2N2QxNjQxYTI0MzhlNTNiYmVk MTc0OS4uMTExMTQyMjQ1ZjAzYmY1OGUyNzMwZTA1MmM5MmZhZDk0YzNiZDM2MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViRnJhbWUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCkBAIC05Nyw2ICs5NywxMyBAQCBwdWJs aWM6CiAgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yRW50ZXJlZENvbnRl eHQoKTsKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJGcmFtZSogZnJhbWVGb3JDdXJyZW50Q29u dGV4dCgpOwogCisjaWYgV0VCS0lUX1VTSU5HX1Y4CisgICAgLy8gUmV0dXJucyB0aGUgZnJhbWUg Y29ycmVzcG9uZGluZyB0byB0aGUgZ2l2ZW4gY29udGV4dC4gVGhpcyBjYW4gcmV0dXJuIDAKKyAg ICAvLyBpZiB0aGUgY29udGV4dCBpcyBkZXRhY2hlZCBmcm9tIHRoZSBmcmFtZSwgb3IgaWYgdGhl IGNvbnRleHQgZG9lc24ndAorICAgIC8vIGNvcnJlc3BvbmQgdG8gYSBmcmFtZSAoZS5nLiwgd29y a2VycykuCisgICAgV0VCS0lUX0FQSSBzdGF0aWMgV2ViRnJhbWUqIGZyYW1lRm9yQ29udGV4dCh2 ODo6SGFuZGxlPHY4OjpDb250ZXh0Pik7CisjZW5kaWYKKwogICAgIC8vIFJldHVybnMgdGhlIGZy YW1lIGluc2lkZSBhIGdpdmVuIGZyYW1lIG9yIGlmcmFtZSBlbGVtZW50LiBSZXR1cm5zIDAgaWYK ICAgICAvLyB0aGUgZ2l2ZW4gZWxlbWVudCBpcyBub3QgYSBmcmFtZSwgaWZyYW1lIG9yIGlmIHRo ZSBmcmFtZSBpcyBlbXB0eS4KICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJGcmFtZSogZnJvbUZy YW1lT3duZXJFbGVtZW50KGNvbnN0IFdlYkVsZW1lbnQmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IDljNWUwNWY1YzBkNmU4MzQ4ZTkwMGE3YTkz ZDUxZDQxMzc5N2ZiZWMuLmE5NmJiMGI2ZGY0NTFjZTc1ZmJmNzhmMGVlZWEzMzZlNmRlNGExZmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtNDcz LDYgKzQ3MywxMyBAQCBXZWJGcmFtZSogV2ViRnJhbWU6OmZyYW1lRm9yQ3VycmVudENvbnRleHQo KQogICAgIHJldHVybiBXZWJGcmFtZUltcGw6OmZyb21GcmFtZShmcmFtZSk7CiB9CiAKKyNpZiBX RUJLSVRfVVNJTkdfVjgKK1dlYkZyYW1lKiBXZWJGcmFtZTo6ZnJhbWVGb3JDb250ZXh0KHY4OjpI YW5kbGU8djg6OkNvbnRleHQ+IGNvbnRleHQpCit7CisgICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6 ZnJvbUZyYW1lKFY4UHJveHk6OnJldHJpZXZlRnJhbWUoY29udGV4dCkpOworfQorI2VuZGlmCisK IFdlYkZyYW1lKiBXZWJGcmFtZTo6ZnJvbUZyYW1lT3duZXJFbGVtZW50KGNvbnN0IFdlYkVsZW1l bnQmIGVsZW1lbnQpCiB7CiAgICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lT3duZXJF bGVtZW50KApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFt ZVRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3Bw CmluZGV4IDg5MWZhODM4ZDM1YTgxM2NlMTI2MDgzMDlmYWEyOWJiYzczZjhlNWIuLjVjNDIwMDI3 YWQzMzI2Mzg2YjVlNjczNDA5YjdkNjdlMzliMjM1MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRl IDx3ZWJraXQvc3VwcG9ydC93ZWJraXRfc3VwcG9ydC5oPgogI2luY2x1ZGUgIldlYkZyYW1lLmgi CiAjaW5jbHVkZSAiV2ViRnJhbWVDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJTZXR0aW5ncy5oIgog I2luY2x1ZGUgIldlYlN0cmluZy5oIgogI2luY2x1ZGUgIldlYlVSTC5oIgogI2luY2x1ZGUgIldl YlVSTFJlcXVlc3QuaCIKQEAgLTQ3LDI1ICs0OCw0NCBAQCBuYW1lc3BhY2UgewogCiBjbGFzcyBX ZWJGcmFtZVRlc3QgOiBwdWJsaWMgdGVzdGluZzo6VGVzdCB7CiBwdWJsaWM6Ci0gICAgV2ViRnJh bWVUZXN0KCkge30KKyAgICBXZWJGcmFtZVRlc3QoKQorICAgICAgICA6IGJhc2VVUkwoImh0dHA6 Ly93d3cudGVzdC5jb20vIikKKyAgICB7CisgICAgfQogCiAgICAgdmlydHVhbCB2b2lkIFRlYXJE b3duKCkKICAgICB7CiAgICAgICAgIHdlYmtpdF9zdXBwb3J0OjpVbnJlZ2lzdGVyQWxsTW9ja2Vk VVJMcygpOwogICAgIH0KIAotICAgIHZvaWQgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKGNvbnN0IFdl YlVSTCYgdXJsLCBjb25zdCBXZWJVUkxSZXNwb25zZSYgcmVzcG9uc2UsIGNvbnN0IFdlYlN0cmlu ZyYgZmlsZU5hbWUpCisgICAgdm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29uc3Qgc3RkOjpz dHJpbmcmIGZpbGVOYW1lKQogICAgIHsKKyAgICAgICAgV2ViVVJMUmVzcG9uc2UgcmVzcG9uc2U7 CisgICAgICAgIHJlc3BvbnNlLmluaXRpYWxpemUoKTsKKyAgICAgICAgcmVzcG9uc2Uuc2V0TUlN RVR5cGUoInRleHQvaHRtbCIpOworCiAgICAgICAgIHN0ZDo6c3RyaW5nIGZpbGVQYXRoID0gd2Vi a2l0X3N1cHBvcnQ6OkdldFdlYktpdFJvb3REaXIoKS51dGY4KCk7Ci0gICAgICAgIGZpbGVQYXRo LmFwcGVuZCgiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS8iKTsKLSAgICAgICAg ZmlsZVBhdGguYXBwZW5kKGZpbGVOYW1lLnV0ZjgoKSk7Ci0gICAgICAgIHdlYmtpdF9zdXBwb3J0 OjpSZWdpc3Rlck1vY2tlZFVSTCh1cmwsIHJlc3BvbnNlLCBXZWJTdHJpbmc6OmZyb21VVEY4KGZp bGVQYXRoKSk7CisgICAgICAgIGZpbGVQYXRoICs9ICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9kYXRhLyI7CisgICAgICAgIGZpbGVQYXRoICs9IGZpbGVOYW1lOworCisgICAgICAgIHdl YmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTChXZWJVUkwoR1VSTChiYXNlVVJMICsgZmls ZU5hbWUpKSwgcmVzcG9uc2UsIFdlYlN0cmluZzo6ZnJvbVVURjgoZmlsZVBhdGgpKTsKICAgICB9 CiAKICAgICB2b2lkIHNlcnZlUmVxdWVzdHMoKQogICAgIHsKICAgICAgICAgd2Via2l0X3N1cHBv cnQ6OlNlcnZlQXN5bmNocm9ub3VzTW9ja2VkUmVxdWVzdHMoKTsKICAgICB9CisKKyAgICB2b2lk IGxvYWRGcmFtZShXZWJGcmFtZSogZnJhbWUsIGNvbnN0IHN0ZDo6c3RyaW5nJiBmaWxlTmFtZSkK KyAgICB7CisgICAgICAgIFdlYlVSTFJlcXVlc3QgdXJsUmVxdWVzdDsKKyAgICAgICAgdXJsUmVx dWVzdC5pbml0aWFsaXplKCk7CisgICAgICAgIHVybFJlcXVlc3Quc2V0VVJMKFdlYlVSTChHVVJM KGJhc2VVUkwgKyBmaWxlTmFtZSkpKTsKKyAgICAgICAgZnJhbWUtPmxvYWRSZXF1ZXN0KHVybFJl cXVlc3QpOworICAgIH0KKworcHJvdGVjdGVkOgorICAgIHN0ZDo6c3RyaW5nIGJhc2VVUkw7CiB9 OwogCiBjbGFzcyBUZXN0V2ViRnJhbWVDbGllbnQgOiBwdWJsaWMgV2ViRnJhbWVDbGllbnQgewpA QCAtNzMsMzEgKzkzLDE3IEBAIGNsYXNzIFRlc3RXZWJGcmFtZUNsaWVudCA6IHB1YmxpYyBXZWJG cmFtZUNsaWVudCB7CiAKIFRFU1RfRihXZWJGcmFtZVRlc3QsIENvbnRlbnRUZXh0KQogewotICAg IC8vIFJlZ2lzdGVyIG91ciByZXNvdXJjZXMuCi0gICAgV2ViVVJMUmVzcG9uc2UgcmVzcG9uc2U7 Ci0gICAgcmVzcG9uc2UuaW5pdGlhbGl6ZSgpOwotICAgIHJlc3BvbnNlLnNldE1JTUVUeXBlKCJ0 ZXh0L2h0bWwiKTsKLSAgICBzdGQ6OnN0cmluZyByb290VVJMID0gImh0dHA6Ly93d3cudGVzdC5j b20vIjsKLSAgICBjb25zdCBjaGFyKiBmaWxlc1tdID0geyAiaWZyYW1lc190ZXN0Lmh0bWwiLCAi dmlzaWJsZV9pZnJhbWUuaHRtbCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgImludmlz aWJsZV9pZnJhbWUuaHRtbCIsICJ6ZXJvX3NpemVkX2lmcmFtZS5odG1sIiB9OwotICAgIGZvciAo aW50IGkgPSAwOyBpIDwgKHNpemVvZihmaWxlcykgLyBzaXplb2YoY2hhciopKTsgKytpKSB7Ci0g ICAgICAgIFdlYlVSTCB3ZWJVUkwgPSBHVVJMKHJvb3RVUkwgKyBmaWxlc1tpXSk7Ci0gICAgICAg IHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCh3ZWJVUkwsIHJlc3BvbnNlLCBXZWJTdHJpbmc6OmZyb21V VEY4KGZpbGVzW2ldKSk7Ci0gICAgfQorICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgiaWZyYW1l c190ZXN0Lmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoInZpc2libGVfaWZyYW1l Lmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoImludmlzaWJsZV9pZnJhbWUuaHRt bCIpOworICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgiemVyb19zaXplZF9pZnJhbWUuaHRtbCIp OwogCi0gICAgLy8gQ3JlYXRlIGFuZCBpbml0aWFsaXplIHRoZSBXZWJWaWV3LiAgICAKKyAgICAv LyBDcmVhdGUgYW5kIGluaXRpYWxpemUgdGhlIFdlYlZpZXcuCiAgICAgVGVzdFdlYkZyYW1lQ2xp ZW50IHdlYkZyYW1lQ2xpZW50OwogICAgIFdlYlZpZXcqIHdlYlZpZXcgPSBXZWJWaWV3OjpjcmVh dGUoMCk7CiAgICAgd2ViVmlldy0+aW5pdGlhbGl6ZU1haW5GcmFtZSgmd2ViRnJhbWVDbGllbnQp OwogCi0gICAgLy8gTG9hZCB0aGUgbWFpbiBmcmFtZSBVUkwuCi0gICAgV2ViVVJMIHRlc3RVUkwo R1VSTChyb290VVJMICsgZmlsZXNbMF0pKTsKLSAgICBXZWJVUkxSZXF1ZXN0IHVybFJlcXVlc3Q7 Ci0gICAgdXJsUmVxdWVzdC5pbml0aWFsaXplKCk7Ci0gICAgdXJsUmVxdWVzdC5zZXRVUkwodGVz dFVSTCk7Ci0gICAgd2ViVmlldy0+bWFpbkZyYW1lKCktPmxvYWRSZXF1ZXN0KHVybFJlcXVlc3Qp OwotCi0gICAgLy8gTG9hZCBhbGwgcGVuZGluZyBhc3luY2hyb25vdXMgcmVxdWVzdHMuCisgICAg bG9hZEZyYW1lKHdlYlZpZXctPm1haW5GcmFtZSgpLCAiaWZyYW1lc190ZXN0Lmh0bWwiKTsKICAg ICBzZXJ2ZVJlcXVlc3RzKCk7CiAKICAgICAvLyBOb3cgcmV0cmlldmUgdGhlIGZyYW1lcyB0ZXh0 IGFuZCB0ZXN0IGl0IG9ubHkgaW5jbHVkZXMgdmlzaWJsZSBlbGVtZW50cy4KQEAgLTExMSw0ICsx MTcsMzEgQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwgQ29udGVudFRleHQpCiAgICAgd2ViVmlldy0+ Y2xvc2UoKTsKIH0KIAorVEVTVF9GKFdlYkZyYW1lVGVzdCwgRnJhbWVGb3JFbnRlcmVkQ29udGV4 dCkKK3sKKyAgICByZWdpc3Rlck1vY2tlZFVSTExvYWQoImlmcmFtZXNfdGVzdC5odG1sIik7Cisg ICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJ2aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAgcmVn aXN0ZXJNb2NrZWRVUkxMb2FkKCJpbnZpc2libGVfaWZyYW1lLmh0bWwiKTsKKyAgICByZWdpc3Rl ck1vY2tlZFVSTExvYWQoInplcm9fc2l6ZWRfaWZyYW1lLmh0bWwiKTsKKworICAgIC8vIENyZWF0 ZSBhbmQgaW5pdGlhbGl6ZSB0aGUgV2ViVmlldy4KKyAgICBUZXN0V2ViRnJhbWVDbGllbnQgd2Vi RnJhbWVDbGllbnQ7CisgICAgV2ViVmlldyogd2ViVmlldyA9IFdlYlZpZXc6OmNyZWF0ZSgwKTsK KyAgICB3ZWJWaWV3LT5zZXR0aW5ncygpLT5zZXRKYXZhU2NyaXB0RW5hYmxlZCh0cnVlKTsKKyAg ICB3ZWJWaWV3LT5pbml0aWFsaXplTWFpbkZyYW1lKCZ3ZWJGcmFtZUNsaWVudCk7CisKKyAgICBs b2FkRnJhbWUod2ViVmlldy0+bWFpbkZyYW1lKCksICJpZnJhbWVzX3Rlc3QuaHRtbCIpOworICAg IHNlcnZlUmVxdWVzdHMoKTsKKworICAgIHY4OjpIYW5kbGVTY29wZSBzY29wZTsKKyAgICBFWFBF Q1RfRVEod2ViVmlldy0+bWFpbkZyYW1lKCksCisgICAgICAgICAgICAgIFdlYkZyYW1lOjpmcmFt ZUZvckNvbnRleHQoCisgICAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+bWFp bldvcmxkU2NyaXB0Q29udGV4dCgpKSk7CisgICAgRVhQRUNUX0VRKHdlYlZpZXctPm1haW5GcmFt ZSgpLT5maXJzdENoaWxkKCksCisgICAgICAgICAgICAgIFdlYkZyYW1lOjpmcmFtZUZvckNvbnRl eHQoCisgICAgICAgICAgICAgICAgICB3ZWJWaWV3LT5tYWluRnJhbWUoKS0+Zmlyc3RDaGlsZCgp LT5tYWluV29ybGRTY3JpcHRDb250ZXh0KCkpKTsKKworICAgIHdlYlZpZXctPmNsb3NlKCk7Cit9 CisKIH0K 88893 2011-04-08 16:35:45 -0700 2011-04-08 16:50:55 -0700 Patch bug-58096-20110408163543.patch text/plain 8768 aa U3VidmVyc2lvbiBSZXZpc2lvbjogODMzNTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg OWExZTRiMGRiMDU1NjkxZjUzMTdlNzAwZjY3M2QxMTRmN2M0NjMzMy4uMzBhZTkzYTNjOTdjMDBl MTA0MDRkOGM2Y2U1MzcwOGQ1ZDk0YjI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wNC0wNyAgQWFyb24gQm9vZG1hbiAgPGFhQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZS1sYW5kIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzgz MDA3LiBOZWVkZWQgdG8gbG9jayB2OCBiZWZvcmUgdXNpbmcuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODA5NgorCisgICAgICAgICogV2ViS2l0Lmd5 cDoKKyAgICAgICAgKiBXZWJLaXQuZ3lwaToKKyAgICAgICAgKiBwdWJsaWMvV2ViRnJhbWUuaDoK KyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJh bWU6OmZyYW1lRm9yQ29udGV4dCk6CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVUZXN0LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVUZXN0OjpXZWJGcmFtZVRlc3QpOgorICAgICAgICAo V2ViS2l0OjpXZWJGcmFtZVRlc3Q6OnJlZ2lzdGVyTW9ja2VkVVJMTG9hZCk6CisgICAgICAgIChX ZWJLaXQ6OldlYkZyYW1lVGVzdDo6bG9hZEZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6VEVTVF9G KToKKwogMjAxMS0wNC0wOCAgRGFuaWVsIENoZW5nICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEbWl0cnkgVGl0b3YuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5n eXAKaW5kZXggMjMxNmRmZTZmNjkyNWE4ZWYwZWM3YTViM2E5OTI1NTRjNDFlYzU2Yy4uNmIyZDM5 ODAyMjFmY2ZlYWYyZDUxOGU3MmEyYjFkMDk4YTEyYTQ5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2Vi S2l0Lmd5cApAQCAtODI0LDExICs4MjQsMTAgQEAKICAgICAgICAgICAgICAgICAgICAgJ2NvbmRp dGlvbnMnOiBbCiAgICAgICAgICAgICAgICAgICAgICAgICBbJ09TPT0id2luIicsIHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnc291cmNlcyc6IFsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIyBGSVhNRTogUG9ydCBQb3B1cE1lbnVUZXN0IGFuZCBXZWJGcmFtZVRlc3Qg dG8gTGludXggYW5kIE1hYy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyBGSVhN RTogUG9ydCBQb3B1cE1lbnVUZXN0IHRvIExpbnV4IGFuZCBNYWMuCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICd0ZXN0cy9Qb3B1cE1lbnVUZXN0LmNwcCcsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICd0ZXN0cy9UcmFuc3BhcmVuY3lXaW5UZXN0LmNwcCcsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0ZXN0cy9VbmlzY3JpYmVIZWxwZXJUZXN0LmNw cCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0ZXN0cy9XZWJGcmFtZVRlc3Qu Y3BwJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Rlc3RzL1dlYlBhZ2VTZXJp YWxpemVyVGVzdC5jcHAnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAg ICAgICAgICAgICAgICAgICB9XSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v V2ViS2l0Lmd5cGkgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXBpCmluZGV4IDMw NjgzZWY3MzQyMDVhZDdjMWVmMmZhMmYxMWQzZTZiZjM2YWIwMDMuLmMyM2M5ZWRjYjQ2ODJjYjA0 MGVjMzY3ZjM3YjVlYTg5ZjcxOWI3MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vV2ViS2l0Lmd5cGkKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwaQpA QCAtNjYsNiArNjYsNyBAQAogICAgICAgICAgICAgJ3Rlc3RzL1RpbGluZ0RhdGFUZXN0LmNwcCcs CiAgICAgICAgICAgICAndGVzdHMvVHJlZVRlc3RIZWxwZXJzLmNwcCcsCiAgICAgICAgICAgICAn dGVzdHMvVHJlZVRlc3RIZWxwZXJzLmgnLAorICAgICAgICAgICAgJ3Rlc3RzL1dlYkZyYW1lVGVz dC5jcHAnLAogICAgICAgICBdLAogICAgIH0sCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRnJhbWUuaAppbmRleCA5MzRjZjA4MGZlMGJhZWE0NjVjYjQxZjZjMTc5YTlkZDg5MDgy ZDJhLi4xZDRiNmEyODg5MjIxZGYyZjQ1MDYwZWU4YmYzZTM3ODJiNjc1NjMyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJGcmFtZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkZyYW1lLmgKQEAgLTk4LDYgKzk4LDEzIEBAIHB1Ymxp YzoKICAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJGcmFtZSogZnJhbWVGb3JFbnRlcmVkQ29udGV4 dCgpOwogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcmFtZUZvckN1cnJlbnRDb250 ZXh0KCk7CiAKKyNpZiBXRUJLSVRfVVNJTkdfVjgKKyAgICAvLyBSZXR1cm5zIHRoZSBmcmFtZSBj b3JyZXNwb25kaW5nIHRvIHRoZSBnaXZlbiBjb250ZXh0LiBUaGlzIGNhbiByZXR1cm4gMAorICAg IC8vIGlmIHRoZSBjb250ZXh0IGlzIGRldGFjaGVkIGZyb20gdGhlIGZyYW1lLCBvciBpZiB0aGUg Y29udGV4dCBkb2Vzbid0CisgICAgLy8gY29ycmVzcG9uZCB0byBhIGZyYW1lIChlLmcuLCB3b3Jr ZXJzKS4KKyAgICBXRUJLSVRfQVBJIHN0YXRpYyBXZWJGcmFtZSogZnJhbWVGb3JDb250ZXh0KHY4 OjpIYW5kbGU8djg6OkNvbnRleHQ+KTsKKyNlbmRpZgorCiAgICAgLy8gUmV0dXJucyB0aGUgZnJh bWUgaW5zaWRlIGEgZ2l2ZW4gZnJhbWUgb3IgaWZyYW1lIGVsZW1lbnQuIFJldHVybnMgMCBpZgog ICAgIC8vIHRoZSBnaXZlbiBlbGVtZW50IGlzIG5vdCBhIGZyYW1lLCBpZnJhbWUgb3IgaWYgdGhl IGZyYW1lIGlzIGVtcHR5LgogICAgIFdFQktJVF9BUEkgc3RhdGljIFdlYkZyYW1lKiBmcm9tRnJh bWVPd25lckVsZW1lbnQoY29uc3QgV2ViRWxlbWVudCYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKaW5kZXggMTRkYjk3NDkxOWFiOTE3OWNkZDdiNGU0ZTM1 MzU3YjYwMDc5MzY5MS4uZTkwNzUwM2RmODFjNDFmMmEzYTlkNmUzZjc2YTE4MTU5Mzk4NWFmMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCkBAIC00NzYs NiArNDc2LDEzIEBAIFdlYkZyYW1lKiBXZWJGcmFtZTo6ZnJhbWVGb3JDdXJyZW50Q29udGV4dCgp CiAgICAgcmV0dXJuIFdlYkZyYW1lSW1wbDo6ZnJvbUZyYW1lKGZyYW1lKTsKIH0KIAorI2lmIFdF QktJVF9VU0lOR19WOAorV2ViRnJhbWUqIFdlYkZyYW1lOjpmcmFtZUZvckNvbnRleHQodjg6Okhh bmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCkKK3sKKyAgICByZXR1cm4gV2ViRnJhbWVJbXBsOjpm cm9tRnJhbWUoVjhQcm94eTo6cmV0cmlldmVGcmFtZShjb250ZXh0KSk7Cit9CisjZW5kaWYKKwog V2ViRnJhbWUqIFdlYkZyYW1lOjpmcm9tRnJhbWVPd25lckVsZW1lbnQoY29uc3QgV2ViRWxlbWVu dCYgZWxlbWVudCkKIHsKICAgICByZXR1cm4gV2ViRnJhbWVJbXBsOjpmcm9tRnJhbWVPd25lckVs ZW1lbnQoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1l VGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkZyYW1lVGVzdC5jcHAK aW5kZXggODkxZmE4MzhkMzVhODEzY2UxMjYwODMwOWZhYTI5YmJjNzNmOGU1Yi4uYjM4ZDU0NDU5 YTQwZjRiN2Y3YTZhNzFmZjZhNmUwZTgzYjAzZDU2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvV2ViRnJhbWVUZXN0LmNwcApAQCAtMzUsMTEgKzM1LDEzIEBACiAjaW5jbHVk ZSA8d2Via2l0L3N1cHBvcnQvd2Via2l0X3N1cHBvcnQuaD4KICNpbmNsdWRlICJXZWJGcmFtZS5o IgogI2luY2x1ZGUgIldlYkZyYW1lQ2xpZW50LmgiCisjaW5jbHVkZSAiV2ViU2V0dGluZ3MuaCIK ICNpbmNsdWRlICJXZWJTdHJpbmcuaCIKICNpbmNsdWRlICJXZWJVUkwuaCIKICNpbmNsdWRlICJX ZWJVUkxSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiV2ViVVJMUmVzcG9uc2UuaCIKICNpbmNsdWRlICJX ZWJWaWV3LmgiCisjaW5jbHVkZSAidjguaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIApA QCAtNDcsMjUgKzQ5LDQ0IEBAIG5hbWVzcGFjZSB7CiAKIGNsYXNzIFdlYkZyYW1lVGVzdCA6IHB1 YmxpYyB0ZXN0aW5nOjpUZXN0IHsKIHB1YmxpYzoKLSAgICBXZWJGcmFtZVRlc3QoKSB7fQorICAg IFdlYkZyYW1lVGVzdCgpCisgICAgICAgIDogYmFzZVVSTCgiaHR0cDovL3d3dy50ZXN0LmNvbS8i KQorICAgIHsKKyAgICB9CiAKICAgICB2aXJ0dWFsIHZvaWQgVGVhckRvd24oKQogICAgIHsKICAg ICAgICAgd2Via2l0X3N1cHBvcnQ6OlVucmVnaXN0ZXJBbGxNb2NrZWRVUkxzKCk7CiAgICAgfQog Ci0gICAgdm9pZCByZWdpc3Rlck1vY2tlZFVSTExvYWQoY29uc3QgV2ViVVJMJiB1cmwsIGNvbnN0 IFdlYlVSTFJlc3BvbnNlJiByZXNwb25zZSwgY29uc3QgV2ViU3RyaW5nJiBmaWxlTmFtZSkKKyAg ICB2b2lkIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZChjb25zdCBzdGQ6OnN0cmluZyYgZmlsZU5hbWUp CiAgICAgeworICAgICAgICBXZWJVUkxSZXNwb25zZSByZXNwb25zZTsKKyAgICAgICAgcmVzcG9u c2UuaW5pdGlhbGl6ZSgpOworICAgICAgICByZXNwb25zZS5zZXRNSU1FVHlwZSgidGV4dC9odG1s Iik7CisKICAgICAgICAgc3RkOjpzdHJpbmcgZmlsZVBhdGggPSB3ZWJraXRfc3VwcG9ydDo6R2V0 V2ViS2l0Um9vdERpcigpLnV0ZjgoKTsKLSAgICAgICAgZmlsZVBhdGguYXBwZW5kKCIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9kYXRhLyIpOwotICAgICAgICBmaWxlUGF0aC5hcHBlbmQo ZmlsZU5hbWUudXRmOCgpKTsKLSAgICAgICAgd2Via2l0X3N1cHBvcnQ6OlJlZ2lzdGVyTW9ja2Vk VVJMKHVybCwgcmVzcG9uc2UsIFdlYlN0cmluZzo6ZnJvbVVURjgoZmlsZVBhdGgpKTsKKyAgICAg ICAgZmlsZVBhdGggKz0gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvIjsKKyAg ICAgICAgZmlsZVBhdGggKz0gZmlsZU5hbWU7CisKKyAgICAgICAgd2Via2l0X3N1cHBvcnQ6OlJl Z2lzdGVyTW9ja2VkVVJMKFdlYlVSTChHVVJMKGJhc2VVUkwgKyBmaWxlTmFtZSkpLCByZXNwb25z ZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChmaWxlUGF0aCkpOwogICAgIH0KIAogICAgIHZvaWQgc2Vy dmVSZXF1ZXN0cygpCiAgICAgewogICAgICAgICB3ZWJraXRfc3VwcG9ydDo6U2VydmVBc3luY2hy b25vdXNNb2NrZWRSZXF1ZXN0cygpOwogICAgIH0KKworICAgIHZvaWQgbG9hZEZyYW1lKFdlYkZy YW1lKiBmcmFtZSwgY29uc3Qgc3RkOjpzdHJpbmcmIGZpbGVOYW1lKQorICAgIHsKKyAgICAgICAg V2ViVVJMUmVxdWVzdCB1cmxSZXF1ZXN0OworICAgICAgICB1cmxSZXF1ZXN0LmluaXRpYWxpemUo KTsKKyAgICAgICAgdXJsUmVxdWVzdC5zZXRVUkwoV2ViVVJMKEdVUkwoYmFzZVVSTCArIGZpbGVO YW1lKSkpOworICAgICAgICBmcmFtZS0+bG9hZFJlcXVlc3QodXJsUmVxdWVzdCk7CisgICAgfQor Citwcm90ZWN0ZWQ6CisgICAgc3RkOjpzdHJpbmcgYmFzZVVSTDsKIH07CiAKIGNsYXNzIFRlc3RX ZWJGcmFtZUNsaWVudCA6IHB1YmxpYyBXZWJGcmFtZUNsaWVudCB7CkBAIC03MywzMSArOTQsMTcg QEAgY2xhc3MgVGVzdFdlYkZyYW1lQ2xpZW50IDogcHVibGljIFdlYkZyYW1lQ2xpZW50IHsKIAog VEVTVF9GKFdlYkZyYW1lVGVzdCwgQ29udGVudFRleHQpCiB7Ci0gICAgLy8gUmVnaXN0ZXIgb3Vy IHJlc291cmNlcy4KLSAgICBXZWJVUkxSZXNwb25zZSByZXNwb25zZTsKLSAgICByZXNwb25zZS5p bml0aWFsaXplKCk7Ci0gICAgcmVzcG9uc2Uuc2V0TUlNRVR5cGUoInRleHQvaHRtbCIpOwotICAg IHN0ZDo6c3RyaW5nIHJvb3RVUkwgPSAiaHR0cDovL3d3dy50ZXN0LmNvbS8iOwotICAgIGNvbnN0 IGNoYXIqIGZpbGVzW10gPSB7ICJpZnJhbWVzX3Rlc3QuaHRtbCIsICJ2aXNpYmxlX2lmcmFtZS5o dG1sIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaW52aXNpYmxlX2lmcmFtZS5odG1s IiwgInplcm9fc2l6ZWRfaWZyYW1lLmh0bWwiIH07Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCAo c2l6ZW9mKGZpbGVzKSAvIHNpemVvZihjaGFyKikpOyArK2kpIHsKLSAgICAgICAgV2ViVVJMIHdl YlVSTCA9IEdVUkwocm9vdFVSTCArIGZpbGVzW2ldKTsKLSAgICAgICAgcmVnaXN0ZXJNb2NrZWRV UkxMb2FkKHdlYlVSTCwgcmVzcG9uc2UsIFdlYlN0cmluZzo6ZnJvbVVURjgoZmlsZXNbaV0pKTsK LSAgICB9CisgICAgcmVnaXN0ZXJNb2NrZWRVUkxMb2FkKCJpZnJhbWVzX3Rlc3QuaHRtbCIpOwor ICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgidmlzaWJsZV9pZnJhbWUuaHRtbCIpOworICAgIHJl Z2lzdGVyTW9ja2VkVVJMTG9hZCgiaW52aXNpYmxlX2lmcmFtZS5odG1sIik7CisgICAgcmVnaXN0 ZXJNb2NrZWRVUkxMb2FkKCJ6ZXJvX3NpemVkX2lmcmFtZS5odG1sIik7CiAKLSAgICAvLyBDcmVh dGUgYW5kIGluaXRpYWxpemUgdGhlIFdlYlZpZXcuICAgIAorICAgIC8vIENyZWF0ZSBhbmQgaW5p dGlhbGl6ZSB0aGUgV2ViVmlldy4KICAgICBUZXN0V2ViRnJhbWVDbGllbnQgd2ViRnJhbWVDbGll bnQ7CiAgICAgV2ViVmlldyogd2ViVmlldyA9IFdlYlZpZXc6OmNyZWF0ZSgwKTsKICAgICB3ZWJW aWV3LT5pbml0aWFsaXplTWFpbkZyYW1lKCZ3ZWJGcmFtZUNsaWVudCk7CiAKLSAgICAvLyBMb2Fk IHRoZSBtYWluIGZyYW1lIFVSTC4KLSAgICBXZWJVUkwgdGVzdFVSTChHVVJMKHJvb3RVUkwgKyBm aWxlc1swXSkpOwotICAgIFdlYlVSTFJlcXVlc3QgdXJsUmVxdWVzdDsKLSAgICB1cmxSZXF1ZXN0 LmluaXRpYWxpemUoKTsKLSAgICB1cmxSZXF1ZXN0LnNldFVSTCh0ZXN0VVJMKTsKLSAgICB3ZWJW aWV3LT5tYWluRnJhbWUoKS0+bG9hZFJlcXVlc3QodXJsUmVxdWVzdCk7Ci0KLSAgICAvLyBMb2Fk IGFsbCBwZW5kaW5nIGFzeW5jaHJvbm91cyByZXF1ZXN0cy4KKyAgICBsb2FkRnJhbWUod2ViVmll dy0+bWFpbkZyYW1lKCksICJpZnJhbWVzX3Rlc3QuaHRtbCIpOwogICAgIHNlcnZlUmVxdWVzdHMo KTsKIAogICAgIC8vIE5vdyByZXRyaWV2ZSB0aGUgZnJhbWVzIHRleHQgYW5kIHRlc3QgaXQgb25s eSBpbmNsdWRlcyB2aXNpYmxlIGVsZW1lbnRzLgpAQCAtMTExLDQgKzExOCwzMSBAQCBURVNUX0Yo V2ViRnJhbWVUZXN0LCBDb250ZW50VGV4dCkKICAgICB3ZWJWaWV3LT5jbG9zZSgpOwogfQogCitU RVNUX0YoV2ViRnJhbWVUZXN0LCBGcmFtZUZvckVudGVyZWRDb250ZXh0KQoreworICAgIHJlZ2lz dGVyTW9ja2VkVVJMTG9hZCgiaWZyYW1lc190ZXN0Lmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tl ZFVSTExvYWQoInZpc2libGVfaWZyYW1lLmh0bWwiKTsKKyAgICByZWdpc3Rlck1vY2tlZFVSTExv YWQoImludmlzaWJsZV9pZnJhbWUuaHRtbCIpOworICAgIHJlZ2lzdGVyTW9ja2VkVVJMTG9hZCgi emVyb19zaXplZF9pZnJhbWUuaHRtbCIpOworCisgICAgLy8gQ3JlYXRlIGFuZCBpbml0aWFsaXpl IHRoZSBXZWJWaWV3LgorICAgIFRlc3RXZWJGcmFtZUNsaWVudCB3ZWJGcmFtZUNsaWVudDsKKyAg ICBXZWJWaWV3KiB3ZWJWaWV3ID0gV2ViVmlldzo6Y3JlYXRlKDApOworICAgIHdlYlZpZXctPnNl dHRpbmdzKCktPnNldEphdmFTY3JpcHRFbmFibGVkKHRydWUpOworICAgIHdlYlZpZXctPmluaXRp YWxpemVNYWluRnJhbWUoJndlYkZyYW1lQ2xpZW50KTsKKworICAgIGxvYWRGcmFtZSh3ZWJWaWV3 LT5tYWluRnJhbWUoKSwgImlmcmFtZXNfdGVzdC5odG1sIik7CisgICAgc2VydmVSZXF1ZXN0cygp OworCisgICAgdjg6OkhhbmRsZVNjb3BlIHNjb3BlOworICAgIEVYUEVDVF9FUSh3ZWJWaWV3LT5t YWluRnJhbWUoKSwKKyAgICAgICAgICAgICAgV2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4dCgKKyAg ICAgICAgICAgICAgICAgIHdlYlZpZXctPm1haW5GcmFtZSgpLT5tYWluV29ybGRTY3JpcHRDb250 ZXh0KCkpKTsKKyAgICBFWFBFQ1RfRVEod2ViVmlldy0+bWFpbkZyYW1lKCktPmZpcnN0Q2hpbGQo KSwKKyAgICAgICAgICAgICAgV2ViRnJhbWU6OmZyYW1lRm9yQ29udGV4dCgKKyAgICAgICAgICAg ICAgICAgIHdlYlZpZXctPm1haW5GcmFtZSgpLT5maXJzdENoaWxkKCktPm1haW5Xb3JsZFNjcmlw dENvbnRleHQoKSkpOworCisgICAgd2ViVmlldy0+Y2xvc2UoKTsKK30KKwogfQo=