107391 2013-01-19 19:35:58 -0800 Fix disambiguation popup for new-style page scale 2013-01-28 23:31:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107424 0 trchen webkit-unassigned abarth aelias dglazkov eric fishd jamesr japhet ojan.autocc peter+ews simon.fraser tkent+wkapi webkit.review.bot oldest_to_newest 811539 0 trchen 2013-01-19 19:35:58 -0800 Fix disambiguation popup for new-style page scale 811540 1 183653 trchen 2013-01-19 19:41:03 -0800 Created attachment 183653 Patch 811541 2 webkit.review.bot 2013-01-19 19:43:59 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 811542 3 183653 webkit.review.bot 2013-01-19 19:50:02 -0800 Comment on attachment 183653 Patch Attachment 183653 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/15970434 811545 4 183653 peter+ews 2013-01-19 20:03:59 -0800 Comment on attachment 183653 Patch Attachment 183653 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/15972426 811576 5 183653 abarth 2013-01-20 00:28:00 -0800 Comment on attachment 183653 Patch Can we test this change? Also, it looks like you're failing the Chromium EWS bots. 813557 6 184077 trchen 2013-01-22 16:46:43 -0800 Created attachment 184077 Patch 813562 7 184081 trchen 2013-01-22 16:50:42 -0800 Created attachment 184081 Patch 818478 8 185148 trchen 2013-01-28 21:29:05 -0800 Created attachment 185148 Patch 818480 9 trchen 2013-01-28 21:29:45 -0800 Changes from last patch: * Added WebFrameTest.DisambiguationPopupPageScale unit test * Rebased 818482 10 185148 abarth 2013-01-28 21:32:51 -0800 Comment on attachment 185148 Patch Thanks for the test. 818600 11 185148 webkit.review.bot 2013-01-28 23:30:58 -0800 Comment on attachment 185148 Patch Clearing flags on attachment: 185148 Committed r141062: <http://trac.webkit.org/changeset/141062> 818601 12 webkit.review.bot 2013-01-28 23:31:03 -0800 All reviewed patches have been landed. Closing bug. 183653 2013-01-19 19:41:03 -0800 2013-01-22 16:46:40 -0800 Patch bug-107391-20130119193800.patch text/plain 8880 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBmODlhMmE4YjcyNjA1 NTI5MGNkZmE3MmM0NjMzMzUxZDg5NjJhMTdjLi4wZTFiMDc5ZWE4NzM3MzZlYjBmYmY2MmRiZTE1 YmJkNDRkNWNhZTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0wMS0xOSAg VGllbi1SZW4gQ2hlbiAgPHRyY2hlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGRpc2Ft YmlndWF0aW9uIHBvcHVwIGZvciBuZXctc3R5bGUgcGFnZSBzY2FsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MzkxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB2YXJp b3VzIGNvb3JkaW5hdGUgY29udmVyc2lvbiBmb3IgZGlzYW1iaWd1YXRpb24KKyAgICAgICAgcG9w dXAgZm9yIHRoZSBuZXctc3R5bGUgcGFnZSBzY2FsZSBtb2RlLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaDoKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcp OgorCiAyMDEzLTAxLTEwICBUb21teSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgog CiAgICAgICAgIE1lZGlhU3RyZWFtIEFQSTogQWRkaW5nIHRoZSBuZXcgaWQgYXR0cmlidXRlIHRv IE1lZGlhU3RyZWFtIGFuZCBNZWRpYVN0cmVhbVRyYWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2FlMmQxOGIy NjVmZTEwNjUxZDYwNDZlYjVmNTczMDY3MjlmOGNlNi4uYzNiMjcxNzZmZGMxMTcwYTM1YjE3MmU5 OTk3YTgzMmViZWIwMGIwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTE5 ICBUaWVuLVJlbiBDaGVuICA8dHJjaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggZGlz YW1iaWd1YXRpb24gcG9wdXAgZm9yIG5ldy1zdHlsZSBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDczOTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvcnJlY3RzIHZh cmlvdXMgY29vcmRpbmF0ZSBjb252ZXJzaW9uIGZvciBkaXNhbWJpZ3VhdGlvbgorICAgICAgICBw b3B1cCBmb3IgdGhlIG5ldy1zdHlsZSBwYWdlIHNjYWxlIG1vZGUuCisKKyAgICAgICAgTmVlZCB0 byB1cGRhdGUgZXhpc3RpbmcgdGVzdCB0byB1c2UgdGhlIG5ldyBzY2FsaW5nIG1vZGUuCisKKyAg ICAgICAgKiBwYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 ZmluZEdvb2RUb3VjaFRhcmdldHMpOgorICAgICAgICAqIHBhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlv bi5oOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTMtMDEtMTggIEFuZHJleSBBZGFpa2luICA8 YWFuZHJleUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYXJyYXkgZ3Jv dXBpbmcgZG9lcyBub3Qgd29yayBiaWcgc3BhcnNlIGFycmF5cwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZwppbmRleCAyYjZhNTBlMmNmZTRkMGNjZmIxODM5MjM0NDYxZTYwZTBiYTkxNjRjLi4yNzUy ZmQ3ZmQ1NGE1ZjJmMDUyNzRjN2U5ZDYyYjIwOTk1NWU5ZjRkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTAxLTE5ICBUaWVuLVJlbiBDaGVuICA8dHJj aGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggZGlzYW1iaWd1YXRpb24gcG9wdXAgZm9y IG5ldy1zdHlsZSBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDczOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvcnJlY3RzIHZhcmlvdXMgY29vcmRpbmF0ZSBjb252 ZXJzaW9uIGZvciBkaXNhbWJpZ3VhdGlvbgorICAgICAgICBwb3B1cCBmb3IgdGhlIG5ldy1zdHls ZSBwYWdlIHNjYWxlIG1vZGUuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKFdlYlZpZXcpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1w bC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzY3JlZW5Qb2ludEZyb21DbGllbnRQb2ludCk6Cisg ICAgICAgIChXZWJLaXQpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorCiAyMDEzLTAx LTE4ICBTZW9ranUgS3dvbiAgPHNlb2tqdS5rd29uQGdtYWlsLmNvbT4KIAogICAgICAgICBBZGQg ZXhwbGljaXQga2V5d29yZCB0byBjb25zdHJ1Y3RvcnMgaW4gcGxhdGZvcm0tc3BlY2lmaWMgSW5z cGVjdG9yQ2xpZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYkxheWVyVHJlZVZpZXcuaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2Vi TGF5ZXJUcmVlVmlldy5oCmluZGV4IDNmODJiMGJkMGEyN2UyOWRkNWI4M2RlM2M2ZGRiMTdhMTYz ODUxZGIuLmZhZGJmODU3Y2E0MDUwMGZjZTMzMzdhYWI4Y2VkMTBjYjE2MDJiYmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCisr KyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oCkBA IC0xMDYsNiArMTA2LDkgQEAgcHVibGljOgogICAgIC8vIGluIHRoZSBjb21wb3NpdG9yLgogICAg IHZpcnR1YWwgV2ViRmxvYXRQb2ludCBhZGp1c3RFdmVudFBvaW50Rm9yUGluY2hab29tKGNvbnN0 IFdlYkZsb2F0UG9pbnQmKSBjb25zdCA9IDA7CiAKKyAgICAvLyBDb252ZXJ0IGZyb20gY2xpZW50 IGNvb3JkaW5hdGUgdG8gc2NyZWVuIGNvb3JkaW5hdGUuCisgICAgdmlydHVhbCBXZWJGbG9hdFBv aW50IHNjcmVlblBvaW50RnJvbUNsaWVudFBvaW50KGNvbnN0IFdlYkZsb2F0UG9pbnQmKSBjb25z dCA9IDA7CisKICAgICB2aXJ0dWFsIHZvaWQgc2V0RGV2aWNlU2NhbGVGYWN0b3IoZmxvYXQpID0g MDsKICAgICB2aXJ0dWFsIGZsb2F0IGRldmljZVNjYWxlRmFjdG9yKCkgY29uc3QgPSAwOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAppbmRleCA4Y2Y5ZDUw MWNjNTlhM2JmZjE2ZTBlZGU0NzFlMDQyNjJkYTM0NTczLi41Nzg4ZGQwMDA1YTg5YmY0ZGM5MWQ5 ZDg1NmM5ZjU0YTJiYTVlYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNo RGlzYW1iaWd1YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJp Z3VhdGlvbi5jcHAKQEAgLTg2LDE0ICs4NiwxNCBAQCBzdHJ1Y3QgVG91Y2hUYXJnZXREYXRhIHsK ICAgICBmbG9hdCBzY29yZTsKIH07CiAKLXZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3Qg SW50UmVjdCYgdG91Y2hCb3gsIEZyYW1lKiBtYWluRnJhbWUsIGZsb2F0IHBhZ2VTY2FsZUZhY3Rv ciwgVmVjdG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0cykKK3ZvaWQgZmluZEdvb2RUb3VjaFRhcmdl dHMoY29uc3QgSW50UmVjdCYgdG91Y2hCb3gsIEZyYW1lKiBtYWluRnJhbWUsIFZlY3RvcjxJbnRS ZWN0PiYgZ29vZFRhcmdldHMpCiB7CiAgICAgZ29vZFRhcmdldHMuY2xlYXIoKTsKIAogICAgIGlu dCB0b3VjaFBvaW50UGFkZGluZyA9IGNlaWwobWF4KHRvdWNoQm94LndpZHRoKCksIHRvdWNoQm94 LmhlaWdodCgpKSAqIDAuNSk7CiAgICAgLy8gRklYTUU6IFJlY3QtYmFzZWQgaGl0IHRlc3QgZG9l c24ndCB0cmFuc2Zvcm0gdGhlIHRvdWNoIHBvaW50IHNpemUuCi0gICAgLy8gICAgICAgIFdlIGhh dmUgdG8gcHJlLWFwcGx5IHBhZ2Ugc2NhbGUgZmFjdG9yIGhlcmUuCi0gICAgaW50IHBhZGRpbmcg PSBjZWlsKHRvdWNoUG9pbnRQYWRkaW5nIC8gcGFnZVNjYWxlRmFjdG9yKTsKKyAgICAvLyAgICAg ICAgV2UgaGF2ZSB0byBwcmUtYXBwbHkgZnJhbWUgc2NhbGUgZmFjdG9yIGhlcmUuCisgICAgaW50 IHBhZGRpbmcgPSBjZWlsKHRvdWNoUG9pbnRQYWRkaW5nIC8gbWFpbkZyYW1lLT5mcmFtZVNjYWxl RmFjdG9yKCkpOwogCiAgICAgSW50UG9pbnQgdG91Y2hQb2ludCA9IHRvdWNoQm94LmNlbnRlcigp OwogICAgIEludFBvaW50IGNvbnRlbnRzUG9pbnQgPSBtYWluRnJhbWUtPnZpZXcoKS0+d2luZG93 VG9Db250ZW50cyh0b3VjaFBvaW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv VG91Y2hEaXNhbWJpZ3VhdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmln dWF0aW9uLmgKaW5kZXggNWFmZWI2YjViM2RmNDFmMmU1Zjk5OGUwNGMwOGU4NzZmYmY4NGYxZC4u ZTA4Yjk1NGU2YWI0YzJmODVkZGMyYWRmZTBhNDU3YjhkMDNlODMwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmgKQEAgLTM4LDcgKzM4LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogY2xhc3MgRnJhbWU7CiBjbGFzcyBJbnRSZWN0OwogCi12b2lkIGZpbmRHb29k VG91Y2hUYXJnZXRzKGNvbnN0IEludFJlY3QmIHRvdWNoQm94LCBGcmFtZSogbWFpbkZyYW1lLCBm bG9hdCBwYWdlU2NhbGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgZ29vZFRhcmdldHMpOwordm9p ZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0JiB0b3VjaEJveCwgRnJhbWUqIG1h aW5GcmFtZSwgVmVjdG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0cyk7CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2Vi Vmlldy5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IDQ0 OTVhNDQ5M2ViMjM1ZjI5NjMxOTIyOTM0NjY4MzJhMjFkNjA0NWIuLjAxOTUyOGZmMDRjZGI0YmY1 MDU5N2RhNDk4MzY5MjA0MzJkNzc0NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJWaWV3LmgKQEAgLTQ1LDYgKzQ1LDcgQEAgY2xhc3MgV2ViQmF0dGVyeVN0YXR1czsKIGNsYXNz IFdlYkRldlRvb2xzQWdlbnQ7CiBjbGFzcyBXZWJEZXZUb29sc0FnZW50Q2xpZW50OwogY2xhc3Mg V2ViRHJhZ0RhdGE7CitjbGFzcyBXZWJGbG9hdFBvaW50OwogY2xhc3MgV2ViRnJhbWU7CiBjbGFz cyBXZWJGcmFtZUNsaWVudDsKIGNsYXNzIFdlYkdyYXBoaWNzQ29udGV4dDNEOwpAQCAtNTA1LDYg KzUwNiw5IEBAIHB1YmxpYzoKIAogICAgIC8vIFRlc3RpbmcgZnVuY3Rpb25hbGl0eSBmb3IgVGVz dFJ1bm5lciAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAorICAgIC8vIFRlbXBv cmFyeSwgcmVtb3ZlIG1lIGFmdGVyIG93bmVyc2hpcCBvZiB0aGUgY29tcG9zaXRvciBtb3ZlZCB0 byBjaHJvbWl1bSBzaWRlIGh0dHA6Ly9jcmJ1Zy5jb20vMTU2MTc1CisgICAgdmlydHVhbCBXZWJG bG9hdFBvaW50IHNjcmVlblBvaW50RnJvbUNsaWVudFBvaW50KGNvbnN0IFdlYkZsb2F0UG9pbnQm KSBjb25zdCA9IDA7CisKIHByb3RlY3RlZDoKICAgICB+V2ViVmlldygpIHt9CiB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IGExZmM1NjY3M2EwMjM5 MDBiMTY5NDI2YzMwYTliNDg1ZjFlMTBiMWEuLmE5M2M2M2Q3YWUyODE5MTE4ZTU4YzgyMTlhZmJm N2I3NzkwN2NiOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKQEAgLTczOCw3ICs3MzgsNyBAQCBib29sIFdlYlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZl bnQoY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBldmVudCkKICAgICAgICAgaWYgKGV2ZW50LmRhdGEu dGFwLndpZHRoID4gMCkgewogICAgICAgICAgICAgSW50UmVjdCBib3VuZGluZ0JveChldmVudC54 IC0gZXZlbnQuZGF0YS50YXAud2lkdGggLyAyLCBldmVudC55IC0gZXZlbnQuZGF0YS50YXAuaGVp Z2h0IC8gMiwgZXZlbnQuZGF0YS50YXAud2lkdGgsIGV2ZW50LmRhdGEudGFwLmhlaWdodCk7CiAg ICAgICAgICAgICBWZWN0b3I8SW50UmVjdD4gZ29vZFRhcmdldHM7Ci0gICAgICAgICAgICBmaW5k R29vZFRvdWNoVGFyZ2V0cyhib3VuZGluZ0JveCwgbWFpbkZyYW1lSW1wbCgpLT5mcmFtZSgpLCBw YWdlU2NhbGVGYWN0b3IoKSwgZ29vZFRhcmdldHMpOworICAgICAgICAgICAgZmluZEdvb2RUb3Vj aFRhcmdldHMoYm91bmRpbmdCb3gsIG1haW5GcmFtZUltcGwoKS0+ZnJhbWUoKSwgZ29vZFRhcmdl dHMpOwogICAgICAgICAgICAgLy8gRklYTUU6IHJlcGxhY2UgdG91Y2ggYWRqdXN0bWVudCBjb2Rl IHdoZW4gbnVtYmVyT2ZHb29kVGFyZ2V0cyA9PSAxPwogICAgICAgICAgICAgLy8gU2luZ2xlIGNh bmRpZGF0ZSBjYXNlIGlzIGN1cnJlbnRseSBoYW5kbGVkIGJ5OiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMDEKICAgICAgICAgICAgIGlmIChnb29kVGFyZ2V0cy5z aXplKCkgPj0gMiAmJiBtX2NsaWVudCAmJiBtX2NsaWVudC0+ZGlkVGFwTXVsdGlwbGVUYXJnZXRz KGV2ZW50LCBnb29kVGFyZ2V0cykpIHsKQEAgLTIwNzMsNiArMjA3MywxMyBAQCBib29sIFdlYlZp ZXdJbXBsOjpoYW5kbGVJbnB1dEV2ZW50KGNvbnN0IFdlYklucHV0RXZlbnQmIGlucHV0RXZlbnQp CiAgICAgICAgIEludFBvaW50IHRyYW5zZm9ybWVkTG9jYXRpb24gPSByb3VuZGVkSW50UG9pbnQo bV9sYXllclRyZWVWaWV3LT5hZGp1c3RFdmVudFBvaW50Rm9yUGluY2hab29tKFdlYkZsb2F0UG9p bnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1cmVFdmVudC55KSkpOwogICAgICAgICBnZXN0dXJlRXZl bnQueCA9IHRyYW5zZm9ybWVkTG9jYXRpb24ueCgpOwogICAgICAgICBnZXN0dXJlRXZlbnQueSA9 IHRyYW5zZm9ybWVkTG9jYXRpb24ueSgpOworCisgICAgICAgIC8vIEZJWE1FOiBQZXJoYXBzIHdl IG5lZWQgYWRqdXN0RXZlbnRRdWFkRm9yUGluY2hab29tKCk/CisgICAgICAgIGlmIChtX3dlYlNl dHRpbmdzLT5hcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKSB7CisgICAgICAgICAg ICBnZXN0dXJlRXZlbnQuZGF0YS50YXAud2lkdGggLz0gcGFnZVNjYWxlRmFjdG9yKCk7CisgICAg ICAgICAgICBnZXN0dXJlRXZlbnQuZGF0YS50YXAuaGVpZ2h0IC89IHBhZ2VTY2FsZUZhY3Rvcigp OworICAgICAgICB9CisKICAgICAgICAgaW5wdXRFdmVudFRyYW5zZm9ybWVkID0gc3RhdGljX2Nh c3Q8Y29uc3QgV2ViSW5wdXRFdmVudCo+KCZnZXN0dXJlRXZlbnQpOwogICAgIH0KIApAQCAtNDMy OSw0ICs0MzM2LDkgQEAgdm9pZCBXZWJWaWV3SW1wbDo6cG9pbnRlckxvY2tNb3VzZUV2ZW50KGNv bnN0IFdlYklucHV0RXZlbnQmIGV2ZW50KQogfQogI2VuZGlmCiAKK1dlYkZsb2F0UG9pbnQgV2Vi Vmlld0ltcGw6OnNjcmVlblBvaW50RnJvbUNsaWVudFBvaW50KGNvbnN0IFdlYkZsb2F0UG9pbnQm IHBvaW50KSBjb25zdAoreworICAgIHJldHVybiBtX2xheWVyVHJlZVZpZXctPnNjcmVlblBvaW50 RnJvbUNsaWVudFBvaW50KHBvaW50KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCA4MWE0YWI3YjFkNzQzOGJl OGNkNzlhM2ZmMTFhZTNkOGI0ZTdjYmRlLi5iZGVkZjgzZWIxYTlkNzUzNTI0YTRhY2JkOTFhYmRl YTQ2ZTdlNGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAg LTMxNSw2ICszMTUsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBXZWJWaWV3QmVuY2htYXJrU3Vw cG9ydCogYmVuY2htYXJrU3VwcG9ydCgpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRTaG93UGFpbnRS ZWN0cyhib29sKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2hvd0ZQU0NvdW50ZXIoYm9vbCk7Cisg ICAgdmlydHVhbCBXZWJGbG9hdFBvaW50IHNjcmVlblBvaW50RnJvbUNsaWVudFBvaW50KGNvbnN0 IFdlYkZsb2F0UG9pbnQmKSBjb25zdCBPVkVSUklERTsKIAogICAgIC8vIFdlYkxheWVyVHJlZVZp ZXdDbGllbnQKICAgICB2aXJ0dWFsIHZvaWQgd2lsbEJlZ2luRnJhbWUoKTsK 184077 2013-01-22 16:46:43 -0800 2013-01-22 16:50:38 -0800 Patch bug-107391-20130122164337.patch text/plain 28903 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAyNTE4M2ZkNTk5MjFh ZWE4OGI5MzFhMjkzZjg1ZDhlNDZjZjBhYTUxLi5lOWIwNWNkOThjN2EwYWNjOTVmNzFhNmQxYjY4 ZTg4M2ZjNDU3ZDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0wMS0yMiAg VGllbi1SZW4gQ2hlbiAgPHRyY2hlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGRpc2Ft YmlndWF0aW9uIHBvcHVwIGZvciBuZXctc3R5bGUgcGFnZSBzY2FsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MzkxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB2YXJp b3VzIGNvb3JkaW5hdGUgY29udmVyc2lvbiBmb3IgZGlzYW1iaWd1YXRpb24KKyAgICAgICAgcG9w dXAgZm9yIHRoZSBuZXctc3R5bGUgcGFnZSBzY2FsZSBtb2RlLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaDoKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcp OgorCiAyMDEzLTAxLTE4ICBBbGkgSnVtYSAgPGFqdW1hQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIENvbnZlcnQgV2ViVHJhbnNmb3JtT3BlcmF0aW9ucyBpbnRvIHB1cmUgdmly dHVhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDkxMTk2NWNjNTg1NzI4YWViMDA5ODVkY2ZlNjEwOWRjYjRlOTlj MDAuLmYzNmZiZTg3ODVlNWU3ZDY2MjZlZjQzODZhNDM1NzgxOTdkYjY4MzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSw0MSBAQAorMjAxMy0wMS0yMiAgVGllbi1SZW4gQ2hlbiAgPHRyY2hlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgRml4IGRpc2FtYmlndWF0aW9uIHBvcHVwIGZvciBuZXctc3R5 bGUgcGFnZSBzY2FsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA3MzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB2YXJpb3VzIGNvb3JkaW5hdGUgY29udmVyc2lvbiBm b3IgZGlzYW1iaWd1YXRpb24KKyAgICAgICAgcG9wdXAgZm9yIHRoZSBuZXctc3R5bGUgcGFnZSBz Y2FsZSBtb2RlLgorCisgICAgICAgIE5lZWQgdG8gdXBkYXRlIGV4aXN0aW5nIHRlc3QgdG8gdXNl IHRoZSBuZXcgc2NhbGluZyBtb2RlLgorCisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpzYXZlU2Nyb2xs UG9zaXRpb25BbmRWaWV3U3RhdGVUb0l0ZW0pOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rv cik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAg ICAgICAoRnJhbWVWaWV3KToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBwYWdlL1RvdWNoRGlz YW1iaWd1YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmluZEdvb2RUb3VjaFRhcmdldHMp OgorICAgICAgICAqIHBhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5oOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxWaWV3Ojp1bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZSk6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnZpc2libGVDb250ZW50UmVjdCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rvcik6CisgICAgICAgIChTY3JvbGxWaWV3 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3RGlkQ2hhbmdlU2l6 ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVJvb3RM YXllclBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpwcm9jZXNzU3VidHJlZSk6CisKIDIwMTMt MDEtMTggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJld29y ayBOZXR3b3JrUHJvY2VzcyByZXNvdXJjZSBsb2FkIGlkZW50aWZpZXJzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCA4NzZhOTJkODE4ZjdmYjE2MWQ1Mjc1Njk2MzUzZTJkOTVjMjczNjAx Li5mNDdhMmNhY2NiYmMyYjNkM2FiOWRmZmVhNzJjYzQwMjJhZTZhYWFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAxLTIyICBUaWVuLVJlbiBDaGVu ICA8dHJjaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggZGlzYW1iaWd1YXRpb24gcG9w dXAgZm9yIG5ldy1zdHlsZSBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDczOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvcnJlY3RzIHZhcmlvdXMgY29vcmRpbmF0 ZSBjb252ZXJzaW9uIGZvciBkaXNhbWJpZ3VhdGlvbgorICAgICAgICBwb3B1cCBmb3IgdGhlIG5l dy1zdHlsZSBwYWdlIHNjYWxlIG1vZGUuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KToKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNjYWxlZFNpemUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6c2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpyZXNp emUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpjbGFtcE9mZnNldEF0U2NhbGUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9s bE9mZnNldCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRQYWdlU2NhbGVGYWN0 b3IpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dW5zY2FsZWRDb250ZW50c1NpemUp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6bGF5b3V0U2l6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsOjpjb21wdXRlUGFnZVNjYWxlRmFjdG9yTGltaXRzKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjp1cGRhdGVMYXllclRyZWVWaWV3cG9ydCk6CisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmg6CisgICAgICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTMtMDEt MTggIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1d IFJvbGwgQ2hyb21pdW0gREVQUyB0byAxNzc2NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9y bS9jaHJvbWl1bS9wdWJsaWMvV2ViTGF5ZXJUcmVlVmlldy5oIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJMYXllclRyZWVWaWV3LmgKaW5kZXggM2Y4MmIwYmQwYTI3ZTI5ZGQ1 YjgzZGUzYzZkZGIxN2ExNjM4NTFkYi4uZTM3YWQ2NGJkNmJmYTY5YzAyYmE3ZDUxOTRlZDJkMDNi MThiNDZhMiAxMDA2NDQKLS0tIGEvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJM YXllclRyZWVWaWV3LmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJM YXllclRyZWVWaWV3LmgKQEAgLTEwMiwxMCArMTAyLDYgQEAgcHVibGljOgogICAgIC8vIG1vZGUp LgogICAgIHZpcnR1YWwgV2ViU2l6ZSBkZXZpY2VWaWV3cG9ydFNpemUoKSBjb25zdCA9IDA7CiAK LSAgICAvLyBHaXZlcyB0aGUgY29ycmVjdGVkIGxvY2F0aW9uIGZvciBhbiBldmVudCwgYWNjb3Vu dGluZyBmb3IgdGhlIHBpbmNoLXpvb20gdHJhbnNmb3JtYXRpb24KLSAgICAvLyBpbiB0aGUgY29t cG9zaXRvci4KLSAgICB2aXJ0dWFsIFdlYkZsb2F0UG9pbnQgYWRqdXN0RXZlbnRQb2ludEZvclBp bmNoWm9vbShjb25zdCBXZWJGbG9hdFBvaW50JikgY29uc3QgPSAwOwotCiAgICAgdmlydHVhbCB2 b2lkIHNldERldmljZVNjYWxlRmFjdG9yKGZsb2F0KSA9IDA7CiAgICAgdmlydHVhbCBmbG9hdCBk ZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0ID0gMDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9I aXN0b3J5Q29udHJvbGxlci5jcHAKaW5kZXggYTJmNzJkMDhkNWM5ZDU1MGE2MzM4YTkzMjY2OWZk ZjdkNTY4MmE2YS4uMWEzOTI3YmU3ZTlhOGIzNTliYmI0ZDZlZTliOGZhNjg5M2EwNDdhNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCkBAIC04Nyw4ICs4 NywxMiBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpzYXZlU2Nyb2xsUG9zaXRpb25BbmRWaWV3 U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0pCiAgICAgZWxzZQogICAgICAgICBpdGVtLT5z ZXRTY3JvbGxQb2ludChtX2ZyYW1lLT52aWV3KCktPnNjcm9sbFBvc2l0aW9uKCkpOwogCi0gICAg aXRlbS0+c2V0UGFnZVNjYWxlRmFjdG9yKG1fZnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKSk7Ci0g ICAgCisgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAocGFnZSAmJiBw YWdlLT5tYWluRnJhbWUoKSA9PSBtX2ZyYW1lKQorICAgICAgICBpdGVtLT5zZXRQYWdlU2NhbGVG YWN0b3IocGFnZS0+cGFnZVNjYWxlRmFjdG9yKCkpOworICAgIGVsc2UKKyAgICAgICAgaXRlbS0+ c2V0UGFnZVNjYWxlRmFjdG9yKDEpOworCiAgICAgLy8gRklYTUU6IEl0IHdvdWxkIGJlIGdyZWF0 IHRvIHdvcmsgb3V0IGEgd2F5IHRvIHB1dCB0aGlzIGNvZGUgaW4gV2ViQ29yZSBpbnN0ZWFkIG9m IGNhbGxpbmcgdGhyb3VnaCB0byB0aGUgY2xpZW50LgogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5j bGllbnQoKS0+c2F2ZVZpZXdTdGF0ZVRvSXRlbShpdGVtKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAppbmRleCBjMjBiMDM4NzAzN2Y4Mzg0ZDc4YzZjYzA0YmNmMzIzOWNjYzJhOGVjLi5i YWRlMDA5NjE5MWI3ZDMxMGU1NTNmYjU5ZDQ4NzQxZGQ5ZWY1YjhlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCkBAIC0yODA3LDYgKzI4MDcsMTcgQEAgSW50UmVjdCBGcmFtZVZpZXc6Ondp bmRvd1Jlc2l6ZXJSZWN0KCkgY29uc3QKICAgICByZXR1cm4gcGFnZS0+Y2hyb21lKCktPndpbmRv d1Jlc2l6ZXJSZWN0KCk7CiB9CiAKK2Zsb2F0IEZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2Fs ZUZhY3RvcigpIGNvbnN0Cit7CisgICAgaWYgKCFtX2ZyYW1lIHx8ICFtX2ZyYW1lLT5wYWdlKCkp CisgICAgICAgIHJldHVybiAxOworCisgICAgaWYgKCFtX2ZyYW1lLT5zZXR0aW5ncygpLT5hcHBs eVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpIHx8IG1fZnJhbWUgIT0gbV9mcmFtZS0+cGFn ZSgpLT5tYWluRnJhbWUoKSkKKyAgICAgICAgcmV0dXJuIDE7CisKKyAgICByZXR1cm4gbV9mcmFt ZS0+cGFnZSgpLT5wYWdlU2NhbGVGYWN0b3IoKTsKK30KKwogdm9pZCBGcmFtZVZpZXc6OnNldFZp c2libGVTY3JvbGxlclRodW1iUmVjdChjb25zdCBJbnRSZWN0JiBzY3JvbGxlclRodW1iKQogewog ICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApp bmRleCBhOThlODhmMWI1MDRiNjBhZjdmMzkwZWJhMjcxMGFlOWEwYWM2YTVkLi43YWE3MmU1MGRm MGZkM2YzNTY4YjI2Mjg3MDUyODY3MzM4ODExMzY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgK QEAgLTE4Myw2ICsxODMsOCBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIEludFJlY3Qgd2luZG93 UmVzaXplclJlY3QoKSBjb25zdDsKIAorICAgIHZpcnR1YWwgZmxvYXQgdmlzaWJsZUNvbnRlbnRT Y2FsZUZhY3RvcigpIGNvbnN0IE9WRVJSSURFOworCiAgICAgdmlydHVhbCB2b2lkIHNldEZpeGVk VmlzaWJsZUNvbnRlbnRSZWN0KGNvbnN0IEludFJlY3QmKSBPVkVSUklERTsKICAgICB2aXJ0dWFs IHZvaWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmKSBPVkVSUklERTsKICAgICB2 b2lkIHNjcm9sbFBvc2l0aW9uQ2hhbmdlZFZpYVBsYXRmb3JtV2lkZ2V0KCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdl LmNwcAppbmRleCAzYTM5MTk2YWU0ZjZhNDk2N2I3Y2FiMTljMDYxN2ViYTY4ZmU2MTEyLi40Yzcz MWE1ZGM4ZTg5MGUyNmU5YWEyYzlkMGNiNmRmYTQ4MmI0NTg4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAK QEAgLTczMywxMyArNzMzLDE1IEBAIHZvaWQgUGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0 IHNjYWxlLCBjb25zdCBJbnRQb2ludCYgb3JpZ2luKQogCiAgICAgbV9wYWdlU2NhbGVGYWN0b3Ig PSBzY2FsZTsKIAotICAgIGlmIChkb2N1bWVudC0+cmVuZGVyZXIoKSkKLSAgICAgICAgZG9jdW1l bnQtPnJlbmRlcmVyKCktPnNldE5lZWRzTGF5b3V0KHRydWUpOworICAgIGlmICghbV9zZXR0aW5n cy0+YXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkgeworICAgICAgICBpZiAoZG9j dW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgICAgICBkb2N1bWVudC0+cmVuZGVyZXIoKS0+c2V0 TmVlZHNMYXlvdXQodHJ1ZSk7CiAKLSAgICBkb2N1bWVudC0+cmVjYWxjU3R5bGUoTm9kZTo6Rm9y Y2UpOworICAgICAgICBkb2N1bWVudC0+cmVjYWxjU3R5bGUoTm9kZTo6Rm9yY2UpOwogCi0gICAg Ly8gVHJhbnNmb3JtIGNoYW5nZSBvbiBSZW5kZXJWaWV3IGRvZXNuJ3QgdHJpZ2dlciByZXBhaW50 IG9uIG5vbi1jb21wb3NpdGVkIGNvbnRlbnRzLgotICAgIG1haW5GcmFtZSgpLT52aWV3KCktPmlu dmFsaWRhdGVSZWN0KEludFJlY3QoTGF5b3V0UmVjdDo6aW5maW5pdGVSZWN0KCkpKTsKKyAgICAg ICAgLy8gVHJhbnNmb3JtIGNoYW5nZSBvbiBSZW5kZXJWaWV3IGRvZXNuJ3QgdHJpZ2dlciByZXBh aW50IG9uIG5vbi1jb21wb3NpdGVkIGNvbnRlbnRzLgorICAgICAgICBtYWluRnJhbWUoKS0+dmll dygpLT5pbnZhbGlkYXRlUmVjdChJbnRSZWN0KExheW91dFJlY3Q6OmluZmluaXRlUmVjdCgpKSk7 CisgICAgfQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIG1haW5GcmFt ZSgpLT5kZXZpY2VPclBhZ2VTY2FsZUZhY3RvckNoYW5nZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uY3BwCmluZGV4IDhjZjlkNTAxY2M1OWEzYmZmMTZlMGVk ZTQ3MWUwNDI2MmRhMzQ1NzMuLjU3ODhkZDAwMDVhODliZjRkYzkxZDlkODU2YzlmNTRhMmJhNWVh MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcApAQCAt ODYsMTQgKzg2LDE0IEBAIHN0cnVjdCBUb3VjaFRhcmdldERhdGEgewogICAgIGZsb2F0IHNjb3Jl OwogfTsKIAotdm9pZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0JiB0b3VjaEJv eCwgRnJhbWUqIG1haW5GcmFtZSwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW50UmVj dD4mIGdvb2RUYXJnZXRzKQordm9pZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0 JiB0b3VjaEJveCwgRnJhbWUqIG1haW5GcmFtZSwgVmVjdG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0 cykKIHsKICAgICBnb29kVGFyZ2V0cy5jbGVhcigpOwogCiAgICAgaW50IHRvdWNoUG9pbnRQYWRk aW5nID0gY2VpbChtYXgodG91Y2hCb3gud2lkdGgoKSwgdG91Y2hCb3guaGVpZ2h0KCkpICogMC41 KTsKICAgICAvLyBGSVhNRTogUmVjdC1iYXNlZCBoaXQgdGVzdCBkb2Vzbid0IHRyYW5zZm9ybSB0 aGUgdG91Y2ggcG9pbnQgc2l6ZS4KLSAgICAvLyAgICAgICAgV2UgaGF2ZSB0byBwcmUtYXBwbHkg cGFnZSBzY2FsZSBmYWN0b3IgaGVyZS4KLSAgICBpbnQgcGFkZGluZyA9IGNlaWwodG91Y2hQb2lu dFBhZGRpbmcgLyBwYWdlU2NhbGVGYWN0b3IpOworICAgIC8vICAgICAgICBXZSBoYXZlIHRvIHBy ZS1hcHBseSBmcmFtZSBzY2FsZSBmYWN0b3IgaGVyZS4KKyAgICBpbnQgcGFkZGluZyA9IGNlaWwo dG91Y2hQb2ludFBhZGRpbmcgLyBtYWluRnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKSk7CiAKICAg ICBJbnRQb2ludCB0b3VjaFBvaW50ID0gdG91Y2hCb3guY2VudGVyKCk7CiAgICAgSW50UG9pbnQg Y29udGVudHNQb2ludCA9IG1haW5GcmFtZS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKHRvdWNo UG9pbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0 aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uaAppbmRleCA1 YWZlYjZiNWIzZGY0MWYyZTVmOTk4ZTA0YzA4ZTg3NmZiZjg0ZjFkLi5lMDhiOTU0ZTZhYjRjMmY4 NWRkYzJhZGZlMGE0NTdiOGQwM2U4MzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1RvdWNoRGlzYW1iaWd1YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlz YW1iaWd1YXRpb24uaApAQCAtMzgsNyArMzgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFz cyBGcmFtZTsKIGNsYXNzIEludFJlY3Q7CiAKLXZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29u c3QgSW50UmVjdCYgdG91Y2hCb3gsIEZyYW1lKiBtYWluRnJhbWUsIGZsb2F0IHBhZ2VTY2FsZUZh Y3RvciwgVmVjdG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0cyk7Cit2b2lkIGZpbmRHb29kVG91Y2hU YXJnZXRzKGNvbnN0IEludFJlY3QmIHRvdWNoQm94LCBGcmFtZSogbWFpbkZyYW1lLCBWZWN0b3I8 SW50UmVjdD4mIGdvb2RUYXJnZXRzKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCmluZGV4IDgyYTBkYWI0YjM3OGFlZjhmOWRm NzhjMGExNTYwZjRmODc0ODc3YTkuLjYzZjE4NjI0YmE1MGE4YjQxNmQxYTU4ZDVhZGJhMjk5ODIz NDEwZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC0yMjUsMTQg KzIyNSwxMyBAQCB2b2lkIFNjcm9sbFZpZXc6OnNldERlbGVnYXRlc1Njcm9sbGluZyhib29sIGRl bGVnYXRlc1Njcm9sbGluZykKICAgICBkZWxlZ2F0ZXNTY3JvbGxpbmdEaWRDaGFuZ2UoKTsKIH0K IAotI2lmICFQTEFURk9STShHVEspCi1JbnRSZWN0IFNjcm9sbFZpZXc6OnZpc2libGVDb250ZW50 UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdAorSW50U2l6ZSBTY3JvbGxWaWV3Ojp1 bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZShib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdAog ewogICAgIGlmIChwbGF0Zm9ybVdpZGdldCgpKQotICAgICAgICByZXR1cm4gcGxhdGZvcm1WaXNp YmxlQ29udGVudFJlY3QoaW5jbHVkZVNjcm9sbGJhcnMpOworICAgICAgICByZXR1cm4gcGxhdGZv cm1WaXNpYmxlQ29udGVudFJlY3QoaW5jbHVkZVNjcm9sbGJhcnMpLnNpemUoKTsKIAogICAgIGlm ICghbV9maXhlZFZpc2libGVDb250ZW50UmVjdC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBt X2ZpeGVkVmlzaWJsZUNvbnRlbnRSZWN0OworICAgICAgICByZXR1cm4gbV9maXhlZFZpc2libGVD b250ZW50UmVjdC5zaXplKCk7CiAKICAgICBpbnQgdmVydGljYWxTY3JvbGxiYXJXaWR0aCA9IDA7 CiAgICAgaW50IGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQgPSAwOwpAQCAtMjQ0LDExICsyNDMs MjMgQEAgSW50UmVjdCBTY3JvbGxWaWV3Ojp2aXNpYmxlQ29udGVudFJlY3QoYm9vbCBpbmNsdWRl U2Nyb2xsYmFycykgY29uc3QKICAgICAgICAgICAgIGhvcml6b250YWxTY3JvbGxiYXJIZWlnaHQg PSAhaG9yaXpvbnRhbEJhci0+aXNPdmVybGF5U2Nyb2xsYmFyKCkgPyBob3Jpem9udGFsQmFyLT5o ZWlnaHQoKSA6IDA7CiAgICAgfQogCi0gICAgcmV0dXJuIEludFJlY3QobV9zY3JvbGxPZmZzZXQu d2lkdGgoKSwKLSAgICAgICAgICAgICAgICAgICBtX3Njcm9sbE9mZnNldC5oZWlnaHQoKSwKLSAg ICAgICAgICAgICAgICAgICBtYXgoMCwgd2lkdGgoKSAtIHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgp LCAKKyAgICByZXR1cm4gSW50U2l6ZShtYXgoMCwgd2lkdGgoKSAtIHZlcnRpY2FsU2Nyb2xsYmFy V2lkdGgpLAogICAgICAgICAgICAgICAgICAgIG1heCgwLCBoZWlnaHQoKSAtIGhvcml6b250YWxT Y3JvbGxiYXJIZWlnaHQpKTsKIH0KKworI2lmICFQTEFURk9STShHVEspCitJbnRSZWN0IFNjcm9s bFZpZXc6OnZpc2libGVDb250ZW50UmVjdChib29sIGluY2x1ZGVTY3JvbGxiYXJzKSBjb25zdAor eworICAgIGlmIChwbGF0Zm9ybVdpZGdldCgpKQorICAgICAgICByZXR1cm4gcGxhdGZvcm1WaXNp YmxlQ29udGVudFJlY3QoaW5jbHVkZVNjcm9sbGJhcnMpOworCisgICAgaWYgKCFtX2ZpeGVkVmlz aWJsZUNvbnRlbnRSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuIG1fZml4ZWRWaXNpYmxl Q29udGVudFJlY3Q7CisKKyAgICBGbG9hdFNpemUgdmlzaWJsZUNvbnRlbnRTaXplID0gdW5zY2Fs ZWRWaXNpYmxlQ29udGVudFNpemUoaW5jbHVkZVNjcm9sbGJhcnMpOworICAgIHZpc2libGVDb250 ZW50U2l6ZS5zY2FsZSgxIC8gdmlzaWJsZUNvbnRlbnRTY2FsZUZhY3RvcigpKTsKKyAgICByZXR1 cm4gSW50UmVjdChJbnRQb2ludChtX3Njcm9sbE9mZnNldCksIGV4cGFuZGVkSW50U2l6ZSh2aXNp YmxlQ29udGVudFNpemUpKTsKK30KICNlbmRpZgogCiBJbnRTaXplIFNjcm9sbFZpZXc6OmxheW91 dFNpemUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs Vmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IGUwNDNm NmU5Zjc0ODNkYzQxYzQ4NWJjMWQ1ZjFhMDU0MDg2NGM3NDYuLmEwNGRjODI5ZjczZTFjMDU0YzBi NTgwNGQ5MDc3ZThlMzA0ZmI1ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgK QEAgLTE1MSw2ICsxNTEsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgaW50IHZpc2libGVXaWR0 aCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHZpc2libGVDb250ZW50UmVjdCgpLndpZHRoKCk7 IH0KICAgICB2aXJ0dWFsIGludCB2aXNpYmxlSGVpZ2h0KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1 cm4gdmlzaWJsZUNvbnRlbnRSZWN0KCkuaGVpZ2h0KCk7IH0KIAorICAgIC8vIHZpc2libGVDb250 ZW50UmVjdCgpLnNpemUoKSBpcyBjb21wdXRlZCBmcm9tIHVuc2NhbGVkVmlzaWJsZUNvbnRlbnRT aXplKCkgZGl2aWRlZCBieSB0aGUgdmFsdWUgb2YgdmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rvci4K KyAgICAvLyB2aXNpYmxlQ29udGVudFNjYWxlRmFjdG9yIGlzIHVzdWFsbHkgMSwgZXhjZXB0IHdo ZW4gdGhlIHNldHRpbmcgYXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IgaXMgdHJ1ZSBh bmQgdGhlCisgICAgLy8gU2Nyb2xsVmlldyBpcyB0aGUgbWFpbiBmcmFtZTsgaW4gdGhhdCBjYXNl LCB2aXNpYmxlQ29udGVudFNjYWxlRmFjdG9yIGlzIGVxdWFsIHRvIHRoZSBwYWdlJ3MgcGFnZVNj YWxlRmFjdG9yLgorICAgIC8vIFBvcnRzIHRoYXQgZG9uJ3QgdXNlIHBhZ2VTY2FsZUZhY3RvciBj YW4gdHJlYXQgdW5zY2FsZWRWaXNpYmxlQ29udGVudFNpemUgYW5kIHZpc2libGVDb250ZW50UmVj dCgpLnNpemUoKSBhcyBlcXVpdmFsZW50LgorICAgIEludFNpemUgdW5zY2FsZWRWaXNpYmxlQ29u dGVudFNpemUoYm9vbCBpbmNsdWRlU2Nyb2xsYmFycykgY29uc3Q7CisgICAgdmlydHVhbCBmbG9h dCB2aXNpYmxlQ29udGVudFNjYWxlRmFjdG9yKCkgY29uc3QgeyByZXR1cm4gMTsgfQorCiAgICAg Ly8gRnVuY3Rpb25zIGZvciBnZXR0aW5nL3NldHRpbmcgdGhlIHNpemUgd2Via2l0IHNob3VsZCB1 c2UgdG8gbGF5b3V0IHRoZSBjb250ZW50cy4gQnkgZGVmYXVsdCB0aGlzIGlzIHRoZSBzYW1lIGFz IHRoZSB2aXNpYmxlCiAgICAgLy8gY29udGVudCBzaXplLiBFeHBsaWNpdGx5IHNldHRpbmcgYSBs YXlvdXQgc2l6ZSB2YWx1ZSB3aWxsIGNhdXNlIHdlYmtpdCB0byBsYXlvdXQgdGhlIGNvbnRlbnRz IHVzaW5nIHRoaXMgc2l6ZSBpbnN0ZWFkLgogICAgIEludFNpemUgbGF5b3V0U2l6ZSgpIGNvbnN0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9y LmNwcAppbmRleCA3ZDU2YTUxODFkYmI3ZTA4YjM2ZTNhOTFjM2RjYTAzNDNjYjViZmMzLi4wYjgy MDA0NGYyZGZmYzZkODcwYWYwNWRhY2Y5Mjg2ZDhjNzU4YzQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcApAQCAtMTE2Myw3ICsx MTYzLDcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmZyYW1lVmlld0RpZENoYW5nZVNp emUoKQogewogICAgIGlmIChtX2NsaXBMYXllcikgewogICAgICAgICBGcmFtZVZpZXcqIGZyYW1l VmlldyA9IG1fcmVuZGVyVmlldy0+ZnJhbWVWaWV3KCk7Ci0gICAgICAgIG1fY2xpcExheWVyLT5z ZXRTaXplKGZyYW1lVmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KGZhbHNlIC8qIGV4Y2x1ZGUgc2Ny b2xsYmFycyAqLykuc2l6ZSgpKTsKKyAgICAgICAgbV9jbGlwTGF5ZXItPnNldFNpemUoZnJhbWVW aWV3LT51bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZShmYWxzZSAvKiBleGNsdWRlIHNjcm9sbGJh cnMgKi8pKTsKIAogICAgICAgICBmcmFtZVZpZXdEaWRTY3JvbGwoKTsKICAgICAgICAgdXBkYXRl T3ZlcmZsb3dDb250cm9sc0xheWVycygpOwpAQCAtMTUyMyw3ICsxNTIzLDcgQEAgdm9pZCBSZW5k ZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVJvb3RMYXllclBvc2l0aW9uKCkKICAgICB9CiAgICAg aWYgKG1fY2xpcExheWVyKSB7CiAgICAgICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV9yZW5k ZXJWaWV3LT5mcmFtZVZpZXcoKTsKLSAgICAgICAgbV9jbGlwTGF5ZXItPnNldFNpemUoZnJhbWVW aWV3LT52aXNpYmxlQ29udGVudFJlY3QoZmFsc2UgLyogZXhjbHVkZSBzY3JvbGxiYXJzICovKS5z aXplKCkpOworICAgICAgICBtX2NsaXBMYXllci0+c2V0U2l6ZShmcmFtZVZpZXctPnVuc2NhbGVk VmlzaWJsZUNvbnRlbnRTaXplKGZhbHNlIC8qIGV4Y2x1ZGUgc2Nyb2xsYmFycyAqLykpOwogICAg IH0KIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9UZXh0QXV0b3NpemVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9UZXh0QXV0b3NpemVyLmNwcAppbmRleCBiMThiNzAyYjUxYjJkMWZjMDk4OGUzZWVkMzhiNjJl M2FiZDUzNDQ5Li40MjFiMjk3NDhlMDFhNjIyYTAyNzY5OTQzZDM1YzNmMGNlOWY5ODVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRBdXRvc2l6ZXIuY3BwCkBAIC04NCw3ICs4NCw3 IEBAIGJvb2wgVGV4dEF1dG9zaXplcjo6cHJvY2Vzc1N1YnRyZWUoUmVuZGVyT2JqZWN0KiBsYXlv dXRSb290KQogICAgIHdpbmRvd0luZm8ud2luZG93U2l6ZSA9IG1fZG9jdW1lbnQtPnNldHRpbmdz KCktPnRleHRBdXRvc2l6aW5nV2luZG93U2l6ZU92ZXJyaWRlKCk7CiAgICAgaWYgKHdpbmRvd0lu Zm8ud2luZG93U2l6ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgYm9vbCBpbmNsdWRlU2Nyb2xsYmFy cyA9ICFJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnNob3VsZEFwcGx5U2NyZWVuV2lkdGhPdmVy cmlkZShtYWluRnJhbWUpOwotICAgICAgICB3aW5kb3dJbmZvLndpbmRvd1NpemUgPSBtYWluRnJh bWUtPnZpZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KGluY2x1ZGVTY3JvbGxiYXJzKS5zaXplKCk7 CisgICAgICAgIHdpbmRvd0luZm8ud2luZG93U2l6ZSA9IG1haW5GcmFtZS0+dmlldygpLT51bnNj YWxlZFZpc2libGVDb250ZW50U2l6ZShpbmNsdWRlU2Nyb2xsYmFycyk7CiAgICAgICAgIGlmICgh bV9kb2N1bWVudC0+c2V0dGluZ3MoKS0+YXBwbHlEZXZpY2VTY2FsZUZhY3RvckluQ29tcG9zaXRv cigpKQogICAgICAgICAgICAgd2luZG93SW5mby53aW5kb3dTaXplLnNjYWxlKDEgLyBtX2RvY3Vt ZW50LT5wYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBiNDFmNjAwODEyZTFjZmFjY2U0MTU3 YjExNjY4YjdiNjAzYzNlYmIyLi45MTBiN2VhMGM4OTdhZTFjMWJmMzVlZTRlYzZkMjZmYzIyM2M1 YWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC03 NTcsNyArNzU3LDcgQEAgYm9vbCBXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KGNvbnN0 IFdlYkdlc3R1cmVFdmVudCYgZXZlbnQpCiAgICAgICAgIGlmIChldmVudC5kYXRhLnRhcC53aWR0 aCA+IDApIHsKICAgICAgICAgICAgIEludFJlY3QgYm91bmRpbmdCb3goZXZlbnQueCAtIGV2ZW50 LmRhdGEudGFwLndpZHRoIC8gMiwgZXZlbnQueSAtIGV2ZW50LmRhdGEudGFwLmhlaWdodCAvIDIs IGV2ZW50LmRhdGEudGFwLndpZHRoLCBldmVudC5kYXRhLnRhcC5oZWlnaHQpOwogICAgICAgICAg ICAgVmVjdG9yPEludFJlY3Q+IGdvb2RUYXJnZXRzOwotICAgICAgICAgICAgZmluZEdvb2RUb3Vj aFRhcmdldHMoYm91bmRpbmdCb3gsIG1haW5GcmFtZUltcGwoKS0+ZnJhbWUoKSwgcGFnZVNjYWxl RmFjdG9yKCksIGdvb2RUYXJnZXRzKTsKKyAgICAgICAgICAgIGZpbmRHb29kVG91Y2hUYXJnZXRz KGJvdW5kaW5nQm94LCBtYWluRnJhbWVJbXBsKCktPmZyYW1lKCksIGdvb2RUYXJnZXRzKTsKICAg ICAgICAgICAgIC8vIEZJWE1FOiByZXBsYWNlIHRvdWNoIGFkanVzdG1lbnQgY29kZSB3aGVuIG51 bWJlck9mR29vZFRhcmdldHMgPT0gMT8KICAgICAgICAgICAgIC8vIFNpbmdsZSBjYW5kaWRhdGUg Y2FzZSBpcyBjdXJyZW50bHkgaGFuZGxlZCBieTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MTAxCiAgICAgICAgICAgICBpZiAoZ29vZFRhcmdldHMuc2l6ZSgpID49 IDIgJiYgbV9jbGllbnQgJiYgbV9jbGllbnQtPmRpZFRhcE11bHRpcGxlVGFyZ2V0cyhldmVudCwg Z29vZFRhcmdldHMpKSB7CkBAIC0xNjAyLDExICsxNjAyLDE1IEBAIHZvaWQgV2ViVmlld0ltcGw6 OndpbGxTdGFydExpdmVSZXNpemUoKQogICAgICAgICBwbHVnaW5Db250YWluZXItPndpbGxTdGFy dExpdmVSZXNpemUoKTsKIH0KIAotV2ViU2l6ZSBXZWJWaWV3SW1wbDo6c2l6ZSgpCitJbnRTaXpl IFdlYlZpZXdJbXBsOjpzY2FsZWRTaXplKGZsb2F0IHBhZ2VTY2FsZUZhY3RvcikgY29uc3QKIHsK LSAgICBpZiAoaXNGaXhlZExheW91dE1vZGVFbmFibGVkKCkgJiYgc2V0dGluZ3NJbXBsKCktPmFw cGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkpCi0gICAgICAgIHJldHVybiBsYXlvdXRT aXplKCk7CisgICAgRmxvYXRTaXplIHNjYWxlZFNpemUgPSBkaXBTaXplKCk7CisgICAgc2NhbGVk U2l6ZS5zY2FsZSgxIC8gcGFnZVNjYWxlRmFjdG9yKTsKKyAgICByZXR1cm4gZXhwYW5kZWRJbnRT aXplKHNjYWxlZFNpemUpOworfQogCitXZWJTaXplIFdlYlZpZXdJbXBsOjpzaXplKCkKK3sKICAg ICByZXR1cm4gbV9zaXplOwogfQogCkBAIC0xNjM3LDcgKzE2NDEsNyBAQCB2b2lkIFdlYlZpZXdJ bXBsOjpyZXNpemUoY29uc3QgV2ViU2l6ZSYgbmV3U2l6ZSkKICAgICBpZiAoIWFnZW50UHJpdmF0 ZSB8fCAhYWdlbnRQcml2YXRlLT5tZXRyaWNzT3ZlcnJpZGRlbigpKSB7CiAgICAgICAgIFdlYkZy YW1lSW1wbCogd2ViRnJhbWUgPSBtYWluRnJhbWVJbXBsKCk7CiAgICAgICAgIGlmICh3ZWJGcmFt ZS0+ZnJhbWVWaWV3KCkpCi0gICAgICAgICAgICB3ZWJGcmFtZS0+ZnJhbWVWaWV3KCktPnJlc2l6 ZShzaXplKCkpOworICAgICAgICAgICAgd2ViRnJhbWUtPmZyYW1lVmlldygpLT5yZXNpemUobV9z aXplKTsKICAgICB9CiAKICNpZiBFTkFCTEUoVklFV1BPUlQpCkBAIC0yMDczLDMwICsyMDc3LDI2 IEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVu dCYgaW5wdXRFdmVudCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCi0gICAgaWYgKCFt X2xheWVyVHJlZVZpZXcpCi0gICAgICAgIHJldHVybiBQYWdlV2lkZ2V0RGVsZWdhdGU6OmhhbmRs ZUlucHV0RXZlbnQobV9wYWdlLmdldCgpLCAqdGhpcywgaW5wdXRFdmVudCk7Ci0KICAgICBjb25z dCBXZWJJbnB1dEV2ZW50KiBpbnB1dEV2ZW50VHJhbnNmb3JtZWQgPSAmaW5wdXRFdmVudDsKLSAg ICBXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQ7Ci0gICAgV2ViR2VzdHVyZUV2ZW50IGdlc3R1cmVF dmVudDsKLSAgICBpZiAoV2ViSW5wdXRFdmVudDo6aXNNb3VzZUV2ZW50VHlwZShpbnB1dEV2ZW50 LnR5cGUpKSB7Ci0gICAgICAgIG1vdXNlRXZlbnQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViTW91 c2VFdmVudCo+KCZpbnB1dEV2ZW50KTsKLQotICAgICAgICBJbnRQb2ludCB0cmFuc2Zvcm1lZExv Y2F0aW9uID0gcm91bmRlZEludFBvaW50KG1fbGF5ZXJUcmVlVmlldy0+YWRqdXN0RXZlbnRQb2lu dEZvclBpbmNoWm9vbShXZWJGbG9hdFBvaW50KG1vdXNlRXZlbnQueCwgbW91c2VFdmVudC55KSkp OwotICAgICAgICBtb3VzZUV2ZW50LnggPSB0cmFuc2Zvcm1lZExvY2F0aW9uLngoKTsKLSAgICAg ICAgbW91c2VFdmVudC55ID0gdHJhbnNmb3JtZWRMb2NhdGlvbi55KCk7Ci0gICAgICAgIGlucHV0 RXZlbnRUcmFuc2Zvcm1lZCA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYklucHV0RXZlbnQqPigmbW91 c2VFdmVudCk7Ci0gICAgfSBlbHNlIGlmIChXZWJJbnB1dEV2ZW50Ojppc0dlc3R1cmVFdmVudFR5 cGUoaW5wdXRFdmVudC50eXBlKSkgewotICAgICAgICBnZXN0dXJlRXZlbnQgPSAqc3RhdGljX2Nh c3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmlucHV0RXZlbnQpOwotCi0gICAgICAgIEludFBv aW50IHRyYW5zZm9ybWVkTG9jYXRpb24gPSByb3VuZGVkSW50UG9pbnQobV9sYXllclRyZWVWaWV3 LT5hZGp1c3RFdmVudFBvaW50Rm9yUGluY2hab29tKFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50 LngsIGdlc3R1cmVFdmVudC55KSkpOwotICAgICAgICBnZXN0dXJlRXZlbnQueCA9IHRyYW5zZm9y bWVkTG9jYXRpb24ueCgpOwotICAgICAgICBnZXN0dXJlRXZlbnQueSA9IHRyYW5zZm9ybWVkTG9j YXRpb24ueSgpOwotICAgICAgICBpbnB1dEV2ZW50VHJhbnNmb3JtZWQgPSBzdGF0aWNfY2FzdDxj b25zdCBXZWJJbnB1dEV2ZW50Kj4oJmdlc3R1cmVFdmVudCk7CisgICAgaWYgKG1fcGFnZS0+c2V0 dGluZ3MoKS0+YXBwbHlQYWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkgeworICAgICAgICBX ZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQ7CisgICAgICAgIFdlYkdlc3R1cmVFdmVudCBnZXN0dXJl RXZlbnQ7CisgICAgICAgIGlmIChXZWJJbnB1dEV2ZW50Ojppc01vdXNlRXZlbnRUeXBlKGlucHV0 RXZlbnQudHlwZSkpIHsKKyAgICAgICAgICAgIG1vdXNlRXZlbnQgPSAqc3RhdGljX2Nhc3Q8Y29u c3QgV2ViTW91c2VFdmVudCo+KCZpbnB1dEV2ZW50KTsKKyAgICAgICAgICAgIG1vdXNlRXZlbnQu eCA9IG1vdXNlRXZlbnQueCAvIHBhZ2VTY2FsZUZhY3RvcigpOworICAgICAgICAgICAgbW91c2VF dmVudC55ID0gbW91c2VFdmVudC55IC8gcGFnZVNjYWxlRmFjdG9yKCk7CisgICAgICAgICAgICBp bnB1dEV2ZW50VHJhbnNmb3JtZWQgPSBzdGF0aWNfY2FzdDxjb25zdCBXZWJJbnB1dEV2ZW50Kj4o Jm1vdXNlRXZlbnQpOworICAgICAgICB9IGVsc2UgaWYgKFdlYklucHV0RXZlbnQ6OmlzR2VzdHVy ZUV2ZW50VHlwZShpbnB1dEV2ZW50LnR5cGUpKSB7CisgICAgICAgICAgICBnZXN0dXJlRXZlbnQg PSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmlucHV0RXZlbnQpOworICAg ICAgICAgICAgZ2VzdHVyZUV2ZW50LnggPSBnZXN0dXJlRXZlbnQueCAvIHBhZ2VTY2FsZUZhY3Rv cigpOworICAgICAgICAgICAgZ2VzdHVyZUV2ZW50LnkgPSBnZXN0dXJlRXZlbnQueSAvIHBhZ2VT Y2FsZUZhY3RvcigpOworICAgICAgICAgICAgZ2VzdHVyZUV2ZW50LmRhdGEudGFwLndpZHRoIC89 IHBhZ2VTY2FsZUZhY3RvcigpOworICAgICAgICAgICAgZ2VzdHVyZUV2ZW50LmRhdGEudGFwLmhl aWdodCAvPSBwYWdlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgIGlucHV0RXZlbnRUcmFuc2Zv cm1lZCA9IHN0YXRpY19jYXN0PGNvbnN0IFdlYklucHV0RXZlbnQqPigmZ2VzdHVyZUV2ZW50KTsK KyAgICAgICAgfQogICAgIH0KIAotICAgIGJvb2wgaGFuZGxlZCA9IFBhZ2VXaWRnZXREZWxlZ2F0 ZTo6aGFuZGxlSW5wdXRFdmVudChtX3BhZ2UuZ2V0KCksICp0aGlzLCAqaW5wdXRFdmVudFRyYW5z Zm9ybWVkKTsKLSAgICByZXR1cm4gaGFuZGxlZDsKKyAgICByZXR1cm4gUGFnZVdpZGdldERlbGVn YXRlOjpoYW5kbGVJbnB1dEV2ZW50KG1fcGFnZS5nZXQoKSwgKnRoaXMsICppbnB1dEV2ZW50VHJh bnNmb3JtZWQpOwogfQogCiB2b2lkIFdlYlZpZXdJbXBsOjptb3VzZUNhcHR1cmVMb3N0KCkKQEAg LTI5MTEsMzQgKzI5MTEsNDAgQEAgZmxvYXQgV2ViVmlld0ltcGw6OmNsYW1wUGFnZVNjYWxlRmFj dG9yVG9MaW1pdHMoZmxvYXQgc2NhbGVGYWN0b3IpCiAgICAgcmV0dXJuIG1pbihtYXgoc2NhbGVG YWN0b3IsIG1fbWluaW11bVBhZ2VTY2FsZUZhY3RvciksIG1fbWF4aW11bVBhZ2VTY2FsZUZhY3Rv cik7CiB9CiAKLVdlYlBvaW50IFdlYlZpZXdJbXBsOjpjbGFtcE9mZnNldEF0U2NhbGUoY29uc3Qg V2ViUG9pbnQmIG9mZnNldCwgZmxvYXQgc2NhbGUpCitJbnRQb2ludCBXZWJWaWV3SW1wbDo6Y2xh bXBPZmZzZXRBdFNjYWxlKGNvbnN0IEludFBvaW50JiBvZmZzZXQsIGZsb2F0IHNjYWxlKSBjb25z dAogewotICAgIC8vIFRoaXMgaXMgdGhlIHNjYWxlZCBjb250ZW50IHNpemUuIFdlIG5lZWQgdG8g Y29udmVydCBpdCB0byB0aGUgbmV3IHNjYWxlIGZhY3Rvci4KLSAgICBXZWJTaXplIGNvbnRlbnRT aXplID0gbWFpbkZyYW1lKCktPmNvbnRlbnRzU2l6ZSgpOwotICAgIGZsb2F0IGRlbHRhU2NhbGUg PSBzY2FsZSAvIHBhZ2VTY2FsZUZhY3RvcigpOwotICAgIGludCBkb2NXaWR0aEF0TmV3U2NhbGUg PSBjb250ZW50U2l6ZS53aWR0aCAqIGRlbHRhU2NhbGU7Ci0gICAgaW50IGRvY0hlaWdodEF0TmV3 U2NhbGUgPSBjb250ZW50U2l6ZS5oZWlnaHQgKiBkZWx0YVNjYWxlOwotICAgIGludCB2aWV3V2lk dGggPSBtX3NpemUud2lkdGg7Ci0gICAgaW50IHZpZXdIZWlnaHQgPSBtX3NpemUuaGVpZ2h0Owot Ci0gICAgLy8gRW5mb3JjZSB0aGUgbWF4aW11bSBhbmQgbWluaW11bSBzY3JvbGwgcG9zaXRpb25z IGF0IHRoZSBuZXcgc2NhbGUuCiAgICAgSW50UG9pbnQgY2xhbXBlZE9mZnNldCA9IG9mZnNldDsK LSAgICBjbGFtcGVkT2Zmc2V0ID0gY2xhbXBlZE9mZnNldC5zaHJ1bmtUbyhJbnRQb2ludChkb2NX aWR0aEF0TmV3U2NhbGUgLSB2aWV3V2lkdGgsIGRvY0hlaWdodEF0TmV3U2NhbGUgLSB2aWV3SGVp Z2h0KSk7Ci0gICAgY2xhbXBlZE9mZnNldC5jbGFtcE5lZ2F0aXZlVG9aZXJvKCk7CisgICAgaWYg KCFtX3BhZ2UtPnNldHRpbmdzKCktPmFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkp IHsKKyAgICAgICAgLy8gVGhpcyBpcyB0aGUgc2NhbGVkIGNvbnRlbnQgc2l6ZS4gV2UgbmVlZCB0 byBjb252ZXJ0IGl0IHRvIHRoZSBuZXcgc2NhbGUgZmFjdG9yLgorICAgICAgICBXZWJTaXplIGNv bnRlbnRTaXplID0gdW5zY2FsZWRDb250ZW50c1NpemUoKTsKKyAgICAgICAgaW50IGRvY1dpZHRo QXROZXdTY2FsZSA9IGNvbnRlbnRTaXplLndpZHRoICogc2NhbGU7CisgICAgICAgIGludCBkb2NI ZWlnaHRBdE5ld1NjYWxlID0gY29udGVudFNpemUuaGVpZ2h0ICogc2NhbGU7CisgICAgICAgIGlu dCB2aWV3V2lkdGggPSBtX3NpemUud2lkdGg7CisgICAgICAgIGludCB2aWV3SGVpZ2h0ID0gbV9z aXplLmhlaWdodDsKKworICAgICAgICAvLyBFbmZvcmNlIHRoZSBtYXhpbXVtIGFuZCBtaW5pbXVt IHNjcm9sbCBwb3NpdGlvbnMgYXQgdGhlIG5ldyBzY2FsZS4KKyAgICAgICAgY2xhbXBlZE9mZnNl dCA9IGNsYW1wZWRPZmZzZXQuc2hydW5rVG8oSW50UG9pbnQoZG9jV2lkdGhBdE5ld1NjYWxlIC0g dmlld1dpZHRoLCBkb2NIZWlnaHRBdE5ld1NjYWxlIC0gdmlld0hlaWdodCkpOworICAgICAgICBj bGFtcGVkT2Zmc2V0LmNsYW1wTmVnYXRpdmVUb1plcm8oKTsKKyAgICB9IGVsc2UgeworICAgICAg ICBjbGFtcGVkT2Zmc2V0ID0gY2xhbXBlZE9mZnNldC5zaHJ1bmtUbyhJbnRQb2ludCh1bnNjYWxl ZENvbnRlbnRzU2l6ZSgpIC0gc2NhbGVkU2l6ZShzY2FsZSkpKTsKKyAgICAgICAgY2xhbXBlZE9m ZnNldC5jbGFtcE5lZ2F0aXZlVG9aZXJvKCk7CisgICAgfQorCiAgICAgcmV0dXJuIGNsYW1wZWRP ZmZzZXQ7CiB9CiAKIHZvaWQgV2ViVmlld0ltcGw6OnNldFBhZ2VTY2FsZUZhY3RvclByZXNlcnZp bmdTY3JvbGxPZmZzZXQoZmxvYXQgc2NhbGVGYWN0b3IpCiB7Ci0gICAgLy8gUGljayBhIHNjYWxl IGZhY3RvciB0aGF0IGlzIHdpdGhpbiB0aGUgZXhwZWN0ZWQgbGltaXRzCiAgICAgc2NhbGVGYWN0 b3IgPSBjbGFtcFBhZ2VTY2FsZUZhY3RvclRvTGltaXRzKHNjYWxlRmFjdG9yKTsKIAotICAgIElu dFBvaW50IHNjcm9sbE9mZnNldEF0TmV3U2NhbGUobWFpbkZyYW1lKCktPnNjcm9sbE9mZnNldCgp LndpZHRoLCBtYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCkuaGVpZ2h0KTsKLSAgICBmbG9hdCBk ZWx0YVNjYWxlID0gc2NhbGVGYWN0b3IgLyBwYWdlU2NhbGVGYWN0b3IoKTsKLSAgICBzY3JvbGxP ZmZzZXRBdE5ld1NjYWxlLnNjYWxlKGRlbHRhU2NhbGUsIGRlbHRhU2NhbGUpOworICAgIEludFBv aW50IHNjcm9sbE9mZnNldChtYWluRnJhbWUoKS0+c2Nyb2xsT2Zmc2V0KCkud2lkdGgsIG1haW5G cmFtZSgpLT5zY3JvbGxPZmZzZXQoKS5oZWlnaHQpOworICAgIGlmICghbV9wYWdlLT5zZXR0aW5n cygpLT5hcHBseVBhZ2VTY2FsZUZhY3RvckluQ29tcG9zaXRvcigpKSB7CisgICAgICAgIGZsb2F0 IGRlbHRhU2NhbGUgPSBzY2FsZUZhY3RvciAvIHBhZ2VTY2FsZUZhY3RvcigpOworICAgICAgICBz Y3JvbGxPZmZzZXQuc2NhbGUoZGVsdGFTY2FsZSwgZGVsdGFTY2FsZSk7CisgICAgfQorICAgIHNj cm9sbE9mZnNldCA9IGNsYW1wT2Zmc2V0QXRTY2FsZShzY3JvbGxPZmZzZXQsIHNjYWxlRmFjdG9y KTsKIAotICAgIFdlYlBvaW50IGNsYW1wZWRPZmZzZXRBdE5ld1NjYWxlID0gY2xhbXBPZmZzZXRB dFNjYWxlKHNjcm9sbE9mZnNldEF0TmV3U2NhbGUsIHNjYWxlRmFjdG9yKTsKLSAgICBzZXRQYWdl U2NhbGVGYWN0b3Ioc2NhbGVGYWN0b3IsIGNsYW1wZWRPZmZzZXRBdE5ld1NjYWxlKTsKKyAgICBz ZXRQYWdlU2NhbGVGYWN0b3Ioc2NhbGVGYWN0b3IsIHNjcm9sbE9mZnNldCk7CiB9CiAKIHZvaWQg V2ViVmlld0ltcGw6OnNldFBhZ2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZUZhY3RvciwgY29uc3Qg V2ViUG9pbnQmIG9yaWdpbikKQEAgLTI5NDksMjIgKzI5NTUsMTcgQEAgdm9pZCBXZWJWaWV3SW1w bDo6c2V0UGFnZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlRmFjdG9yLCBjb25zdCBXZWJQb2ludCYg b3JpZ2luKQogICAgIGlmICghc2NhbGVGYWN0b3IpCiAgICAgICAgIHNjYWxlRmFjdG9yID0gMTsK IAorICAgIEludFBvaW50IHNjcm9sbE9mZnNldCA9IG9yaWdpbjsKICAgICBzY2FsZUZhY3RvciA9 IGNsYW1wUGFnZVNjYWxlRmFjdG9yVG9MaW1pdHMoc2NhbGVGYWN0b3IpOwotICAgIFdlYlBvaW50 IHNjcm9sbE9mZnNldDsKLSAgICBpZiAoIW1fcGFnZS0+c2V0dGluZ3MoKS0+YXBwbHlQYWdlU2Nh bGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkgewotICAgICAgICAvLyBJZiBwYWdlIHNjYWxlIGlzIG5v dCBhcHBsaWVkIGluIHRoZSBjb21wb3NpdG9yLCB0aGVuIHRoZSBzY3JvbGwgb2Zmc2V0cyBzaG91 bGQKLSAgICAgICAgLy8gYmUgbW9kaWZpZWQgYnkgdGhlIHNjYWxlIGZhY3Rvci4KLSAgICAgICAg c2Nyb2xsT2Zmc2V0ID0gY2xhbXBPZmZzZXRBdFNjYWxlKG9yaWdpbiwgc2NhbGVGYWN0b3IpOwot ICAgIH0gZWxzZSB7Ci0gICAgICAgIEludFBvaW50IG9mZnNldCA9IG9yaWdpbjsKLSAgICAgICAg V2ViU2l6ZSBjb250ZW50U2l6ZSA9IG1haW5GcmFtZSgpLT5jb250ZW50c1NpemUoKTsKLSAgICAg ICAgb2Zmc2V0LnNocnVua1RvKEludFBvaW50KGNvbnRlbnRTaXplLndpZHRoIC0gbV9zaXplLndp ZHRoLCBjb250ZW50U2l6ZS5oZWlnaHQgLSBtX3NpemUuaGVpZ2h0KSk7Ci0gICAgICAgIG9mZnNl dC5jbGFtcE5lZ2F0aXZlVG9aZXJvKCk7Ci0gICAgICAgIHNjcm9sbE9mZnNldCA9IG9mZnNldDsK LSAgICB9CisgICAgc2Nyb2xsT2Zmc2V0ID0gY2xhbXBPZmZzZXRBdFNjYWxlKHNjcm9sbE9mZnNl dCwgc2NhbGVGYWN0b3IpOworCisgICAgcGFnZSgpLT5zZXRQYWdlU2NhbGVGYWN0b3Ioc2NhbGVG YWN0b3IsIEludFBvaW50KHNjcm9sbE9mZnNldCkpOwogCi0gICAgcGFnZSgpLT5zZXRQYWdlU2Nh bGVGYWN0b3Ioc2NhbGVGYWN0b3IsIHNjcm9sbE9mZnNldCk7CiAgICAgbV9wYWdlU2NhbGVGYWN0 b3JJc1NldCA9IHRydWU7CisKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAg dXBkYXRlTGF5ZXJUcmVlVmlld3BvcnQoKTsKKyNlbmRpZgogfQogCiBmbG9hdCBXZWJWaWV3SW1w bDo6ZGV2aWNlU2NhbGVGYWN0b3IoKSBjb25zdApAQCAtMzA0OCwxMiArMzA0OSwxNiBAQCB2b2lk IFdlYlZpZXdJbXBsOjpzZXRJZ25vcmVWaWV3cG9ydFRhZ01heGltdW1TY2FsZShib29sIGZsYWcp CiAgICAgbV9wYWdlLT5jaHJvbWUoKS0+Y2xpZW50KCktPmRpc3BhdGNoVmlld3BvcnRQcm9wZXJ0 aWVzRGlkQ2hhbmdlKHBhZ2UoKS0+bWFpbkZyYW1lKCktPmRvY3VtZW50KCktPnZpZXdwb3J0QXJn dW1lbnRzKCkpOwogfQogCi1zdGF0aWMgSW50U2l6ZSB1bnNjYWxlZENvbnRlbnRzU2l6ZShGcmFt ZSogZnJhbWUpCitJbnRTaXplIFdlYlZpZXdJbXBsOjp1bnNjYWxlZENvbnRlbnRzU2l6ZSgpIGNv bnN0CiB7CisgICAgRnJhbWUqIGZyYW1lID0gcGFnZSgpLT5tYWluRnJhbWUoKTsKICAgICBSZW5k ZXJWaWV3KiByb290ID0gZnJhbWUtPmNvbnRlbnRSZW5kZXJlcigpOwogICAgIGlmICghcm9vdCkK ICAgICAgICAgcmV0dXJuIEludFNpemUoKTsKLSAgICByZXR1cm4gcm9vdC0+dW5zY2FsZWREb2N1 bWVudFJlY3QoKS5zaXplKCk7CisKKyAgICBpZiAoIW1fcGFnZS0+c2V0dGluZ3MoKS0+YXBwbHlQ YWdlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkKKyAgICAgICAgcmV0dXJuIHJvb3QtPnVuc2Nh bGVkRG9jdW1lbnRSZWN0KCkuc2l6ZSgpOworICAgIHJldHVybiByb290LT5kb2N1bWVudFJlY3Qo KS5zaXplKCk7CiB9CiAKIEludFNpemUgV2ViVmlld0ltcGw6OmxheW91dFNpemUoKSBjb25zdApA QCAtMzA2MSw3ICszMDY2LDggQEAgSW50U2l6ZSBXZWJWaWV3SW1wbDo6bGF5b3V0U2l6ZSgpIGNv bnN0CiAgICAgaWYgKCFpc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJu IG1fc2l6ZTsKIAotICAgIEludFNpemUgY29udGVudFNpemUgPSB1bnNjYWxlZENvbnRlbnRzU2l6 ZShwYWdlKCktPm1haW5GcmFtZSgpKTsKKyAgICBJbnRTaXplIGNvbnRlbnRTaXplID0gdW5zY2Fs ZWRDb250ZW50c1NpemUoKTsKKwogICAgIGlmIChmaXhlZExheW91dFNpemUoKS53aWR0aCA+PSBj b250ZW50U2l6ZS53aWR0aCgpKQogICAgICAgICByZXR1cm4gZml4ZWRMYXlvdXRTaXplKCk7CiAK QEAgLTMwODksNyArMzA5NSw3IEBAIGJvb2wgV2ViVmlld0ltcGw6OmNvbXB1dGVQYWdlU2NhbGVG YWN0b3JMaW1pdHMoKQogICAgIGludCB2aWV3V2lkdGhOb3RJbmNsdWRpbmdTY3JvbGxiYXJzID0g bV9zaXplLndpZHRoOwogICAgIGlmICh2aWV3V2lkdGhOb3RJbmNsdWRpbmdTY3JvbGxiYXJzICYm IHZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkgJiYgIXZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkt PmlzT3ZlcmxheVNjcm9sbGJhcigpKQogICAgICAgICB2aWV3V2lkdGhOb3RJbmNsdWRpbmdTY3Jv bGxiYXJzIC09IHZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCktPndpZHRoKCk7Ci0gICAgaW50IHVu c2NhbGVkQ29udGVudHNXaWR0aCA9IHVuc2NhbGVkQ29udGVudHNTaXplKHBhZ2UoKS0+bWFpbkZy YW1lKCkpLndpZHRoKCk7CisgICAgaW50IHVuc2NhbGVkQ29udGVudHNXaWR0aCA9IHVuc2NhbGVk Q29udGVudHNTaXplKCkud2lkdGgoKTsKICAgICBpZiAodmlld1dpZHRoTm90SW5jbHVkaW5nU2Ny b2xsYmFycyAmJiB1bnNjYWxlZENvbnRlbnRzV2lkdGgpIHsKICAgICAgICAgLy8gTGltaXQgcGFn ZSBzY2FsaW5nIGRvd24gdG8gdGhlIGRvY3VtZW50IHdpZHRoLgogICAgICAgICBtX21pbmltdW1Q YWdlU2NhbGVGYWN0b3IgPSBtYXgobV9taW5pbXVtUGFnZVNjYWxlRmFjdG9yLCBzdGF0aWNfY2Fz dDxmbG9hdD4odmlld1dpZHRoTm90SW5jbHVkaW5nU2Nyb2xsYmFycykgLyB1bnNjYWxlZENvbnRl bnRzV2lkdGgpOwpAQCAtMzc1MCwxNSArMzc1NiwxMCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkaWRD aGFuZ2VDb250ZW50c1NpemUoKQogICAgIH0gZWxzZQogICAgICAgICBtYXlOZWVkTGF5b3V0ID0g Y29tcHV0ZVBhZ2VTY2FsZUZhY3RvckxpbWl0cygpOwogCi0gICAgRnJhbWVWaWV3KiB2aWV3ID0g bWFpbkZyYW1lSW1wbCgpLT5mcmFtZVZpZXcoKTsKLSAgICBpZiAoc2V0dGluZ3NJbXBsKCktPmFw cGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKCkgJiYgdmlldyAmJiB2aWV3LT52aXNpYmxl Q29udGVudFJlY3QodHJ1ZSkud2lkdGgoKSAhPSBsYXlvdXRTaXplKCkud2lkdGgoKSkgewotICAg ICAgICB2aWV3LT5yZXNpemUobGF5b3V0U2l6ZSgpKTsKLSAgICAgICAgbWF5TmVlZExheW91dCA9 IHRydWU7Ci0gICAgfQotCiAgICAgLy8gZGlkQ2hhbmdlQ29udGVudHNTaXplKCkgbWF5IGJlIGNh bGxlZCBmcm9tIEZyYW1lVmlldzo6bGF5b3V0OyB3ZSBuZWVkIHRvCiAgICAgLy8gcmVsYXlvdXQg dG8gYXZvaWQgdHJpZ2dlcmluZyB0aGUgYXNzZXJ0aW9uIHRoYXQgbmVlZHNMYXlvdXQoKSBpc24n dCBzZXQKICAgICAvLyBhdCB0aGUgZW5kIG9mIGEgbGF5b3V0LgorICAgIEZyYW1lVmlldyogdmll dyA9IG1haW5GcmFtZUltcGwoKS0+ZnJhbWVWaWV3KCk7CiAgICAgaWYgKG1heU5lZWRMYXlvdXQg JiYgdmlldyAmJiB2aWV3LT5uZWVkc0xheW91dCgpKQogICAgICAgICB2aWV3LT5sYXlvdXQoKTsK ICNlbmRpZgpAQCAtNDIzMCwxNiArNDIzMSwxNCBAQCB2b2lkIFdlYlZpZXdJbXBsOjp1cGRhdGVM YXllclRyZWVWaWV3cG9ydCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIEZyYW1lVmlldyogdmll dyA9IHBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKLSAgICBJbnRSZWN0IHZpc2libGVSZWN0 ID0gdmlldy0+dmlzaWJsZUNvbnRlbnRSZWN0KHRydWUgLyogaW5jbHVkZSBzY3JvbGxiYXJzICov KTsKLSAgICBJbnRQb2ludCBzY3JvbGwodmlldy0+c2Nyb2xsWCgpLCB2aWV3LT5zY3JvbGxZKCkp OwogCi0gICAgbV9ub25Db21wb3NpdGVkQ29udGVudEhvc3QtPnNldFZpZXdwb3J0KHZpc2libGVS ZWN0LnNpemUoKSwgdmlldy0+Y29udGVudHNTaXplKCksIHNjcm9sbCwgdmlldy0+c2Nyb2xsT3Jp Z2luKCkpOwotCi0gICAgSW50U2l6ZSBsYXlvdXRWaWV3cG9ydFNpemUgPSB2aXNpYmxlUmVjdC5z aXplKCk7CisgICAgSW50U2l6ZSBsYXlvdXRWaWV3cG9ydFNpemUgPSBsYXlvdXRTaXplKCk7CiAg ICAgSW50U2l6ZSBkZXZpY2VWaWV3cG9ydFNpemUgPSBtX3NpemU7CiAgICAgaWYgKG1fd2ViU2V0 dGluZ3MtPmFwcGx5RGV2aWNlU2NhbGVGYWN0b3JJbkNvbXBvc2l0b3IoKSkKICAgICAgICAgZGV2 aWNlVmlld3BvcnRTaXplLnNjYWxlKGRldmljZVNjYWxlRmFjdG9yKCkpOwogCisgICAgbV9ub25D b21wb3NpdGVkQ29udGVudEhvc3QtPnNldFZpZXdwb3J0KGRldmljZVZpZXdwb3J0U2l6ZSwgdmll dy0+Y29udGVudHNTaXplKCksIHZpZXctPnNjcm9sbFBvc2l0aW9uKCksIHZpZXctPnNjcm9sbE9y aWdpbigpKTsKKwogICAgIG1fbGF5ZXJUcmVlVmlldy0+c2V0Vmlld3BvcnRTaXplKGxheW91dFZp ZXdwb3J0U2l6ZSwgZGV2aWNlVmlld3BvcnRTaXplKTsKICAgICBtX2xheWVyVHJlZVZpZXctPnNl dFBhZ2VTY2FsZUZhY3RvckFuZExpbWl0cyhwYWdlU2NhbGVGYWN0b3IoKSwgbV9taW5pbXVtUGFn ZVNjYWxlRmFjdG9yLCBtX21heGltdW1QYWdlU2NhbGVGYWN0b3IpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggM2U4ZGNkNGI4MmVlMWYwYmVlYzI3NTky ODIzOWU3ODE5MWM2NmI5Ni4uYmEzZDEyY2FkMWRhYTkzMGQ4Yjc0YWI3NDY3MTZiOTM0ZGJiMjIx MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCkBAIC00NjEsNiAr NDYxLDcgQEAgcHVibGljOgogCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBkaXBTaXplKCkgY29uc3Q7 CiAgICAgV2ViQ29yZTo6SW50U2l6ZSBsYXlvdXRTaXplKCkgY29uc3Q7CisgICAgV2ViQ29yZTo6 SW50U2l6ZSBzY2FsZWRTaXplKGZsb2F0KSBjb25zdDsKIAogICAgIC8vIFNldCB0aGUgZGlzcG9z aXRpb24gZm9yIGhvdyB0aGlzIHdlYnZpZXcgaXMgdG8gYmUgaW5pdGlhbGx5IHNob3duLgogICAg IHZvaWQgc2V0SW5pdGlhbE5hdmlnYXRpb25Qb2xpY3koV2ViTmF2aWdhdGlvblBvbGljeSBwb2xp Y3kpCkBAIC02MTEsNyArNjEyLDggQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBib29sIGNvbXB1 dGVQYWdlU2NhbGVGYWN0b3JMaW1pdHMoKTsKICAgICBmbG9hdCBjbGFtcFBhZ2VTY2FsZUZhY3Rv clRvTGltaXRzKGZsb2F0IHNjYWxlKTsKLSAgICBXZWJQb2ludCBjbGFtcE9mZnNldEF0U2NhbGUo Y29uc3QgV2ViUG9pbnQmIG9mZnNldCwgZmxvYXQgc2NhbGUpOworICAgIFdlYkNvcmU6OkludFBv aW50IGNsYW1wT2Zmc2V0QXRTY2FsZShjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgb2Zmc2V0LCBm bG9hdCBzY2FsZSkgY29uc3Q7CisgICAgV2ViQ29yZTo6SW50U2l6ZSB1bnNjYWxlZENvbnRlbnRz U2l6ZSgpIGNvbnN0OwogCiAgICAgdm9pZCByZXNldFNhdmVkU2Nyb2xsQW5kU2NhbGVTdGF0ZSgp OwogCg== 184081 2013-01-22 16:50:42 -0800 2013-01-28 21:29:01 -0800 Patch bug-107391-20130122164736.patch text/plain 7504 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMjE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCAyNTE4M2ZkNTk5MjFh ZWE4OGI5MzFhMjkzZjg1ZDhlNDZjZjBhYTUxLi5lOWIwNWNkOThjN2EwYWNjOTVmNzFhNmQxYjY4 ZTg4M2ZjNDU3ZDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMy0wMS0yMiAg VGllbi1SZW4gQ2hlbiAgPHRyY2hlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgRml4IGRpc2Ft YmlndWF0aW9uIHBvcHVwIGZvciBuZXctc3R5bGUgcGFnZSBzY2FsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MzkxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB2YXJp b3VzIGNvb3JkaW5hdGUgY29udmVyc2lvbiBmb3IgZGlzYW1iaWd1YXRpb24KKyAgICAgICAgcG9w dXAgZm9yIHRoZSBuZXctc3R5bGUgcGFnZSBzY2FsZSBtb2RlLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1dlYkxheWVyVHJlZVZpZXcuaDoKKyAgICAgICAgKFdlYkxheWVyVHJlZVZpZXcp OgorCiAyMDEzLTAxLTE4ICBBbGkgSnVtYSAgPGFqdW1hQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIENvbnZlcnQgV2ViVHJhbnNmb3JtT3BlcmF0aW9ucyBpbnRvIHB1cmUgdmly dHVhbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDkxMTk2NWNjNTg1NzI4YWViMDA5ODVkY2ZlNjEwOWRjYjRlOTlj MDAuLmYzNmZiZTg3ODVlNWU3ZDY2MjZlZjQzODZhNDM1NzgxOTdkYjY4MzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSw0MSBAQAorMjAxMy0wMS0yMiAgVGllbi1SZW4gQ2hlbiAgPHRyY2hlbkBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgRml4IGRpc2FtYmlndWF0aW9uIHBvcHVwIGZvciBuZXctc3R5 bGUgcGFnZSBzY2FsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA3MzkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBjb3JyZWN0cyB2YXJpb3VzIGNvb3JkaW5hdGUgY29udmVyc2lvbiBm b3IgZGlzYW1iaWd1YXRpb24KKyAgICAgICAgcG9wdXAgZm9yIHRoZSBuZXctc3R5bGUgcGFnZSBz Y2FsZSBtb2RlLgorCisgICAgICAgIE5lZWQgdG8gdXBkYXRlIGV4aXN0aW5nIHRlc3QgdG8gdXNl IHRoZSBuZXcgc2NhbGluZyBtb2RlLgorCisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250cm9s bGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpzYXZlU2Nyb2xs UG9zaXRpb25BbmRWaWV3U3RhdGVUb0l0ZW0pOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rv cik6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAg ICAgICAoRnJhbWVWaWV3KToKKyAgICAgICAgKiBwYWdlL1BhZ2UuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UGFnZTo6c2V0UGFnZVNjYWxlRmFjdG9yKToKKyAgICAgICAgKiBwYWdlL1RvdWNoRGlz YW1iaWd1YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZmluZEdvb2RUb3VjaFRhcmdldHMp OgorICAgICAgICAqIHBhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5oOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTY3JvbGxWaWV3Ojp1bnNjYWxlZFZpc2libGVDb250ZW50U2l6ZSk6CisgICAgICAgIChXZWJD b3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnZpc2libGVDb250ZW50UmVjdCk6 CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29yZTo6U2Ny b2xsVmlldzo6dmlzaWJsZUNvbnRlbnRTY2FsZUZhY3Rvcik6CisgICAgICAgIChTY3JvbGxWaWV3 KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6ZnJhbWVWaWV3RGlkQ2hhbmdlU2l6 ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZVJvb3RM YXllclBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvVGV4dEF1dG9zaXplci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpUZXh0QXV0b3NpemVyOjpwcm9jZXNzU3VidHJlZSk6CisKIDIwMTMt MDEtMTggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJld29y ayBOZXR3b3JrUHJvY2VzcyByZXNvdXJjZSBsb2FkIGlkZW50aWZpZXJzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L0NoYW5nZUxvZwppbmRleCA4NzZhOTJkODE4ZjdmYjE2MWQ1Mjc1Njk2MzUzZTJkOTVjMjczNjAx Li5mNDdhMmNhY2NiYmMyYjNkM2FiOWRmZmVhNzJjYzQwMjJhZTZhYWFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEzLTAxLTIyICBUaWVuLVJlbiBDaGVu ICA8dHJjaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggZGlzYW1iaWd1YXRpb24gcG9w dXAgZm9yIG5ldy1zdHlsZSBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDczOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvcnJlY3RzIHZhcmlvdXMgY29vcmRpbmF0 ZSBjb252ZXJzaW9uIGZvciBkaXNhbWJpZ3VhdGlvbgorICAgICAgICBwb3B1cCBmb3IgdGhlIG5l dy1zdHlsZSBwYWdlIHNjYWxlIG1vZGUuCisKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KToKKyAg ICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OnNjYWxlZFNpemUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJWaWV3SW1wbDo6c2l6ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpyZXNp emUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlSW5wdXRFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpjbGFtcE9mZnNldEF0U2NhbGUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0UGFnZVNjYWxlRmFjdG9yUHJlc2VydmluZ1Njcm9s bE9mZnNldCk6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRQYWdlU2NhbGVGYWN0 b3IpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6dW5zY2FsZWRDb250ZW50c1NpemUp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6bGF5b3V0U2l6ZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlZpZXdJbXBsOjpjb21wdXRlUGFnZVNjYWxlRmFjdG9yTGltaXRzKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjp1cGRhdGVMYXllclRyZWVWaWV3cG9ydCk6CisgICAgICAg ICogc3JjL1dlYlZpZXdJbXBsLmg6CisgICAgICAgIChXZWJWaWV3SW1wbCk6CisKIDIwMTMtMDEt MTggIEFscGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1d IFJvbGwgQ2hyb21pdW0gREVQUyB0byAxNzc2NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNo RGlzYW1iaWd1YXRpb24uY3BwCmluZGV4IDhjZjlkNTAxY2M1OWEzYmZmMTZlMGVkZTQ3MWUwNDI2 MmRhMzQ1NzMuLjU3ODhkZDAwMDVhODliZjRkYzkxZDlkODU2YzlmNTRhMmJhNWVhMjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcApAQCAtODYsMTQgKzg2 LDE0IEBAIHN0cnVjdCBUb3VjaFRhcmdldERhdGEgewogICAgIGZsb2F0IHNjb3JlOwogfTsKIAot dm9pZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0JiB0b3VjaEJveCwgRnJhbWUq IG1haW5GcmFtZSwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW50UmVjdD4mIGdvb2RU YXJnZXRzKQordm9pZCBmaW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0JiB0b3VjaEJv eCwgRnJhbWUqIG1haW5GcmFtZSwgVmVjdG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0cykKIHsKICAg ICBnb29kVGFyZ2V0cy5jbGVhcigpOwogCiAgICAgaW50IHRvdWNoUG9pbnRQYWRkaW5nID0gY2Vp bChtYXgodG91Y2hCb3gud2lkdGgoKSwgdG91Y2hCb3guaGVpZ2h0KCkpICogMC41KTsKICAgICAv LyBGSVhNRTogUmVjdC1iYXNlZCBoaXQgdGVzdCBkb2Vzbid0IHRyYW5zZm9ybSB0aGUgdG91Y2gg cG9pbnQgc2l6ZS4KLSAgICAvLyAgICAgICAgV2UgaGF2ZSB0byBwcmUtYXBwbHkgcGFnZSBzY2Fs ZSBmYWN0b3IgaGVyZS4KLSAgICBpbnQgcGFkZGluZyA9IGNlaWwodG91Y2hQb2ludFBhZGRpbmcg LyBwYWdlU2NhbGVGYWN0b3IpOworICAgIC8vICAgICAgICBXZSBoYXZlIHRvIHByZS1hcHBseSBm cmFtZSBzY2FsZSBmYWN0b3IgaGVyZS4KKyAgICBpbnQgcGFkZGluZyA9IGNlaWwodG91Y2hQb2lu dFBhZGRpbmcgLyBtYWluRnJhbWUtPmZyYW1lU2NhbGVGYWN0b3IoKSk7CiAKICAgICBJbnRQb2lu dCB0b3VjaFBvaW50ID0gdG91Y2hCb3guY2VudGVyKCk7CiAgICAgSW50UG9pbnQgY29udGVudHNQ b2ludCA9IG1haW5GcmFtZS0+dmlldygpLT53aW5kb3dUb0NvbnRlbnRzKHRvdWNoUG9pbnQpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmggYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uaAppbmRleCA1YWZlYjZiNWIz ZGY0MWYyZTVmOTk4ZTA0YzA4ZTg3NmZiZjg0ZjFkLi5lMDhiOTU0ZTZhYjRjMmY4NWRkYzJhZGZl MGE0NTdiOGQwM2U4MzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlz YW1iaWd1YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRp b24uaApAQCAtMzgsNyArMzgsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBGcmFtZTsK IGNsYXNzIEludFJlY3Q7CiAKLXZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVj dCYgdG91Y2hCb3gsIEZyYW1lKiBtYWluRnJhbWUsIGZsb2F0IHBhZ2VTY2FsZUZhY3RvciwgVmVj dG9yPEludFJlY3Q+JiBnb29kVGFyZ2V0cyk7Cit2b2lkIGZpbmRHb29kVG91Y2hUYXJnZXRzKGNv bnN0IEludFJlY3QmIHRvdWNoQm94LCBGcmFtZSogbWFpbkZyYW1lLCBWZWN0b3I8SW50UmVjdD4m IGdvb2RUYXJnZXRzKTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKaW5kZXggNDc3ZDFiMjc2M2NlZjlhZjkzYzk4 ZWI1NDUzMTgzMzQyNjViYjQwZC4uOTEwYjdlYTBjODk3YWUxYzFiZjM1ZWU0ZWM2ZDI2ZmMyMjNj NWFlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAt NzU3LDcgKzc1Nyw3IEBAIGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudChjb25z dCBXZWJHZXN0dXJlRXZlbnQmIGV2ZW50KQogICAgICAgICBpZiAoZXZlbnQuZGF0YS50YXAud2lk dGggPiAwKSB7CiAgICAgICAgICAgICBJbnRSZWN0IGJvdW5kaW5nQm94KGV2ZW50LnggLSBldmVu dC5kYXRhLnRhcC53aWR0aCAvIDIsIGV2ZW50LnkgLSBldmVudC5kYXRhLnRhcC5oZWlnaHQgLyAy LCBldmVudC5kYXRhLnRhcC53aWR0aCwgZXZlbnQuZGF0YS50YXAuaGVpZ2h0KTsKICAgICAgICAg ICAgIFZlY3RvcjxJbnRSZWN0PiBnb29kVGFyZ2V0czsKLSAgICAgICAgICAgIGZpbmRHb29kVG91 Y2hUYXJnZXRzKGJvdW5kaW5nQm94LCBtYWluRnJhbWVJbXBsKCktPmZyYW1lKCksIHBhZ2VTY2Fs ZUZhY3RvcigpLCBnb29kVGFyZ2V0cyk7CisgICAgICAgICAgICBmaW5kR29vZFRvdWNoVGFyZ2V0 cyhib3VuZGluZ0JveCwgbWFpbkZyYW1lSW1wbCgpLT5mcmFtZSgpLCBnb29kVGFyZ2V0cyk7CiAg ICAgICAgICAgICAvLyBGSVhNRTogcmVwbGFjZSB0b3VjaCBhZGp1c3RtZW50IGNvZGUgd2hlbiBu dW1iZXJPZkdvb2RUYXJnZXRzID09IDE/CiAgICAgICAgICAgICAvLyBTaW5nbGUgY2FuZGlkYXRl IGNhc2UgaXMgY3VycmVudGx5IGhhbmRsZWQgYnk6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NTEwMQogICAgICAgICAgICAgaWYgKGdvb2RUYXJnZXRzLnNpemUoKSA+ PSAyICYmIG1fY2xpZW50ICYmIG1fY2xpZW50LT5kaWRUYXBNdWx0aXBsZVRhcmdldHMoZXZlbnQs IGdvb2RUYXJnZXRzKSkgewpAQCAtMjA5MCw2ICsyMDkwLDggQEAgYm9vbCBXZWJWaWV3SW1wbDo6 aGFuZGxlSW5wdXRFdmVudChjb25zdCBXZWJJbnB1dEV2ZW50JiBpbnB1dEV2ZW50KQogICAgICAg ICAgICAgZ2VzdHVyZUV2ZW50ID0gKnN0YXRpY19jYXN0PGNvbnN0IFdlYkdlc3R1cmVFdmVudCo+ KCZpbnB1dEV2ZW50KTsKICAgICAgICAgICAgIGdlc3R1cmVFdmVudC54ID0gZ2VzdHVyZUV2ZW50 LnggLyBwYWdlU2NhbGVGYWN0b3IoKTsKICAgICAgICAgICAgIGdlc3R1cmVFdmVudC55ID0gZ2Vz dHVyZUV2ZW50LnkgLyBwYWdlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgIGdlc3R1cmVFdmVu dC5kYXRhLnRhcC53aWR0aCAvPSBwYWdlU2NhbGVGYWN0b3IoKTsKKyAgICAgICAgICAgIGdlc3R1 cmVFdmVudC5kYXRhLnRhcC5oZWlnaHQgLz0gcGFnZVNjYWxlRmFjdG9yKCk7CiAgICAgICAgICAg ICBpbnB1dEV2ZW50VHJhbnNmb3JtZWQgPSBzdGF0aWNfY2FzdDxjb25zdCBXZWJJbnB1dEV2ZW50 Kj4oJmdlc3R1cmVFdmVudCk7CiAgICAgICAgIH0KICAgICB9Cg== 185148 2013-01-28 21:29:05 -0800 2013-01-28 23:30:58 -0800 Patch bug-107391-20130128212552.patch text/plain 8041 trchen U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjUyMTI5ODQxZmE3MzY5 MjI0NjE2N2E5ZGRjOWU5Nzk1ZTdjZDFjYy4uZjgzMWUzNWYzMWY5NzI0YTllNTg0NmM0ZGU3Yjc1 MzQ1YjAzNzY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTAxLTI4ICBUaWVu LVJlbiBDaGVuICA8dHJjaGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBGaXggZGlzYW1iaWd1 YXRpb24gcG9wdXAgZm9yIG5ldy1zdHlsZSBwYWdlIHNjYWxlCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDczOTEKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNvcnJlY3RzIHZhcmlvdXMg Y29vcmRpbmF0ZSBjb252ZXJzaW9uIGZvciBkaXNhbWJpZ3VhdGlvbgorICAgICAgICBwb3B1cCBm b3IgdGhlIG5ldy1zdHlsZSBwYWdlIHNjYWxlIG1vZGUuCisKKyAgICAgICAgTmV3IHVuaXQgdGVz dDogV2ViRnJhbWVUZXN0LkRpc2FtYmlndWF0aW9uUG9wdXBQYWdlU2NhbGUKKworICAgICAgICAq IHBhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpmaW5kR29v ZFRvdWNoVGFyZ2V0cyk6CisgICAgICAgICogcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9uLmg6Cisg ICAgICAgIChXZWJDb3JlKToKKwogMjAxMy0wMS0yOCAgVG9tIFNlcGV6ICA8dHNlcGV6QGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbdjhdIFNlY3VyaXR5IGZlYXR1cmU6IEphdmFTY3JpcHQgQmlu ZGluZ3MgaGFyZGVuaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDBlYzM4MjM0M2Ex NmVkOGM2MTNhZTM5NjNjNzVmYjRiYjNmZjU5OTAuLjI3ZjBkZmQ5OWYyZjg5ZGJjMjYxNWY2NDUw ZmQzNGJlMzYxMDIwY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDEtMjggIFRpZW4tUmVuIENoZW4gIDx0cmNoZW5AY2hyb21pdW0ub3JnPgorCisg ICAgICAgIEZpeCBkaXNhbWJpZ3VhdGlvbiBwb3B1cCBmb3IgbmV3LXN0eWxlIHBhZ2Ugc2NhbGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzM5MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0 Y2ggY29ycmVjdHMgdmFyaW91cyBjb29yZGluYXRlIGNvbnZlcnNpb24gZm9yIGRpc2FtYmlndWF0 aW9uCisgICAgICAgIHBvcHVwIGZvciB0aGUgbmV3LXN0eWxlIHBhZ2Ugc2NhbGUgbW9kZS4KKwor ICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJ bXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6 aGFuZGxlSW5wdXRFdmVudCk6CisgICAgICAgICogdGVzdHMvV2ViRnJhbWVUZXN0LmNwcDoKKyAg ICAgICAgKiB0ZXN0cy9kYXRhL2Rpc2FtYmlndWF0aW9uX3BvcHVwX3BhZ2Vfc2NhbGUuaHRtbDog QWRkZWQuCisKIDIwMTMtMDEtMjggIFRvbSBTZXBleiAgPHRzZXBlekBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW3Y4XSBTZWN1cml0eSBmZWF0dXJlOiBKYXZhU2NyaXB0IEJpbmRpbmdzIGhhcmRl bmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaERpc2FtYmlndWF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5jcHAKaW5kZXgg OGNmOWQ1MDFjYzU5YTNiZmYxNmUwZWRlNDcxZTA0MjYyZGEzNDU3My4uNTc4OGRkMDAwNWE4OWJm NGRjOTFkOWQ4NTZjOWY1NGEyYmE1ZWEyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9Ub3VjaERpc2FtYmlndWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNo RGlzYW1iaWd1YXRpb24uY3BwCkBAIC04NiwxNCArODYsMTQgQEAgc3RydWN0IFRvdWNoVGFyZ2V0 RGF0YSB7CiAgICAgZmxvYXQgc2NvcmU7CiB9OwogCi12b2lkIGZpbmRHb29kVG91Y2hUYXJnZXRz KGNvbnN0IEludFJlY3QmIHRvdWNoQm94LCBGcmFtZSogbWFpbkZyYW1lLCBmbG9hdCBwYWdlU2Nh bGVGYWN0b3IsIFZlY3RvcjxJbnRSZWN0PiYgZ29vZFRhcmdldHMpCit2b2lkIGZpbmRHb29kVG91 Y2hUYXJnZXRzKGNvbnN0IEludFJlY3QmIHRvdWNoQm94LCBGcmFtZSogbWFpbkZyYW1lLCBWZWN0 b3I8SW50UmVjdD4mIGdvb2RUYXJnZXRzKQogewogICAgIGdvb2RUYXJnZXRzLmNsZWFyKCk7CiAK ICAgICBpbnQgdG91Y2hQb2ludFBhZGRpbmcgPSBjZWlsKG1heCh0b3VjaEJveC53aWR0aCgpLCB0 b3VjaEJveC5oZWlnaHQoKSkgKiAwLjUpOwogICAgIC8vIEZJWE1FOiBSZWN0LWJhc2VkIGhpdCB0 ZXN0IGRvZXNuJ3QgdHJhbnNmb3JtIHRoZSB0b3VjaCBwb2ludCBzaXplLgotICAgIC8vICAgICAg ICBXZSBoYXZlIHRvIHByZS1hcHBseSBwYWdlIHNjYWxlIGZhY3RvciBoZXJlLgotICAgIGludCBw YWRkaW5nID0gY2VpbCh0b3VjaFBvaW50UGFkZGluZyAvIHBhZ2VTY2FsZUZhY3Rvcik7CisgICAg Ly8gICAgICAgIFdlIGhhdmUgdG8gcHJlLWFwcGx5IGZyYW1lIHNjYWxlIGZhY3RvciBoZXJlLgor ICAgIGludCBwYWRkaW5nID0gY2VpbCh0b3VjaFBvaW50UGFkZGluZyAvIG1haW5GcmFtZS0+ZnJh bWVTY2FsZUZhY3RvcigpKTsKIAogICAgIEludFBvaW50IHRvdWNoUG9pbnQgPSB0b3VjaEJveC5j ZW50ZXIoKTsKICAgICBJbnRQb2ludCBjb250ZW50c1BvaW50ID0gbWFpbkZyYW1lLT52aWV3KCkt PndpbmRvd1RvQ29udGVudHModG91Y2hQb2ludCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1RvdWNoRGlzYW1iaWd1YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hE aXNhbWJpZ3VhdGlvbi5oCmluZGV4IDVhZmViNmI1YjNkZjQxZjJlNWY5OThlMDRjMDhlODc2ZmJm ODRmMWQuLmUwOGI5NTRlNmFiNGMyZjg1ZGRjMmFkZmUwYTQ1N2I4ZDAzZTgzMGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVG91Y2hEaXNhbWJpZ3VhdGlvbi5oCkBAIC0zOCw3ICszOCw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIEZyYW1lOwogY2xhc3MgSW50UmVjdDsKIAotdm9pZCBm aW5kR29vZFRvdWNoVGFyZ2V0cyhjb25zdCBJbnRSZWN0JiB0b3VjaEJveCwgRnJhbWUqIG1haW5G cmFtZSwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBWZWN0b3I8SW50UmVjdD4mIGdvb2RUYXJnZXRz KTsKK3ZvaWQgZmluZEdvb2RUb3VjaFRhcmdldHMoY29uc3QgSW50UmVjdCYgdG91Y2hCb3gsIEZy YW1lKiBtYWluRnJhbWUsIFZlY3RvcjxJbnRSZWN0PiYgZ29vZFRhcmdldHMpOwogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcAppbmRleCA5Mzk0MGMxZTI2ODNiNjlhYTg5OTJlOTc0ZDE0MGZiYjFlMzQ0MDBkLi5jMzUx N2QxY2RlM2U2YzI2MDNhZTk0ZDE0NmI2NWNjNDA2ODdhOGEzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC03NTgsNyArNzU4LDcgQEAgYm9vbCBXZWJW aWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KGNvbnN0IFdlYkdlc3R1cmVFdmVudCYgZXZlbnQp CiAgICAgICAgIGlmIChldmVudC5kYXRhLnRhcC53aWR0aCA+IDAgJiYgIXNob3VsZERpc2FibGVE ZXNrdG9wV29ya2Fyb3VuZHMoKSkgewogICAgICAgICAgICAgSW50UmVjdCBib3VuZGluZ0JveChl dmVudC54IC0gZXZlbnQuZGF0YS50YXAud2lkdGggLyAyLCBldmVudC55IC0gZXZlbnQuZGF0YS50 YXAuaGVpZ2h0IC8gMiwgZXZlbnQuZGF0YS50YXAud2lkdGgsIGV2ZW50LmRhdGEudGFwLmhlaWdo dCk7CiAgICAgICAgICAgICBWZWN0b3I8SW50UmVjdD4gZ29vZFRhcmdldHM7Ci0gICAgICAgICAg ICBmaW5kR29vZFRvdWNoVGFyZ2V0cyhib3VuZGluZ0JveCwgbWFpbkZyYW1lSW1wbCgpLT5mcmFt ZSgpLCBwYWdlU2NhbGVGYWN0b3IoKSwgZ29vZFRhcmdldHMpOworICAgICAgICAgICAgZmluZEdv b2RUb3VjaFRhcmdldHMoYm91bmRpbmdCb3gsIG1haW5GcmFtZUltcGwoKS0+ZnJhbWUoKSwgZ29v ZFRhcmdldHMpOwogICAgICAgICAgICAgLy8gRklYTUU6IHJlcGxhY2UgdG91Y2ggYWRqdXN0bWVu dCBjb2RlIHdoZW4gbnVtYmVyT2ZHb29kVGFyZ2V0cyA9PSAxPwogICAgICAgICAgICAgLy8gU2lu Z2xlIGNhbmRpZGF0ZSBjYXNlIGlzIGN1cnJlbnRseSBoYW5kbGVkIGJ5OiBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODUxMDEKICAgICAgICAgICAgIGlmIChnb29kVGFy Z2V0cy5zaXplKCkgPj0gMiAmJiBtX2NsaWVudCAmJiBtX2NsaWVudC0+ZGlkVGFwTXVsdGlwbGVU YXJnZXRzKGV2ZW50LCBnb29kVGFyZ2V0cykpIHsKQEAgLTIxMTQsNiArMjExNCw4IEBAIGJvb2wg V2ViVmlld0ltcGw6OmhhbmRsZUlucHV0RXZlbnQoY29uc3QgV2ViSW5wdXRFdmVudCYgaW5wdXRF dmVudCkKICAgICAgICAgICAgIGdlc3R1cmVFdmVudCA9ICpzdGF0aWNfY2FzdDxjb25zdCBXZWJH ZXN0dXJlRXZlbnQqPigmaW5wdXRFdmVudCk7CiAgICAgICAgICAgICBnZXN0dXJlRXZlbnQueCA9 IGdlc3R1cmVFdmVudC54IC8gcGFnZVNjYWxlRmFjdG9yKCk7CiAgICAgICAgICAgICBnZXN0dXJl RXZlbnQueSA9IGdlc3R1cmVFdmVudC55IC8gcGFnZVNjYWxlRmFjdG9yKCk7CisgICAgICAgICAg ICBnZXN0dXJlRXZlbnQuZGF0YS50YXAud2lkdGggLz0gcGFnZVNjYWxlRmFjdG9yKCk7CisgICAg ICAgICAgICBnZXN0dXJlRXZlbnQuZGF0YS50YXAuaGVpZ2h0IC89IHBhZ2VTY2FsZUZhY3Rvcigp OwogICAgICAgICAgICAgaW5wdXRFdmVudFRyYW5zZm9ybWVkID0gc3RhdGljX2Nhc3Q8Y29uc3Qg V2ViSW5wdXRFdmVudCo+KCZnZXN0dXJlRXZlbnQpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IGVjNWRjNjVi YWM5ODJhY2NiYjdiYzQxNmJhOTIwOGU4YTQwZGVmYTYuLjFiMzIyM2I3ZWM4OTJlMmE5OThhY2I2 YmU0YWFkNjk5MmI5NTkxOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YkZyYW1lVGVzdC5jcHAKQEAgLTIwNjcsNiArMjA2Nyw0MCBAQCBURVNUX0YoV2ViRnJhbWVUZXN0 LCBEaXNhbWJpZ3VhdGlvblBvcHVwTW9iaWxlU2l0ZSkKICAgICB9CiB9CiAKK1RFU1RfRihXZWJG cmFtZVRlc3QsIERpc2FtYmlndWF0aW9uUG9wdXBQYWdlU2NhbGUpCit7CisgICAgcmVnaXN0ZXJN b2NrZWRIdHRwVVJMTG9hZCgiZGlzYW1iaWd1YXRpb25fcG9wdXBfcGFnZV9zY2FsZS5odG1sIik7 CisKKyAgICBEaXNhbWJpZ3VhdGlvblBvcHVwVGVzdFdlYlZpZXdDbGllbnQgY2xpZW50OworCisg ICAgLy8gTWFrZSBzdXJlIHdlIGluaXRpYWxpemUgdG8gbWluaW11bSBzY2FsZSwgZXZlbiBpZiB0 aGUgd2luZG93IHNpemUKKyAgICAvLyBvbmx5IGJlY29tZXMgYXZhaWxhYmxlIGFmdGVyIHRoZSBs b2FkIGJlZ2lucy4KKyAgICBXZWJWaWV3SW1wbCogd2ViVmlld0ltcGwgPSBzdGF0aWNfY2FzdDxX ZWJWaWV3SW1wbCo+KEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdlYlZpZXdBbmRMb2FkKG1fYmFz ZVVSTCArICJkaXNhbWJpZ3VhdGlvbl9wb3B1cF9wYWdlX3NjYWxlLmh0bWwiLCB0cnVlLCAwLCAm Y2xpZW50KSk7CisgICAgd2ViVmlld0ltcGwtPnNldHRpbmdzKCktPnNldEFwcGx5RGV2aWNlU2Nh bGVGYWN0b3JJbkNvbXBvc2l0b3IodHJ1ZSk7CisgICAgd2ViVmlld0ltcGwtPnNldHRpbmdzKCkt PnNldEFwcGx5UGFnZVNjYWxlRmFjdG9ySW5Db21wb3NpdG9yKHRydWUpOworICAgIHdlYlZpZXdJ bXBsLT5yZXNpemUoV2ViU2l6ZSgxMDAwLCAxMDAwKSk7CisgICAgd2ViVmlld0ltcGwtPmxheW91 dCgpOworCisgICAgY2xpZW50LnJlc2V0VHJpZ2dlcmVkKCk7CisgICAgd2ViVmlld0ltcGwtPmhh bmRsZUlucHV0RXZlbnQoZmF0VGFwKDgwLCA4MCkpOworICAgIEVYUEVDVF9UUlVFKGNsaWVudC50 cmlnZ2VyZWQoKSk7CisKKyAgICBjbGllbnQucmVzZXRUcmlnZ2VyZWQoKTsKKyAgICB3ZWJWaWV3 SW1wbC0+aGFuZGxlSW5wdXRFdmVudChmYXRUYXAoMjMwLCAxOTApKTsKKyAgICBFWFBFQ1RfVFJV RShjbGllbnQudHJpZ2dlcmVkKCkpOworCisgICAgd2ViVmlld0ltcGwtPnNldFBhZ2VTY2FsZUZh Y3RvcigzLjBmLCBXZWJQb2ludCgwLCAwKSk7CisgICAgd2ViVmlld0ltcGwtPmxheW91dCgpOwor CisgICAgY2xpZW50LnJlc2V0VHJpZ2dlcmVkKCk7CisgICAgd2ViVmlld0ltcGwtPmhhbmRsZUlu cHV0RXZlbnQoZmF0VGFwKDI0MCwgMjQwKSk7CisgICAgRVhQRUNUX1RSVUUoY2xpZW50LnRyaWdn ZXJlZCgpKTsKKworICAgIGNsaWVudC5yZXNldFRyaWdnZXJlZCgpOworICAgIHdlYlZpZXdJbXBs LT5oYW5kbGVJbnB1dEV2ZW50KGZhdFRhcCg2OTAsIDU3MCkpOworICAgIEVYUEVDVF9GQUxTRShj bGllbnQudHJpZ2dlcmVkKCkpOworfQorCiBjbGFzcyBUZXN0U3Vic3RpdHV0ZURhdGFXZWJGcmFt ZUNsaWVudCA6IHB1YmxpYyBXZWJGcmFtZUNsaWVudCB7CiBwdWJsaWM6CiAgICAgVGVzdFN1YnN0 aXR1dGVEYXRhV2ViRnJhbWVDbGllbnQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS90ZXN0cy9kYXRhL2Rpc2FtYmlndWF0aW9uX3BvcHVwX3BhZ2Vfc2NhbGUuaHRtbCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9wYWdl X3NjYWxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGI4YjdmNWRmYWM3MGIwZDM2MmQwZDBjNTlhZWE1ZmJk YWQ1MmQ3MQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv ZGF0YS9kaXNhbWJpZ3VhdGlvbl9wb3B1cF9wYWdlX3NjYWxlLmh0bWwKQEAgLTAsMCArMSwyMCBA QAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5EaXNhbWJpZ3VhdGlvbiBQb3B1cCBUZXN0PC90aXRs ZT4KKzxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CisubGluayB7CisgICAgZGlzcGxheTpibG9jazsK KyAgICBwb3NpdGlvbjphYnNvbHV0ZTsKKyAgICB3aWR0aDoyMDBweDsKKyAgICBoZWlnaHQ6MzBw eDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiNjY2NjZmY7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgor PGJvZHk+Cis8YSBocmVmPSIjIiBjbGFzcz0ibGluayIgc3R5bGU9ImxlZnQ6NTBweDt0b3A6NTBw eDsiPkxpbmsgMTwvYT4KKzxhIGhyZWY9IiMiIGNsYXNzPSJsaW5rIiBzdHlsZT0ibGVmdDo1MHB4 O3RvcDo4MHB4OyI+TGluayAyPC9hPgorPGEgaHJlZj0iIyIgY2xhc3M9ImxpbmsiIHN0eWxlPSJs ZWZ0OjIwMHB4O3RvcDoxNTBweDsiPkxpbmsgMzwvYT4KKzxhIGhyZWY9IiMiIGNsYXNzPSJsaW5r IiBzdHlsZT0ibGVmdDoyMDBweDt0b3A6MjAwcHg7Ij5MaW5rIDQ8L2E+Cis8L2JvZHk+Cis8L2h0 bWw+Cg==