72146 2011-11-11 10:00:12 -0800 [chromium] Remove 2 static initializers and 3 exit time destructors. Turn on -Wexit-time-destructors. 2011-11-11 21:24:29 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thakis thakis cc-bugs jamesr webkit.review.bot oldest_to_newest 500866 0 thakis 2011-11-11 10:00:12 -0800 [chromium] Remove 2 static initializers and 3 exit time destructors. Turn on -Wexit-time-destructors. 500867 1 114721 thakis 2011-11-11 10:01:21 -0800 Created attachment 114721 Patch 500893 2 114721 thakis 2011-11-11 10:28:23 -0800 Comment on attachment 114721 Patch Two more on linux/clang… 500905 3 114727 thakis 2011-11-11 10:38:21 -0800 Created attachment 114727 Patch 501281 4 114727 webkit.review.bot 2011-11-11 18:09:22 -0800 Comment on attachment 114727 Patch Rejecting attachment 114727 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: n/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python tools/clang/scripts/update.py --mac-only' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/10350677 501286 5 114727 jamesr 2011-11-11 18:11:32 -0800 Comment on attachment 114727 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114727&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) can't commit with this puppy 501339 6 114816 thakis 2011-11-11 20:20:49 -0800 Created attachment 114816 Patch 501357 7 114816 webkit.review.bot 2011-11-11 21:24:24 -0800 Comment on attachment 114816 Patch Clearing flags on attachment: 114816 Committed r100070: <http://trac.webkit.org/changeset/100070> 501358 8 webkit.review.bot 2011-11-11 21:24:29 -0800 All reviewed patches have been landed. Closing bug. 114721 2011-11-11 10:01:21 -0800 2011-11-11 10:38:18 -0800 Patch bug-72146-20111111100120.patch text/plain 10833 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5ODMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ZDAwMDllNmI5OTc2MmFh OTAwMWE4ODUwYjBjMzFiNzNmODE0YzQ0Li5mOGZjZGRiMjQ1ZDM3NTg2Y2IzOWEyZGE5ZWM1NmNl ZDg2NmQ3YjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMTEgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3Zl IDIgc3RhdGljIGluaXRpYWxpemVycyBhbmQgMyBleGl0IHRpbWUgZGVzdHJ1Y3RvcnMuIFR1cm4g b24gLVdleGl0LXRpbWUtZGVzdHJ1Y3RvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MjE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogV2Vi Q29yZS5neXAvV2ViQ29yZS5neXA6CisKIDIwMTEtMTEtMTEgIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlaW1wbGVtZW50IERP TSBzZWFyY2ggdXNpbmcgbm8gWFBhdGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDcz NDIzYTU3OWYxMDZlMWYyODE5ODY2Y2FiNDU5YTY5OGE1ZTFjOWYuLjVkZmFlZGIyNTA1MDgyNjQ5 ZjYwYjIxMzliOWU4NmFmNjhmODc0ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTEtMTEtMTEgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIDIgc3RhdGljIGluaXRpYWxpemVycyBhbmQg MyBleGl0IHRpbWUgZGVzdHJ1Y3RvcnMuIFR1cm4gb24gLVdleGl0LXRpbWUtZGVzdHJ1Y3RvcnMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjE0Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0 Lmd5cDoKKyAgICAgICAgKiBzcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpEZWJ1Z2dlckFnZW50TWFuYWdlcjo6ZGVidWdIb3N0RGlzcGF0Y2hIYW5kbGVyKToK KyAgICAgICAgKFdlYktpdDo6RGVidWdnZXJBZ2VudE1hbmFnZXI6Om9uV2ViVmlld0Nsb3NlZCk6 CisgICAgICAgICogc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmg6CisgICAgICAgICogc3JjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBY2Nlc3NpYmls aXR5T2JqZWN0OjprZXlib2FyZFNob3J0Y3V0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjayk6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXc6OndpbGxFbnRlck1vZGFsTG9vcCk6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXc6OmRpZEV4aXRNb2RhbExvb3ApOgorCiAyMDExLTExLTExICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBGaXggQ0NM YXllclRyZWVIb3N0IGxlYWsgaW4gd2Via2l0X3VuaXRfdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXAvV2ViQ29yZS5neXAKaW5kZXggZTE1MzhjMGRhNTRiODM3NzljNzhmNWU1ZGIwZDhjNDVi NDU2YTJkYy4uMTljNTQ3MjE3MTkyMTljOGFiMWJjZWMyNzBlNjhjZWQ2NTFlMWVjMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTk4MSw2ICs5ODEsNyBAQAogICAg IHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJjb3JlX2JpbmRpbmdzJywKICAgICAgICd0eXBl JzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVfd2V4aXRf dGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAnaGFyZF9kZXBlbmRlbmN5JzogMSwKICAg ICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX2JpbmRpbmdzX3NvdXJjZXMn LApAQCAtMTMzOSw2ICsxMzQwLDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAnd2Vi Y29yZV9kb20nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3Zhcmlh Ymxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAgICdk ZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMnLAogICAgICAg XSwKQEAgLTEzNjEsNiArMTM2Myw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dl YmNvcmVfaHRtbCcsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAndmFy aWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAg J2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAg ICBdLApAQCAtMTM3NSw2ICsxMzc4LDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAn d2ViY29yZV9zdmcnLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3Zh cmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAg ICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMnLAogICAg ICAgXSwKQEAgLTEzODksNiArMTM5Myw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzog J3dlYmNvcmVfcGxhdGZvcm0nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAg ICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwK ICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMn LAogICAgICAgXSwKQEAgLTE2MzUsNiArMTY0MCw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9u YW1lJzogJ3dlYmNvcmVfYXJtX25lb24nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnkn LAorICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzog MSwgfSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVp c2l0ZXMnLAogICAgICAgXSwKQEAgLTE2NTksNiArMTY2NSw3IEBACiAgICAgewogICAgICAgJ3Rh cmdldF9uYW1lJzogJ3dlYmNvcmVfcmVuZGVyaW5nJywKICAgICAgICd0eXBlJzogJ3N0YXRpY19s aWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVfd2V4aXRfdGltZV9kZXN0cnVj dG9ycyc6IDEsIH0sCiAgICAgICAnZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAnd2ViY29yZV9w cmVyZXF1aXNpdGVzJywKICAgICAgIF0sCkBAIC0xNzE3LDYgKzE3MjQsNyBAQAogICAgIHsKICAg ICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJjb3JlX3JlbWFpbmluZycsCiAgICAgICAndHlwZSc6ICdz dGF0aWNfbGlicmFyeScsCisgICAgICAndmFyaWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVf ZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dl YmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJk X3BhcnR5L3Y4LWkxOG4vYnVpbGQvYWxsLmd5cDp2OC1pMThuJywKQEAgLTE5MzMsNiArMTk0MSw3 IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dlYmNvcmVfdGVzdF9zdXBwb3J0JywK ICAgICAgICd0eXBlJzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdl bmFibGVfd2V4aXRfdGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAnZGVwZW5kZW5jaWVz JzogWwogICAgICAgICAnd2ViY29yZScsCiAgICAgICBdLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQu Z3lwCmluZGV4IDA5ZWM4NjAzZjczYjE2NGY4YTBkYjc2YjRlYjQwODIwODQ3N2MzNDEuLjNhYzE4 NTg2NDAxMjE1NjQ4MDk3MDY2NjA5ODcxMzJkNjNiYjBlMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dl YktpdC5neXAKQEAgLTY2LDYgKzY2LDcgQEAKICAgICAgICAgewogICAgICAgICAgICAgJ3Rhcmdl dF9uYW1lJzogJ3dlYmtpdCcsCiAgICAgICAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScs CisgICAgICAgICAgICAndmFyaWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3Rv cnMnOiAxLCB9LAogICAgICAgICAgICAgJ21zdnNfZ3VpZCc6ICc1RUNFQzlFNS04RjIzLTQ3QjYt OTNFMC1DM0IzMjhCM0JFNjUnLAogICAgICAgICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAg ICAgICAgICAgICAnLi4vLi4vV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cDp3ZWJjb3Jl JywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRN YW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRNYW5h Z2VyLmNwcAppbmRleCAzNjhiNzhjZjM2NTQwYzg0YTgyNjM2MjFiYzkxNjliNDM1YmExZjEwLi4w Y2ViYmY0OWE3NTZmYTBlNmQzYTdhYTYzMzY3N2U0OTFkN2NlNTRkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50TWFuYWdlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuY3BwCkBAIC00OSwx MCArNDksMTAgQEAgV2ViRGV2VG9vbHNBZ2VudDo6TWVzc2FnZUxvb3BEaXNwYXRjaEhhbmRsZXIg RGVidWdnZXJBZ2VudE1hbmFnZXI6OnNfbWVzc2FnZUxvb3AKIAogYm9vbCBEZWJ1Z2dlckFnZW50 TWFuYWdlcjo6c19pbkhvc3REaXNwYXRjaEhhbmRsZXIgPSBmYWxzZTsKIAotRGVidWdnZXJBZ2Vu dE1hbmFnZXI6OkRlZmVycmVyc01hcCBEZWJ1Z2dlckFnZW50TWFuYWdlcjo6c19wYWdlRGVmZXJy ZXJzOwotCiBib29sIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpzX2V4cG9zZVY4RGVidWdnZXJQcm90 b2NvbCA9IGZhbHNlOwogCit0eXBlZGVmIEhhc2hNYXA8V2ViVmlld0ltcGwqLCBXZWJDb3JlOjpQ YWdlR3JvdXBMb2FkRGVmZXJyZXIqPiBEZWZlcnJlcnNNYXA7CisKIG5hbWVzcGFjZSB7CiAKIGNs YXNzIENhbGxlcklkV3JhcHBlciA6IHB1YmxpYyB2ODo6RGVidWc6OkNsaWVudERhdGEgewpAQCAt NzAsNiArNzAsMTIgQEAgcHJpdmF0ZToKICAgICBpbnQgbV9jYWxsZXJJZDsKIH07CiAKK0RlZmVy cmVyc01hcCYgcGFnZURlZmVycmVycygpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChEZWZl cnJlcnNNYXAsIGRlZmVycmVycywgKCkpOworICAgIHJldHVybiBkZWZlcnJlcnM7Cit9CisKIH0g Ly8gbmFtZXNwYWNlCiAKIApAQCAtODcsNyArOTMsNyBAQCB2b2lkIERlYnVnZ2VyQWdlbnRNYW5h Z2VyOjpkZWJ1Z0hvc3REaXNwYXRjaEhhbmRsZXIoKQogICAgIC8vIDEuIERpc2FibGUgYWN0aXZl IG9iamVjdHMgYW5kIGlucHV0IGV2ZW50cy4KICAgICBmb3IgKEF0dGFjaGVkQWdlbnRzTWFwOjpp dGVyYXRvciBpdCA9IHNfYXR0YWNoZWRBZ2VudHNNYXAtPmJlZ2luKCk7IGl0ICE9IHNfYXR0YWNo ZWRBZ2VudHNNYXAtPmVuZCgpOyArK2l0KSB7CiAgICAgICAgIERlYnVnZ2VyQWdlbnRJbXBsKiBh Z2VudCA9IGl0LT5zZWNvbmQ7Ci0gICAgICAgIHNfcGFnZURlZmVycmVycy5zZXQoYWdlbnQtPndl YlZpZXcoKSwgbmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcihhZ2VudC0+cGFnZSgp LCB0cnVlKSk7CisgICAgICAgIHBhZ2VEZWZlcnJlcnMoKS5zZXQoYWdlbnQtPndlYlZpZXcoKSwg bmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcihhZ2VudC0+cGFnZSgpLCB0cnVlKSk7 CiAgICAgICAgIHZpZXdzLmFwcGVuZChhZ2VudC0+d2ViVmlldygpKTsKICAgICAgICAgYWdlbnQt PndlYlZpZXcoKS0+c2V0SWdub3JlSW5wdXRFdmVudHModHJ1ZSk7CiAgICAgfQpAQCAtOTcsMTMg KzEwMywxMyBAQCB2b2lkIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpkZWJ1Z0hvc3REaXNwYXRjaEhh bmRsZXIoKQogCiAgICAgLy8gMy4gQnJpbmcgdGhpbmdzIGJhY2suCiAgICAgZm9yIChWZWN0b3I8 V2ViVmlld0ltcGwqPjo6aXRlcmF0b3IgaXQgPSB2aWV3cy5iZWdpbigpOyBpdCAhPSB2aWV3cy5l bmQoKTsgKytpdCkgewotICAgICAgICBpZiAoc19wYWdlRGVmZXJyZXJzLmNvbnRhaW5zKCppdCkp IHsKKyAgICAgICAgaWYgKHBhZ2VEZWZlcnJlcnMoKS5jb250YWlucygqaXQpKSB7CiAgICAgICAg ICAgICAvLyBUaGUgdmlldyB3YXMgbm90IGNsb3NlZCBkdXJpbmcgdGhlIGRpc3BhdGNoLgogICAg ICAgICAgICAgKCppdCktPnNldElnbm9yZUlucHV0RXZlbnRzKGZhbHNlKTsKICAgICAgICAgfQog ICAgIH0KLSAgICBkZWxldGVBbGxWYWx1ZXMoc19wYWdlRGVmZXJyZXJzKTsKLSAgICBzX3BhZ2VE ZWZlcnJlcnMuY2xlYXIoKTsKKyAgICBkZWxldGVBbGxWYWx1ZXMocGFnZURlZmVycmVycygpKTsK KyAgICBwYWdlRGVmZXJyZXJzKCkuY2xlYXIoKTsKIAogICAgIHNfaW5Ib3N0RGlzcGF0Y2hIYW5k bGVyID0gZmFsc2U7CiAgICAgaWYgKCFzX2F0dGFjaGVkQWdlbnRzTWFwKSB7CkBAIC0yNjAsOSAr MjY2LDkgQEAgdm9pZCBEZWJ1Z2dlckFnZW50TWFuYWdlcjo6c2V0SG9zdElkKFdlYkZyYW1lSW1w bCogd2ViZnJhbWUsIGludCBob3N0SWQpCiAKIHZvaWQgRGVidWdnZXJBZ2VudE1hbmFnZXI6Om9u V2ViVmlld0Nsb3NlZChXZWJWaWV3SW1wbCogd2VidmlldykKIHsKLSAgICBpZiAoc19wYWdlRGVm ZXJyZXJzLmNvbnRhaW5zKHdlYnZpZXcpKSB7Ci0gICAgICAgIGRlbGV0ZSBzX3BhZ2VEZWZlcnJl cnMuZ2V0KHdlYnZpZXcpOwotICAgICAgICBzX3BhZ2VEZWZlcnJlcnMucmVtb3ZlKHdlYnZpZXcp OworICAgIGlmIChwYWdlRGVmZXJyZXJzKCkuY29udGFpbnMod2VidmlldykpIHsKKyAgICAgICAg ZGVsZXRlIHBhZ2VEZWZlcnJlcnMoKS5nZXQod2Vidmlldyk7CisgICAgICAgIHBhZ2VEZWZlcnJl cnMoKS5yZW1vdmUod2Vidmlldyk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50TWFuYWdlci5oIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuaAppbmRleCBhMzIzMzExZjU1MjdkYjVj NzlhMGZiMTJhZjE1NmU2NjhlZWM5YjEyLi43ODY0YzJlNGQ0NDVjYjE4NzJkYjc5NGY1Yjk3ODE2 YjFhNDYxYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dl ckFnZW50TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2Vy QWdlbnRNYW5hZ2VyLmgKQEAgLTk5LDggKzk5LDYgQEAgcHJpdmF0ZToKIAogICAgIHN0YXRpYyBX ZWJEZXZUb29sc0FnZW50OjpNZXNzYWdlTG9vcERpc3BhdGNoSGFuZGxlciBzX21lc3NhZ2VMb29w RGlzcGF0Y2hIYW5kbGVyOwogICAgIHN0YXRpYyBib29sIHNfaW5Ib3N0RGlzcGF0Y2hIYW5kbGVy OwotICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJWaWV3SW1wbCosIFdlYkNvcmU6OlBhZ2VHcm91cExv YWREZWZlcnJlcio+IERlZmVycmVyc01hcDsKLSAgICBzdGF0aWMgRGVmZXJyZXJzTWFwIHNfcGFn ZURlZmVycmVyczsKIAogICAgIHN0YXRpYyBib29sIHNfZXhwb3NlVjhEZWJ1Z2dlclByb3RvY29s OwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkFjY2Vzc2li aWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdC5jcHAKaW5kZXggOGRmOTAwYTFkMGZlZmJkMWQ4YWRjMWNiNmMwNGQxODA3ZmQx YjczYS4uN2ZjOTY0NDYxMmExNjU0MWVkNWFjYzliMzM2NzlkNTIyMWViMDliYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5j cHAKQEAgLTU1MSw3ICs1NTEsNyBAQCBXZWJTdHJpbmcgV2ViQWNjZXNzaWJpbGl0eU9iamVjdDo6 a2V5Ym9hcmRTaG9ydGN1dCgpIGNvbnN0CiAgICAgaWYgKGFjY2Vzc0tleS5pc051bGwoKSkKICAg ICAgICAgcmV0dXJuIFdlYlN0cmluZygpOwogCi0gICAgc3RhdGljIFN0cmluZyBtb2RpZmllclN0 cmluZzsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywgbW9kaWZpZXJTdHJpbmcsICgp KTsKICAgICBpZiAobW9kaWZpZXJTdHJpbmcuaXNOdWxsKCkpIHsKICAgICAgICAgdW5zaWduZWQg bW9kaWZpZXJzID0gRXZlbnRIYW5kbGVyOjphY2Nlc3NLZXlNb2RpZmllcnMoKTsKICAgICAgICAg Ly8gRm9sbG93IHRoZSBzYW1lIG9yZGVyIGFzIE1vemlsbGEgTVNBQSBpbXBsZW1lbnRhdGlvbjoK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBmZWRkNmYw ODQ5ODc2Y2YwMjJkMWRkNGIyYmQ1NTM4YmZkNDA2MjJlLi5kNGQ0OTM2NWZjYzJkNzk0ZWFlOGU0 YWE4YTY5YWM0Y2VjNjE0ZmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwCkBAIC0yMDksNyArMjA5LDExIEBAIGNvbnN0IGNoYXIqIHBhZ2VHcm91cE5hbWUg PSAiZGVmYXVsdCI7CiAKIC8vIFVzZWQgdG8gZGVmZXIgYWxsIHBhZ2UgYWN0aXZpdHkgaW4gY2Fz ZXMgd2hlcmUgdGhlIGVtYmVkZGVyIHdpc2hlcyB0byBydW4KIC8vIGEgbmVzdGVkIGV2ZW50IGxv b3AuIFVzaW5nIGEgc3RhY2sgZW5hYmxlcyBuZXN0aW5nIG9mIG1lc3NhZ2UgbG9vcCBpbnZvY2F0 aW9ucy4KLXN0YXRpYyBWZWN0b3I8UGFnZUdyb3VwTG9hZERlZmVycmVyKj4gcGFnZUdyb3VwTG9h ZERlZmVycmVyU3RhY2s7CitzdGF0aWMgVmVjdG9yPFBhZ2VHcm91cExvYWREZWZlcnJlcio+JiBw YWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChW ZWN0b3I8UGFnZUdyb3VwTG9hZERlZmVycmVyKj4sIGRlZmVycmVyU3RhY2ssICgpKTsKKyAgICBy ZXR1cm4gZGVmZXJyZXJTdGFjazsKK30KIAogLy8gRW5zdXJlIHRoYXQgdGhlIFdlYkRyYWdPcGVy YXRpb24gZW51bSB2YWx1ZXMgc3RheSBpbiBzeW5jIHdpdGggdGhlIG9yaWdpbmFsCiAvLyBEcmFn T3BlcmF0aW9uIGNvbnN0YW50cy4KQEAgLTI2NiwxOSArMjcwLDE5IEBAIHZvaWQgV2ViVmlldzo6 d2lsbEVudGVyTW9kYWxMb29wKCkKICAgICBBU1NFUlQocGFnZUdyb3VwKTsKIAogICAgIGlmIChw YWdlR3JvdXAtPnBhZ2VzKCkuaXNFbXB0eSgpKQotICAgICAgICBwYWdlR3JvdXBMb2FkRGVmZXJy ZXJTdGFjay5hcHBlbmQoc3RhdGljX2Nhc3Q8UGFnZUdyb3VwTG9hZERlZmVycmVyKj4oMCkpOwor ICAgICAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpLmFwcGVuZChzdGF0aWNfY2FzdDxQ YWdlR3JvdXBMb2FkRGVmZXJyZXIqPigwKSk7CiAgICAgZWxzZSB7CiAgICAgICAgIC8vIFBpY2sg YW55IHBhZ2UgaW4gdGhlIHBhZ2UgZ3JvdXAgc2luY2Ugd2UgYXJlIGRlZmVycmluZyBhbGwgcGFn ZXMuCi0gICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrLmFwcGVuZChuZXcgUGFnZUdy b3VwTG9hZERlZmVycmVyKCpwYWdlR3JvdXAtPnBhZ2VzKCkuYmVnaW4oKSwgdHJ1ZSkpOworICAg ICAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpLmFwcGVuZChuZXcgUGFnZUdyb3VwTG9h ZERlZmVycmVyKCpwYWdlR3JvdXAtPnBhZ2VzKCkuYmVnaW4oKSwgdHJ1ZSkpOwogICAgIH0KIH0K IAogdm9pZCBXZWJWaWV3OjpkaWRFeGl0TW9kYWxMb29wKCkKIHsKLSAgICBBU1NFUlQocGFnZUdy b3VwTG9hZERlZmVycmVyU3RhY2suc2l6ZSgpKTsKKyAgICBBU1NFUlQocGFnZUdyb3VwTG9hZERl ZmVycmVyU3RhY2soKS5zaXplKCkpOwogCi0gICAgZGVsZXRlIHBhZ2VHcm91cExvYWREZWZlcnJl clN0YWNrLmxhc3QoKTsKLSAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjay5yZW1vdmVMYXN0 KCk7CisgICAgZGVsZXRlIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkubGFzdCgpOworICAg IHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkucmVtb3ZlTGFzdCgpOwogfQogCiB2b2lkIFdl YlZpZXdJbXBsOjppbml0aWFsaXplTWFpbkZyYW1lKFdlYkZyYW1lQ2xpZW50KiBmcmFtZUNsaWVu dCkK 114727 2011-11-11 10:38:21 -0800 2011-11-11 20:20:44 -0800 Patch bug-72146-20111111103820.patch text/plain 13248 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5ODMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5ZDAwMDllNmI5OTc2MmFh OTAwMWE4ODUwYjBjMzFiNzNmODE0YzQ0Li5mOGZjZGRiMjQ1ZDM3NTg2Y2IzOWEyZGE5ZWM1NmNl ZDg2NmQ3YjBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTEtMTEgIE5pY28g V2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3Zl IDIgc3RhdGljIGluaXRpYWxpemVycyBhbmQgMyBleGl0IHRpbWUgZGVzdHJ1Y3RvcnMuIFR1cm4g b24gLVdleGl0LXRpbWUtZGVzdHJ1Y3RvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MjE0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogV2Vi Q29yZS5neXAvV2ViQ29yZS5neXA6CisKIDIwMTEtMTEtMTEgIFBhdmVsIEZlbGRtYW4gIDxwZmVs ZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJlaW1wbGVtZW50IERP TSBzZWFyY2ggdXNpbmcgbm8gWFBhdGguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDcz NDIzYTU3OWYxMDZlMWYyODE5ODY2Y2FiNDU5YTY5OGE1ZTFjOWYuLjVkZmFlZGIyNTA1MDgyNjQ5 ZjYwYjIxMzliOWU4NmFmNjhmODc0ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMTEtMTEtMTEgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIDIgc3RhdGljIGluaXRpYWxpemVycyBhbmQg MyBleGl0IHRpbWUgZGVzdHJ1Y3RvcnMuIFR1cm4gb24gLVdleGl0LXRpbWUtZGVzdHJ1Y3RvcnMu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjE0Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0 Lmd5cDoKKyAgICAgICAgKiBzcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpEZWJ1Z2dlckFnZW50TWFuYWdlcjo6ZGVidWdIb3N0RGlzcGF0Y2hIYW5kbGVyKToK KyAgICAgICAgKFdlYktpdDo6RGVidWdnZXJBZ2VudE1hbmFnZXI6Om9uV2ViVmlld0Nsb3NlZCk6 CisgICAgICAgICogc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmg6CisgICAgICAgICogc3JjL1dl YkFjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJBY2Nlc3NpYmls aXR5T2JqZWN0OjprZXlib2FyZFNob3J0Y3V0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu Y3BwOgorICAgICAgICAoV2ViS2l0OjpwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjayk6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXc6OndpbGxFbnRlck1vZGFsTG9vcCk6CisgICAgICAgIChXZWJL aXQ6OldlYlZpZXc6OmRpZEV4aXRNb2RhbExvb3ApOgorCiAyMDExLTExLTExICBKYW1lcyBSb2Jp bnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBGaXggQ0NM YXllclRyZWVIb3N0IGxlYWsgaW4gd2Via2l0X3VuaXRfdGVzdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5neXAvV2ViQ29yZS5neXAKaW5kZXggZTE1MzhjMGRhNTRiODM3NzljNzhmNWU1ZGIwZDhjNDVi NDU2YTJkYy4uMTljNTQ3MjE3MTkyMTljOGFiMWJjZWMyNzBlNjhjZWQ2NTFlMWVjMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAKQEAgLTk4MSw2ICs5ODEsNyBAQAogICAg IHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJjb3JlX2JpbmRpbmdzJywKICAgICAgICd0eXBl JzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVfd2V4aXRf dGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAnaGFyZF9kZXBlbmRlbmN5JzogMSwKICAg ICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX2JpbmRpbmdzX3NvdXJjZXMn LApAQCAtMTMzOSw2ICsxMzQwLDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAnd2Vi Y29yZV9kb20nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3Zhcmlh Ymxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAgICdk ZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMnLAogICAgICAg XSwKQEAgLTEzNjEsNiArMTM2Myw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dl YmNvcmVfaHRtbCcsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAndmFy aWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAg J2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAg ICBdLApAQCAtMTM3NSw2ICsxMzc4LDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAn d2ViY29yZV9zdmcnLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3Zh cmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAg ICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMnLAogICAg ICAgXSwKQEAgLTEzODksNiArMTM5Myw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzog J3dlYmNvcmVfcGxhdGZvcm0nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAg ICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwK ICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVpc2l0ZXMn LAogICAgICAgXSwKQEAgLTE2MzUsNiArMTY0MCw3IEBACiAgICAgewogICAgICAgJ3RhcmdldF9u YW1lJzogJ3dlYmNvcmVfYXJtX25lb24nLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnkn LAorICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzog MSwgfSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3ByZXJlcXVp c2l0ZXMnLAogICAgICAgXSwKQEAgLTE2NTksNiArMTY2NSw3IEBACiAgICAgewogICAgICAgJ3Rh cmdldF9uYW1lJzogJ3dlYmNvcmVfcmVuZGVyaW5nJywKICAgICAgICd0eXBlJzogJ3N0YXRpY19s aWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVfd2V4aXRfdGltZV9kZXN0cnVj dG9ycyc6IDEsIH0sCiAgICAgICAnZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAnd2ViY29yZV9w cmVyZXF1aXNpdGVzJywKICAgICAgIF0sCkBAIC0xNzE3LDYgKzE3MjQsNyBAQAogICAgIHsKICAg ICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJjb3JlX3JlbWFpbmluZycsCiAgICAgICAndHlwZSc6ICdz dGF0aWNfbGlicmFyeScsCisgICAgICAndmFyaWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVf ZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dl YmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3RoaXJk X3BhcnR5L3Y4LWkxOG4vYnVpbGQvYWxsLmd5cDp2OC1pMThuJywKQEAgLTE5MzMsNiArMTk0MSw3 IEBACiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dlYmNvcmVfdGVzdF9zdXBwb3J0JywK ICAgICAgICd0eXBlJzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdl bmFibGVfd2V4aXRfdGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAnZGVwZW5kZW5jaWVz JzogWwogICAgICAgICAnd2ViY29yZScsCiAgICAgICBdLApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtLmNwcApp bmRleCAyNGIzZTE4ZWY0NWJjNTcyNTM3ZGUyMmFkOWUxMjUwMTcyODA2ZjM5Li5mOGNiMjgxNTQ4 NjFlMDFkYTcxMTI0OTIwYzYwZDA2YTM3ZTlhMTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtLmNwcApA QCAtMTE0LDcgKzExNCw3IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bTo6cGFpbnRUaWNr bWFya3MoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBTY3JvbGxiYXIqCiAgICAgICAgIHJldHVy bjsKIAogICAgIC8vIEdldCB0aGUgaW1hZ2UgZm9yIHRoZSB0aWNrbWFya3MuCi0gICAgc3RhdGlj IFJlZlB0cjxJbWFnZT4gZGFzaCA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgidGlja21h cmtEYXNoIik7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChSZWZQdHI8SW1hZ2U+LCBkYXNoLCAo SW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJ0aWNrbWFya0Rhc2giKSkpOwogICAgIGlmIChk YXNoLT5pc051bGwoKSkgewogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Ny b2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKaW5kZXggZWEzNGExNDJiM2Zl ZjBhNmRhMGVmOTMyZGM1MWJjY2VlM2U4Y2FkZi4uZWM2ODQwN2U5ZDhjMzJlMzBkMzEwZDJlNTA1 OGMyZGE3ZGJkZWNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21p dW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXguY3BwCkBAIC0zOSw3 ICszOSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2Nyb2xsYmFyVGhlbWUqIFNjcm9sbGJh clRoZW1lOjpuYXRpdmVUaGVtZSgpCiB7Ci0gICAgc3RhdGljIFNjcm9sbGJhclRoZW1lQ2hyb21p dW1MaW51eCB0aGVtZTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFNjcm9sbGJhclRoZW1lQ2hy b21pdW1MaW51eCwgdGhlbWUsICgpKTsKICAgICByZXR1cm4gJnRoZW1lOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVM aW51eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250 Q2FjaGVMaW51eC5jcHAKaW5kZXggNzI0ZTVlOWViYjBkZjkwNTUwMDMwMzBhNDhhZGIxMjAxZjlj NjNmYi4uNGRkNjYwZGFmMmRhNzJhYjEyN2RlN2QwYWE5Nzc0Y2JmMDE1YTAzNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9udENhY2hlTGlu dXguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0Zv bnRDYWNoZUxpbnV4LmNwcApAQCAtNzQsOSArNzQsOSBAQCBTaW1wbGVGb250RGF0YSogRm9udENh Y2hlOjpnZXRTaW1pbGFyRm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250JiBmb250KQogCiBTaW1w bGVGb250RGF0YSogRm9udENhY2hlOjpnZXRMYXN0UmVzb3J0RmFsbGJhY2tGb250KGNvbnN0IEZv bnREZXNjcmlwdGlvbiYgZGVzY3JpcHRpb24sIFNob3VsZFJldGFpbiBzaG91bGRSZXRhaW4pCiB7 Ci0gICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyBzYW5zU3RyKCJTYW5zIik7Ci0gICAgc3Rh dGljIGNvbnN0IEF0b21pY1N0cmluZyBzZXJpZlN0cigiU2VyaWYiKTsKLSAgICBzdGF0aWMgY29u c3QgQXRvbWljU3RyaW5nIG1vbm9zcGFjZVN0cigiTW9ub3NwYWNlIik7CisgICAgREVGSU5FX1NU QVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIHNhbnNTdHIsICgiU2FucyIpKTsKKyAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgc2VyaWZTdHIsICgiU2VyaWYi KSk7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIG1vbm9zcGFj ZVN0ciwgKCJNb25vc3BhY2UiKSk7CiAKICAgICBGb250UGxhdGZvcm1EYXRhKiBmb250UGxhdGZv cm1EYXRhID0gMDsKICAgICBzd2l0Y2ggKGRlc2NyaXB0aW9uLmdlbmVyaWNGYW1pbHkoKSkgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDA5ZWM4NjAzZjczYjE2NGY4YTBkYjc2YjRl YjQwODIwODQ3N2MzNDEuLjNhYzE4NTg2NDAxMjE1NjQ4MDk3MDY2NjA5ODcxMzJkNjNiYjBlMmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTY2LDYgKzY2LDcgQEAKICAgICAgICAg ewogICAgICAgICAgICAgJ3RhcmdldF9uYW1lJzogJ3dlYmtpdCcsCiAgICAgICAgICAgICAndHlw ZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAgICAgICAndmFyaWFibGVzJzogeyAnZW5hYmxl X3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAgICAgICAgJ21zdnNfZ3VpZCc6 ICc1RUNFQzlFNS04RjIzLTQ3QjYtOTNFMC1DM0IzMjhCM0JFNjUnLAogICAgICAgICAgICAgJ2Rl cGVuZGVuY2llcyc6IFsKICAgICAgICAgICAgICAgICAnLi4vLi4vV2ViQ29yZS9XZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cDp3ZWJjb3JlJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmNwcAppbmRleCAzNjhiNzhjZjM2NTQwYzg0YTgyNjM2 MjFiYzkxNjliNDM1YmExZjEwLi4wY2ViYmY0OWE3NTZmYTBlNmQzYTdhYTYzMzY3N2U0OTFkN2Nl NTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50 TWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRGVidWdnZXJBZ2Vu dE1hbmFnZXIuY3BwCkBAIC00OSwxMCArNDksMTAgQEAgV2ViRGV2VG9vbHNBZ2VudDo6TWVzc2Fn ZUxvb3BEaXNwYXRjaEhhbmRsZXIgRGVidWdnZXJBZ2VudE1hbmFnZXI6OnNfbWVzc2FnZUxvb3AK IAogYm9vbCBEZWJ1Z2dlckFnZW50TWFuYWdlcjo6c19pbkhvc3REaXNwYXRjaEhhbmRsZXIgPSBm YWxzZTsKIAotRGVidWdnZXJBZ2VudE1hbmFnZXI6OkRlZmVycmVyc01hcCBEZWJ1Z2dlckFnZW50 TWFuYWdlcjo6c19wYWdlRGVmZXJyZXJzOwotCiBib29sIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpz X2V4cG9zZVY4RGVidWdnZXJQcm90b2NvbCA9IGZhbHNlOwogCit0eXBlZGVmIEhhc2hNYXA8V2Vi Vmlld0ltcGwqLCBXZWJDb3JlOjpQYWdlR3JvdXBMb2FkRGVmZXJyZXIqPiBEZWZlcnJlcnNNYXA7 CisKIG5hbWVzcGFjZSB7CiAKIGNsYXNzIENhbGxlcklkV3JhcHBlciA6IHB1YmxpYyB2ODo6RGVi dWc6OkNsaWVudERhdGEgewpAQCAtNzAsNiArNzAsMTIgQEAgcHJpdmF0ZToKICAgICBpbnQgbV9j YWxsZXJJZDsKIH07CiAKK0RlZmVycmVyc01hcCYgcGFnZURlZmVycmVycygpCit7CisgICAgREVG SU5FX1NUQVRJQ19MT0NBTChEZWZlcnJlcnNNYXAsIGRlZmVycmVycywgKCkpOworICAgIHJldHVy biBkZWZlcnJlcnM7Cit9CisKIH0gLy8gbmFtZXNwYWNlCiAKIApAQCAtODcsNyArOTMsNyBAQCB2 b2lkIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpkZWJ1Z0hvc3REaXNwYXRjaEhhbmRsZXIoKQogICAg IC8vIDEuIERpc2FibGUgYWN0aXZlIG9iamVjdHMgYW5kIGlucHV0IGV2ZW50cy4KICAgICBmb3Ig KEF0dGFjaGVkQWdlbnRzTWFwOjppdGVyYXRvciBpdCA9IHNfYXR0YWNoZWRBZ2VudHNNYXAtPmJl Z2luKCk7IGl0ICE9IHNfYXR0YWNoZWRBZ2VudHNNYXAtPmVuZCgpOyArK2l0KSB7CiAgICAgICAg IERlYnVnZ2VyQWdlbnRJbXBsKiBhZ2VudCA9IGl0LT5zZWNvbmQ7Ci0gICAgICAgIHNfcGFnZURl ZmVycmVycy5zZXQoYWdlbnQtPndlYlZpZXcoKSwgbmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWRE ZWZlcnJlcihhZ2VudC0+cGFnZSgpLCB0cnVlKSk7CisgICAgICAgIHBhZ2VEZWZlcnJlcnMoKS5z ZXQoYWdlbnQtPndlYlZpZXcoKSwgbmV3IFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcihh Z2VudC0+cGFnZSgpLCB0cnVlKSk7CiAgICAgICAgIHZpZXdzLmFwcGVuZChhZ2VudC0+d2ViVmll dygpKTsKICAgICAgICAgYWdlbnQtPndlYlZpZXcoKS0+c2V0SWdub3JlSW5wdXRFdmVudHModHJ1 ZSk7CiAgICAgfQpAQCAtOTcsMTMgKzEwMywxMyBAQCB2b2lkIERlYnVnZ2VyQWdlbnRNYW5hZ2Vy OjpkZWJ1Z0hvc3REaXNwYXRjaEhhbmRsZXIoKQogCiAgICAgLy8gMy4gQnJpbmcgdGhpbmdzIGJh Y2suCiAgICAgZm9yIChWZWN0b3I8V2ViVmlld0ltcGwqPjo6aXRlcmF0b3IgaXQgPSB2aWV3cy5i ZWdpbigpOyBpdCAhPSB2aWV3cy5lbmQoKTsgKytpdCkgewotICAgICAgICBpZiAoc19wYWdlRGVm ZXJyZXJzLmNvbnRhaW5zKCppdCkpIHsKKyAgICAgICAgaWYgKHBhZ2VEZWZlcnJlcnMoKS5jb250 YWlucygqaXQpKSB7CiAgICAgICAgICAgICAvLyBUaGUgdmlldyB3YXMgbm90IGNsb3NlZCBkdXJp bmcgdGhlIGRpc3BhdGNoLgogICAgICAgICAgICAgKCppdCktPnNldElnbm9yZUlucHV0RXZlbnRz KGZhbHNlKTsKICAgICAgICAgfQogICAgIH0KLSAgICBkZWxldGVBbGxWYWx1ZXMoc19wYWdlRGVm ZXJyZXJzKTsKLSAgICBzX3BhZ2VEZWZlcnJlcnMuY2xlYXIoKTsKKyAgICBkZWxldGVBbGxWYWx1 ZXMocGFnZURlZmVycmVycygpKTsKKyAgICBwYWdlRGVmZXJyZXJzKCkuY2xlYXIoKTsKIAogICAg IHNfaW5Ib3N0RGlzcGF0Y2hIYW5kbGVyID0gZmFsc2U7CiAgICAgaWYgKCFzX2F0dGFjaGVkQWdl bnRzTWFwKSB7CkBAIC0yNjAsOSArMjY2LDkgQEAgdm9pZCBEZWJ1Z2dlckFnZW50TWFuYWdlcjo6 c2V0SG9zdElkKFdlYkZyYW1lSW1wbCogd2ViZnJhbWUsIGludCBob3N0SWQpCiAKIHZvaWQgRGVi dWdnZXJBZ2VudE1hbmFnZXI6Om9uV2ViVmlld0Nsb3NlZChXZWJWaWV3SW1wbCogd2VidmlldykK IHsKLSAgICBpZiAoc19wYWdlRGVmZXJyZXJzLmNvbnRhaW5zKHdlYnZpZXcpKSB7Ci0gICAgICAg IGRlbGV0ZSBzX3BhZ2VEZWZlcnJlcnMuZ2V0KHdlYnZpZXcpOwotICAgICAgICBzX3BhZ2VEZWZl cnJlcnMucmVtb3ZlKHdlYnZpZXcpOworICAgIGlmIChwYWdlRGVmZXJyZXJzKCkuY29udGFpbnMo d2VidmlldykpIHsKKyAgICAgICAgZGVsZXRlIHBhZ2VEZWZlcnJlcnMoKS5nZXQod2Vidmlldyk7 CisgICAgICAgIHBhZ2VEZWZlcnJlcnMoKS5yZW1vdmUod2Vidmlldyk7CiAgICAgfQogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50TWFuYWdl ci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuaApp bmRleCBhMzIzMzExZjU1MjdkYjVjNzlhMGZiMTJhZjE1NmU2NjhlZWM5YjEyLi43ODY0YzJlNGQ0 NDVjYjE4NzJkYjc5NGY1Yjk3ODE2YjFhNDYxYWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50TWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmgKQEAgLTk5LDggKzk5LDYgQEAgcHJp dmF0ZToKIAogICAgIHN0YXRpYyBXZWJEZXZUb29sc0FnZW50OjpNZXNzYWdlTG9vcERpc3BhdGNo SGFuZGxlciBzX21lc3NhZ2VMb29wRGlzcGF0Y2hIYW5kbGVyOwogICAgIHN0YXRpYyBib29sIHNf aW5Ib3N0RGlzcGF0Y2hIYW5kbGVyOwotICAgIHR5cGVkZWYgSGFzaE1hcDxXZWJWaWV3SW1wbCos IFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcio+IERlZmVycmVyc01hcDsKLSAgICBzdGF0 aWMgRGVmZXJyZXJzTWFwIHNfcGFnZURlZmVycmVyczsKIAogICAgIHN0YXRpYyBib29sIHNfZXhw b3NlVjhEZWJ1Z2dlclByb3RvY29sOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKaW5kZXggOGRmOTAwYTFkMGZlZmJk MWQ4YWRjMWNiNmMwNGQxODA3ZmQxYjczYS4uN2ZjOTY0NDYxMmExNjU0MWVkNWFjYzliMzM2Nzlk NTIyMWViMDliYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQWNj ZXNzaWJpbGl0eU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi QWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTU1MSw3ICs1NTEsNyBAQCBXZWJTdHJpbmcgV2Vi QWNjZXNzaWJpbGl0eU9iamVjdDo6a2V5Ym9hcmRTaG9ydGN1dCgpIGNvbnN0CiAgICAgaWYgKGFj Y2Vzc0tleS5pc051bGwoKSkKICAgICAgICAgcmV0dXJuIFdlYlN0cmluZygpOwogCi0gICAgc3Rh dGljIFN0cmluZyBtb2RpZmllclN0cmluZzsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmlu ZywgbW9kaWZpZXJTdHJpbmcsICgpKTsKICAgICBpZiAobW9kaWZpZXJTdHJpbmcuaXNOdWxsKCkp IHsKICAgICAgICAgdW5zaWduZWQgbW9kaWZpZXJzID0gRXZlbnRIYW5kbGVyOjphY2Nlc3NLZXlN b2RpZmllcnMoKTsKICAgICAgICAgLy8gRm9sbG93IHRoZSBzYW1lIG9yZGVyIGFzIE1vemlsbGEg TVNBQSBpbXBsZW1lbnRhdGlvbjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJ bXBsLmNwcAppbmRleCBmZWRkNmYwODQ5ODc2Y2YwMjJkMWRkNGIyYmQ1NTM4YmZkNDA2MjJlLi5k NGQ0OTM2NWZjYzJkNzk0ZWFlOGU0YWE4YTY5YWM0Y2VjNjE0ZmEwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0yMDksNyArMjA5LDExIEBAIGNvbnN0 IGNoYXIqIHBhZ2VHcm91cE5hbWUgPSAiZGVmYXVsdCI7CiAKIC8vIFVzZWQgdG8gZGVmZXIgYWxs IHBhZ2UgYWN0aXZpdHkgaW4gY2FzZXMgd2hlcmUgdGhlIGVtYmVkZGVyIHdpc2hlcyB0byBydW4K IC8vIGEgbmVzdGVkIGV2ZW50IGxvb3AuIFVzaW5nIGEgc3RhY2sgZW5hYmxlcyBuZXN0aW5nIG9m IG1lc3NhZ2UgbG9vcCBpbnZvY2F0aW9ucy4KLXN0YXRpYyBWZWN0b3I8UGFnZUdyb3VwTG9hZERl ZmVycmVyKj4gcGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2s7CitzdGF0aWMgVmVjdG9yPFBhZ2VH cm91cExvYWREZWZlcnJlcio+JiBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpCit7CisgICAg REVGSU5FX1NUQVRJQ19MT0NBTChWZWN0b3I8UGFnZUdyb3VwTG9hZERlZmVycmVyKj4sIGRlZmVy cmVyU3RhY2ssICgpKTsKKyAgICByZXR1cm4gZGVmZXJyZXJTdGFjazsKK30KIAogLy8gRW5zdXJl IHRoYXQgdGhlIFdlYkRyYWdPcGVyYXRpb24gZW51bSB2YWx1ZXMgc3RheSBpbiBzeW5jIHdpdGgg dGhlIG9yaWdpbmFsCiAvLyBEcmFnT3BlcmF0aW9uIGNvbnN0YW50cy4KQEAgLTI2NiwxOSArMjcw LDE5IEBAIHZvaWQgV2ViVmlldzo6d2lsbEVudGVyTW9kYWxMb29wKCkKICAgICBBU1NFUlQocGFn ZUdyb3VwKTsKIAogICAgIGlmIChwYWdlR3JvdXAtPnBhZ2VzKCkuaXNFbXB0eSgpKQotICAgICAg ICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjay5hcHBlbmQoc3RhdGljX2Nhc3Q8UGFnZUdyb3Vw TG9hZERlZmVycmVyKj4oMCkpOworICAgICAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygp LmFwcGVuZChzdGF0aWNfY2FzdDxQYWdlR3JvdXBMb2FkRGVmZXJyZXIqPigwKSk7CiAgICAgZWxz ZSB7CiAgICAgICAgIC8vIFBpY2sgYW55IHBhZ2UgaW4gdGhlIHBhZ2UgZ3JvdXAgc2luY2Ugd2Ug YXJlIGRlZmVycmluZyBhbGwgcGFnZXMuCi0gICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0 YWNrLmFwcGVuZChuZXcgUGFnZUdyb3VwTG9hZERlZmVycmVyKCpwYWdlR3JvdXAtPnBhZ2VzKCku YmVnaW4oKSwgdHJ1ZSkpOworICAgICAgICBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpLmFw cGVuZChuZXcgUGFnZUdyb3VwTG9hZERlZmVycmVyKCpwYWdlR3JvdXAtPnBhZ2VzKCkuYmVnaW4o KSwgdHJ1ZSkpOwogICAgIH0KIH0KIAogdm9pZCBXZWJWaWV3OjpkaWRFeGl0TW9kYWxMb29wKCkK IHsKLSAgICBBU1NFUlQocGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2suc2l6ZSgpKTsKKyAgICBB U1NFUlQocGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2soKS5zaXplKCkpOwogCi0gICAgZGVsZXRl IHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrLmxhc3QoKTsKLSAgICBwYWdlR3JvdXBMb2FkRGVm ZXJyZXJTdGFjay5yZW1vdmVMYXN0KCk7CisgICAgZGVsZXRlIHBhZ2VHcm91cExvYWREZWZlcnJl clN0YWNrKCkubGFzdCgpOworICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkucmVtb3Zl TGFzdCgpOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjppbml0aWFsaXplTWFpbkZyYW1lKFdlYkZy YW1lQ2xpZW50KiBmcmFtZUNsaWVudCkK 114816 2011-11-11 20:20:49 -0800 2011-11-11 21:24:24 -0800 Patch bug-72146-20111111202050.patch text/plain 13190 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JmZThmYzg2MzUwOGNm YzZmOTRjYjExOWU3NGQ3YWYyODA4ODFiMi4uMDUwZTZjYmY2MzA5MzBhMTUzOGU5ZDA5MjIxOTlk ZWM5NjE5Mzc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTExLTExICBOaWNv IFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92 ZSAyIHN0YXRpYyBpbml0aWFsaXplcnMgYW5kIDMgZXhpdCB0aW1lIGRlc3RydWN0b3JzLiBUdXJu IG9uIC1XZXhpdC10aW1lLWRlc3RydWN0b3JzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNDYKKworICAgICAgICBSZXZpZXdlZCBieSBOYXRlIENo YXBpbi4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwOgorCiAyMDExLTExLTEx ICBBbm5hIENhdmVuZGVyICA8YW5uYWNjQGNocm9taXVtLm9yZz4KIAogICAgICAgICBTdG9yYWdl IGFuZCByZXRyaWV2YWwgb2YgVGV4dFRyYWNrQ3VlcyBkdXJpbmcgdmlkZW8gcGxheWJhY2ssIGlu Y2x1ZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA1MzcxMTFhZGI5Y2RmNTliOTcz Mzk3MzQ5MGU2NzhiMTRlNzg3MmQzLi40MTMyYWM5YWQ0ODVjZDUyOTNiMjIzOTRiYzE4OTE4YzM0 ODU5ZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEx LTExLTExICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hy b21pdW1dIFJlbW92ZSAyIHN0YXRpYyBpbml0aWFsaXplcnMgYW5kIDMgZXhpdCB0aW1lIGRlc3Ry dWN0b3JzLiBUdXJuIG9uIC1XZXhpdC10aW1lLWRlc3RydWN0b3JzLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOYXRlIENoYXBpbi4KKworICAgICAgICAqIFdlYktpdC5neXA6CisgICAgICAgICogc3Jj L0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RGVidWdnZXJBZ2Vu dE1hbmFnZXI6OmRlYnVnSG9zdERpc3BhdGNoSGFuZGxlcik6CisgICAgICAgIChXZWJLaXQ6OkRl YnVnZ2VyQWdlbnRNYW5hZ2VyOjpvbldlYlZpZXdDbG9zZWQpOgorICAgICAgICAqIHNyYy9EZWJ1 Z2dlckFnZW50TWFuYWdlci5oOgorICAgICAgICAqIHNyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQWNjZXNzaWJpbGl0eU9iamVjdDo6a2V5Ym9hcmRT aG9ydGN1dCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6cGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3 Ojp3aWxsRW50ZXJNb2RhbExvb3ApOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpkaWRFeGl0 TW9kYWxMb29wKToKKwogMjAxMS0xMS0xMSAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFJvbGxlZCBERVBTLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lmd5cC9XZWJDb3JlLmd5cAppbmRleCBlMTUzOGMwZGE1NGI4Mzc3OWM3OGY1ZTVkYjBkOGM0NWI0 NTZhMmRjLi4xOWM1NDcyMTcxOTIxOWM4YWIxYmNlYzI3MGU2OGNlZDY1MWUxZWMxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtOTgxLDYgKzk4MSw3IEBACiAgICAg ewogICAgICAgJ3RhcmdldF9uYW1lJzogJ3dlYmNvcmVfYmluZGluZ3MnLAogICAgICAgJ3R5cGUn OiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90 aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAgICdoYXJkX2RlcGVuZGVuY3knOiAxLAogICAg ICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfYmluZGluZ3Nfc291cmNlcycs CkBAIC0xMzM5LDYgKzEzNDAsNyBAQAogICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3ZWJj b3JlX2RvbScsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAndmFyaWFi bGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAgJ2Rl cGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAgICBd LApAQCAtMTM2MSw2ICsxMzYzLDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAnd2Vi Y29yZV9odG1sJywKICAgICAgICd0eXBlJzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJp YWJsZXMnOiB7ICdlbmFibGVfd2V4aXRfdGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAn ZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAnd2ViY29yZV9wcmVyZXF1aXNpdGVzJywKICAgICAg IF0sCkBAIC0xMzc1LDYgKzEzNzgsNyBAQAogICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3 ZWJjb3JlX3N2ZycsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAgICAndmFy aWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAogICAgICAg J2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlzaXRlcycsCiAgICAg ICBdLApAQCAtMTM4OSw2ICsxMzkzLDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAn d2ViY29yZV9wbGF0Zm9ybScsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCisgICAg ICAndmFyaWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAxLCB9LAog ICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlzaXRlcycs CiAgICAgICBdLApAQCAtMTYzNSw2ICsxNjQwLDcgQEAKICAgICB7CiAgICAgICAndGFyZ2V0X25h bWUnOiAnd2ViY29yZV9hcm1fbmVvbicsCiAgICAgICAndHlwZSc6ICdzdGF0aWNfbGlicmFyeScs CisgICAgICAndmFyaWFibGVzJzogeyAnZW5hYmxlX3dleGl0X3RpbWVfZGVzdHJ1Y3RvcnMnOiAx LCB9LAogICAgICAgJ2RlcGVuZGVuY2llcyc6IFsKICAgICAgICAgJ3dlYmNvcmVfcHJlcmVxdWlz aXRlcycsCiAgICAgICBdLApAQCAtMTY1OSw2ICsxNjY1LDcgQEAKICAgICB7CiAgICAgICAndGFy Z2V0X25hbWUnOiAnd2ViY29yZV9yZW5kZXJpbmcnLAogICAgICAgJ3R5cGUnOiAnc3RhdGljX2xp YnJhcnknLAorICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ2VuYWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0 b3JzJzogMSwgfSwKICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCiAgICAgICAgICd3ZWJjb3JlX3By ZXJlcXVpc2l0ZXMnLAogICAgICAgXSwKQEAgLTE3MTcsNiArMTcyNCw3IEBACiAgICAgewogICAg ICAgJ3RhcmdldF9uYW1lJzogJ3dlYmNvcmVfcmVtYWluaW5nJywKICAgICAgICd0eXBlJzogJ3N0 YXRpY19saWJyYXJ5JywKKyAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVfd2V4aXRfdGltZV9k ZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAnZGVwZW5kZW5jaWVzJzogWwogICAgICAgICAnd2Vi Y29yZV9wcmVyZXF1aXNpdGVzJywKICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvdGhpcmRf cGFydHkvdjgtaTE4bi9idWlsZC9hbGwuZ3lwOnY4LWkxOG4nLApAQCAtMTkzMyw2ICsxOTQxLDcg QEAKICAgICB7CiAgICAgICAndGFyZ2V0X25hbWUnOiAnd2ViY29yZV90ZXN0X3N1cHBvcnQnLAog ICAgICAgJ3R5cGUnOiAnc3RhdGljX2xpYnJhcnknLAorICAgICAgJ3ZhcmlhYmxlcyc6IHsgJ2Vu YWJsZV93ZXhpdF90aW1lX2Rlc3RydWN0b3JzJzogMSwgfSwKICAgICAgICdkZXBlbmRlbmNpZXMn OiBbCiAgICAgICAgICd3ZWJjb3JlJywKICAgICAgIF0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW0uY3BwCmlu ZGV4IDI0YjNlMThlZjQ1YmM1NzI1MzdkZTIyYWQ5ZTEyNTAxNzI4MDZmMzkuLmY4Y2IyODE1NDg2 MWUwMWRhNzExMjQ5MjBjNjBkMDZhMzdlOWExODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW0uY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW0uY3BwCkBA IC0xMTQsNyArMTE0LDcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUNocm9taXVtOjpwYWludFRpY2tt YXJrcyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIFNjcm9sbGJhcioKICAgICAgICAgcmV0dXJu OwogCiAgICAgLy8gR2V0IHRoZSBpbWFnZSBmb3IgdGhlIHRpY2ttYXJrcy4KLSAgICBzdGF0aWMg UmVmUHRyPEltYWdlPiBkYXNoID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJ0aWNrbWFy a0Rhc2giKTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFJlZlB0cjxJbWFnZT4sIGRhc2gsIChJ bWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoInRpY2ttYXJrRGFzaCIpKSk7CiAgICAgaWYgKGRh c2gtPmlzTnVsbCgpKSB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBy ZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3Jv bGxiYXJUaGVtZUNocm9taXVtTGludXguY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcAppbmRleCBlYTM0YTE0MmIzZmVm MGE2ZGEwZWY5MzJkYzUxYmNjZWUzZThjYWRmLi5lYzY4NDA3ZTlkOGMzMmUzMGQzMTBkMmU1MDU4 YzJkYTdkYmRlY2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXguY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKQEAgLTM5LDcg KzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTY3JvbGxiYXJUaGVtZSogU2Nyb2xsYmFy VGhlbWU6Om5hdGl2ZVRoZW1lKCkKIHsKLSAgICBzdGF0aWMgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1 bUxpbnV4IHRoZW1lOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoU2Nyb2xsYmFyVGhlbWVDaHJv bWl1bUxpbnV4LCB0aGVtZSwgKCkpOwogICAgIHJldHVybiAmdGhlbWU7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxp bnV4LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRD YWNoZUxpbnV4LmNwcAppbmRleCA3MjRlNWU5ZWJiMGRmOTA1NTAwMzAzMGE0OGFkYjEyMDFmOWM2 M2ZiLi40ZGQ2NjBkYWYyZGE3MmFiMTI3ZGU3ZDBhYTk3NzRjYmYwMTVhMDM0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51 eC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRm9u dENhY2hlTGludXguY3BwCkBAIC03NCw5ICs3NCw5IEBAIFNpbXBsZUZvbnREYXRhKiBGb250Q2Fj aGU6OmdldFNpbWlsYXJGb250UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnQmIGZvbnQpCiAKIFNpbXBs ZUZvbnREYXRhKiBGb250Q2FjaGU6OmdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoY29uc3QgRm9u dERlc2NyaXB0aW9uJiBkZXNjcmlwdGlvbiwgU2hvdWxkUmV0YWluIHNob3VsZFJldGFpbikKIHsK LSAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nIHNhbnNTdHIoIlNhbnMiKTsKLSAgICBzdGF0 aWMgY29uc3QgQXRvbWljU3RyaW5nIHNlcmlmU3RyKCJTZXJpZiIpOwotICAgIHN0YXRpYyBjb25z dCBBdG9taWNTdHJpbmcgbW9ub3NwYWNlU3RyKCJNb25vc3BhY2UiKTsKKyAgICBERUZJTkVfU1RB VElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgc2Fuc1N0ciwgKCJTYW5zIikpOworICAgIERF RklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBzZXJpZlN0ciwgKCJTZXJpZiIp KTsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgbW9ub3NwYWNl U3RyLCAoIk1vbm9zcGFjZSIpKTsKIAogICAgIEZvbnRQbGF0Zm9ybURhdGEqIGZvbnRQbGF0Zm9y bURhdGEgPSAwOwogICAgIHN3aXRjaCAoZGVzY3JpcHRpb24uZ2VuZXJpY0ZhbWlseSgpKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL1dlYktpdC5neXAKaW5kZXggMDllYzg2MDNmNzNiMTY0ZjhhMGRiNzZiNGVi NDA4MjA4NDc3YzM0MS4uM2FjMTg1ODY0MDEyMTU2NDgwOTcwNjY2MDk4NzEzMmQ2M2JiMGUyYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cApAQCAtNjYsNiArNjYsNyBAQAogICAgICAgICB7 CiAgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnd2Via2l0JywKICAgICAgICAgICAgICd0eXBl JzogJ3N0YXRpY19saWJyYXJ5JywKKyAgICAgICAgICAgICd2YXJpYWJsZXMnOiB7ICdlbmFibGVf d2V4aXRfdGltZV9kZXN0cnVjdG9ycyc6IDEsIH0sCiAgICAgICAgICAgICAnbXN2c19ndWlkJzog JzVFQ0VDOUU1LThGMjMtNDdCNi05M0UwLUMzQjMyOEIzQkU2NScsCiAgICAgICAgICAgICAnZGVw ZW5kZW5jaWVzJzogWwogICAgICAgICAgICAgICAgICcuLi8uLi9XZWJDb3JlL1dlYkNvcmUuZ3lw L1dlYkNvcmUuZ3lwOndlYmNvcmUnLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuY3BwCmluZGV4IDM2OGI3OGNmMzY1NDBjODRhODI2MzYy MWJjOTE2OWI0MzViYTFmMTAuLjBjZWJiZjQ5YTc1NmZhMGU2ZDNhN2FhNjMzNjc3ZTQ5MWQ3Y2U1 NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRN YW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50 TWFuYWdlci5jcHAKQEAgLTQ5LDEwICs0OSwxMCBAQCBXZWJEZXZUb29sc0FnZW50OjpNZXNzYWdl TG9vcERpc3BhdGNoSGFuZGxlciBEZWJ1Z2dlckFnZW50TWFuYWdlcjo6c19tZXNzYWdlTG9vcAog CiBib29sIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpzX2luSG9zdERpc3BhdGNoSGFuZGxlciA9IGZh bHNlOwogCi1EZWJ1Z2dlckFnZW50TWFuYWdlcjo6RGVmZXJyZXJzTWFwIERlYnVnZ2VyQWdlbnRN YW5hZ2VyOjpzX3BhZ2VEZWZlcnJlcnM7Ci0KIGJvb2wgRGVidWdnZXJBZ2VudE1hbmFnZXI6OnNf ZXhwb3NlVjhEZWJ1Z2dlclByb3RvY29sID0gZmFsc2U7CiAKK3R5cGVkZWYgSGFzaE1hcDxXZWJW aWV3SW1wbCosIFdlYkNvcmU6OlBhZ2VHcm91cExvYWREZWZlcnJlcio+IERlZmVycmVyc01hcDsK KwogbmFtZXNwYWNlIHsKIAogY2xhc3MgQ2FsbGVySWRXcmFwcGVyIDogcHVibGljIHY4OjpEZWJ1 Zzo6Q2xpZW50RGF0YSB7CkBAIC03MCw2ICs3MCwxMiBAQCBwcml2YXRlOgogICAgIGludCBtX2Nh bGxlcklkOwogfTsKIAorRGVmZXJyZXJzTWFwJiBwYWdlRGVmZXJyZXJzKCkKK3sKKyAgICBERUZJ TkVfU1RBVElDX0xPQ0FMKERlZmVycmVyc01hcCwgZGVmZXJyZXJzLCAoKSk7CisgICAgcmV0dXJu IGRlZmVycmVyczsKK30KKwogfSAvLyBuYW1lc3BhY2UKIAogCkBAIC04Nyw3ICs5Myw3IEBAIHZv aWQgRGVidWdnZXJBZ2VudE1hbmFnZXI6OmRlYnVnSG9zdERpc3BhdGNoSGFuZGxlcigpCiAgICAg Ly8gMS4gRGlzYWJsZSBhY3RpdmUgb2JqZWN0cyBhbmQgaW5wdXQgZXZlbnRzLgogICAgIGZvciAo QXR0YWNoZWRBZ2VudHNNYXA6Oml0ZXJhdG9yIGl0ID0gc19hdHRhY2hlZEFnZW50c01hcC0+YmVn aW4oKTsgaXQgIT0gc19hdHRhY2hlZEFnZW50c01hcC0+ZW5kKCk7ICsraXQpIHsKICAgICAgICAg RGVidWdnZXJBZ2VudEltcGwqIGFnZW50ID0gaXQtPnNlY29uZDsKLSAgICAgICAgc19wYWdlRGVm ZXJyZXJzLnNldChhZ2VudC0+d2ViVmlldygpLCBuZXcgV2ViQ29yZTo6UGFnZUdyb3VwTG9hZERl ZmVycmVyKGFnZW50LT5wYWdlKCksIHRydWUpKTsKKyAgICAgICAgcGFnZURlZmVycmVycygpLnNl dChhZ2VudC0+d2ViVmlldygpLCBuZXcgV2ViQ29yZTo6UGFnZUdyb3VwTG9hZERlZmVycmVyKGFn ZW50LT5wYWdlKCksIHRydWUpKTsKICAgICAgICAgdmlld3MuYXBwZW5kKGFnZW50LT53ZWJWaWV3 KCkpOwogICAgICAgICBhZ2VudC0+d2ViVmlldygpLT5zZXRJZ25vcmVJbnB1dEV2ZW50cyh0cnVl KTsKICAgICB9CkBAIC05NywxMyArMTAzLDEzIEBAIHZvaWQgRGVidWdnZXJBZ2VudE1hbmFnZXI6 OmRlYnVnSG9zdERpc3BhdGNoSGFuZGxlcigpCiAKICAgICAvLyAzLiBCcmluZyB0aGluZ3MgYmFj ay4KICAgICBmb3IgKFZlY3RvcjxXZWJWaWV3SW1wbCo+OjppdGVyYXRvciBpdCA9IHZpZXdzLmJl Z2luKCk7IGl0ICE9IHZpZXdzLmVuZCgpOyArK2l0KSB7Ci0gICAgICAgIGlmIChzX3BhZ2VEZWZl cnJlcnMuY29udGFpbnMoKml0KSkgeworICAgICAgICBpZiAocGFnZURlZmVycmVycygpLmNvbnRh aW5zKCppdCkpIHsKICAgICAgICAgICAgIC8vIFRoZSB2aWV3IHdhcyBub3QgY2xvc2VkIGR1cmlu ZyB0aGUgZGlzcGF0Y2guCiAgICAgICAgICAgICAoKml0KS0+c2V0SWdub3JlSW5wdXRFdmVudHMo ZmFsc2UpOwogICAgICAgICB9CiAgICAgfQotICAgIGRlbGV0ZUFsbFZhbHVlcyhzX3BhZ2VEZWZl cnJlcnMpOwotICAgIHNfcGFnZURlZmVycmVycy5jbGVhcigpOworICAgIGRlbGV0ZUFsbFZhbHVl cyhwYWdlRGVmZXJyZXJzKCkpOworICAgIHBhZ2VEZWZlcnJlcnMoKS5jbGVhcigpOwogCiAgICAg c19pbkhvc3REaXNwYXRjaEhhbmRsZXIgPSBmYWxzZTsKICAgICBpZiAoIXNfYXR0YWNoZWRBZ2Vu dHNNYXApIHsKQEAgLTI2MCw5ICsyNjYsOSBAQCB2b2lkIERlYnVnZ2VyQWdlbnRNYW5hZ2VyOjpz ZXRIb3N0SWQoV2ViRnJhbWVJbXBsKiB3ZWJmcmFtZSwgaW50IGhvc3RJZCkKIAogdm9pZCBEZWJ1 Z2dlckFnZW50TWFuYWdlcjo6b25XZWJWaWV3Q2xvc2VkKFdlYlZpZXdJbXBsKiB3ZWJ2aWV3KQog ewotICAgIGlmIChzX3BhZ2VEZWZlcnJlcnMuY29udGFpbnMod2VidmlldykpIHsKLSAgICAgICAg ZGVsZXRlIHNfcGFnZURlZmVycmVycy5nZXQod2Vidmlldyk7Ci0gICAgICAgIHNfcGFnZURlZmVy cmVycy5yZW1vdmUod2Vidmlldyk7CisgICAgaWYgKHBhZ2VEZWZlcnJlcnMoKS5jb250YWlucyh3 ZWJ2aWV3KSkgeworICAgICAgICBkZWxldGUgcGFnZURlZmVycmVycygpLmdldCh3ZWJ2aWV3KTsK KyAgICAgICAgcGFnZURlZmVycmVycygpLnJlbW92ZSh3ZWJ2aWV3KTsKICAgICB9CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2Vy LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9EZWJ1Z2dlckFnZW50TWFuYWdlci5oCmlu ZGV4IGEzMjMzMTFmNTUyN2RiNWM3OWEwZmIxMmFmMTU2ZTY2OGVlYzliMTIuLjc4NjRjMmU0ZDQ0 NWNiMTg3MmRiNzk0ZjViOTc4MTZiMWE0NjFhYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL0RlYnVnZ2VyQWdlbnRNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvRGVidWdnZXJBZ2VudE1hbmFnZXIuaApAQCAtOTksOCArOTksNiBAQCBwcml2 YXRlOgogCiAgICAgc3RhdGljIFdlYkRldlRvb2xzQWdlbnQ6Ok1lc3NhZ2VMb29wRGlzcGF0Y2hI YW5kbGVyIHNfbWVzc2FnZUxvb3BEaXNwYXRjaEhhbmRsZXI7CiAgICAgc3RhdGljIGJvb2wgc19p bkhvc3REaXNwYXRjaEhhbmRsZXI7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFdlYlZpZXdJbXBsKiwg V2ViQ29yZTo6UGFnZUdyb3VwTG9hZERlZmVycmVyKj4gRGVmZXJyZXJzTWFwOwotICAgIHN0YXRp YyBEZWZlcnJlcnNNYXAgc19wYWdlRGVmZXJyZXJzOwogCiAgICAgc3RhdGljIGJvb2wgc19leHBv c2VWOERlYnVnZ2VyUHJvdG9jb2w7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRleCA4ZGY5MDBhMWQwZmVmYmQx ZDhhZGMxY2I2YzA0ZDE4MDdmZDFiNzNhLi43ZmM5NjQ0NjEyYTE2NTQxZWQ1YWNjOWIzMzY3OWQ1 MjIxZWIwOWJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJBY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0LmNwcApAQCAtNTUxLDcgKzU1MSw3IEBAIFdlYlN0cmluZyBXZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0OjprZXlib2FyZFNob3J0Y3V0KCkgY29uc3QKICAgICBpZiAoYWNj ZXNzS2V5LmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gV2ViU3RyaW5nKCk7CiAKLSAgICBzdGF0 aWMgU3RyaW5nIG1vZGlmaWVyU3RyaW5nOworICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5n LCBtb2RpZmllclN0cmluZywgKCkpOwogICAgIGlmIChtb2RpZmllclN0cmluZy5pc051bGwoKSkg ewogICAgICAgICB1bnNpZ25lZCBtb2RpZmllcnMgPSBFdmVudEhhbmRsZXI6OmFjY2Vzc0tleU1v ZGlmaWVycygpOwogICAgICAgICAvLyBGb2xsb3cgdGhlIHNhbWUgb3JkZXIgYXMgTW96aWxsYSBN U0FBIGltcGxlbWVudGF0aW9uOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IGZlZGQ2ZjA4NDk4NzZjZjAyMmQxZGQ0YjJiZDU1MzhiZmQ0MDYyMmUuLmQ0 ZDQ5MzY1ZmNjMmQ3OTRlYWU4ZTRhYThhNjlhYzRjZWM2MTRmYTAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTIwOSw3ICsyMDksMTEgQEAgY29uc3Qg Y2hhciogcGFnZUdyb3VwTmFtZSA9ICJkZWZhdWx0IjsKIAogLy8gVXNlZCB0byBkZWZlciBhbGwg cGFnZSBhY3Rpdml0eSBpbiBjYXNlcyB3aGVyZSB0aGUgZW1iZWRkZXIgd2lzaGVzIHRvIHJ1bgog Ly8gYSBuZXN0ZWQgZXZlbnQgbG9vcC4gVXNpbmcgYSBzdGFjayBlbmFibGVzIG5lc3Rpbmcgb2Yg bWVzc2FnZSBsb29wIGludm9jYXRpb25zLgotc3RhdGljIFZlY3RvcjxQYWdlR3JvdXBMb2FkRGVm ZXJyZXIqPiBwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjazsKK3N0YXRpYyBWZWN0b3I8UGFnZUdy b3VwTG9hZERlZmVycmVyKj4mIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkKK3sKKyAgICBE RUZJTkVfU1RBVElDX0xPQ0FMKFZlY3RvcjxQYWdlR3JvdXBMb2FkRGVmZXJyZXIqPiwgZGVmZXJy ZXJTdGFjaywgKCkpOworICAgIHJldHVybiBkZWZlcnJlclN0YWNrOworfQogCiAvLyBFbnN1cmUg dGhhdCB0aGUgV2ViRHJhZ09wZXJhdGlvbiBlbnVtIHZhbHVlcyBzdGF5IGluIHN5bmMgd2l0aCB0 aGUgb3JpZ2luYWwKIC8vIERyYWdPcGVyYXRpb24gY29uc3RhbnRzLgpAQCAtMjY2LDE5ICsyNzAs MTkgQEAgdm9pZCBXZWJWaWV3Ojp3aWxsRW50ZXJNb2RhbExvb3AoKQogICAgIEFTU0VSVChwYWdl R3JvdXApOwogCiAgICAgaWYgKHBhZ2VHcm91cC0+cGFnZXMoKS5pc0VtcHR5KCkpCi0gICAgICAg IHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrLmFwcGVuZChzdGF0aWNfY2FzdDxQYWdlR3JvdXBM b2FkRGVmZXJyZXIqPigwKSk7CisgICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCku YXBwZW5kKHN0YXRpY19jYXN0PFBhZ2VHcm91cExvYWREZWZlcnJlcio+KDApKTsKICAgICBlbHNl IHsKICAgICAgICAgLy8gUGljayBhbnkgcGFnZSBpbiB0aGUgcGFnZSBncm91cCBzaW5jZSB3ZSBh cmUgZGVmZXJyaW5nIGFsbCBwYWdlcy4KLSAgICAgICAgcGFnZUdyb3VwTG9hZERlZmVycmVyU3Rh Y2suYXBwZW5kKG5ldyBQYWdlR3JvdXBMb2FkRGVmZXJyZXIoKnBhZ2VHcm91cC0+cGFnZXMoKS5i ZWdpbigpLCB0cnVlKSk7CisgICAgICAgIHBhZ2VHcm91cExvYWREZWZlcnJlclN0YWNrKCkuYXBw ZW5kKG5ldyBQYWdlR3JvdXBMb2FkRGVmZXJyZXIoKnBhZ2VHcm91cC0+cGFnZXMoKS5iZWdpbigp LCB0cnVlKSk7CiAgICAgfQogfQogCiB2b2lkIFdlYlZpZXc6OmRpZEV4aXRNb2RhbExvb3AoKQog ewotICAgIEFTU0VSVChwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjay5zaXplKCkpOworICAgIEFT U0VSVChwYWdlR3JvdXBMb2FkRGVmZXJyZXJTdGFjaygpLnNpemUoKSk7CiAKLSAgICBkZWxldGUg cGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2subGFzdCgpOwotICAgIHBhZ2VHcm91cExvYWREZWZl cnJlclN0YWNrLnJlbW92ZUxhc3QoKTsKKyAgICBkZWxldGUgcGFnZUdyb3VwTG9hZERlZmVycmVy U3RhY2soKS5sYXN0KCk7CisgICAgcGFnZUdyb3VwTG9hZERlZmVycmVyU3RhY2soKS5yZW1vdmVM YXN0KCk7CiB9CiAKIHZvaWQgV2ViVmlld0ltcGw6OmluaXRpYWxpemVNYWluRnJhbWUoV2ViRnJh bWVDbGllbnQqIGZyYW1lQ2xpZW50KQo=