117673 2013-06-15 10:27:48 -0700 Move Pasteboard::getStringSelection to Editor, fixing a layering violation 2013-06-15 19:21:44 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 darin darin buildbot commit-queue rniwa oldest_to_newest 900784 0 darin 2013-06-15 10:27:48 -0700 Move Pasteboard::getStringSelection to Editor, fixing a layering violation 900785 1 204770 darin 2013-06-15 10:35:15 -0700 Created attachment 204770 Patch 900788 2 204770 buildbot 2013-06-15 10:59:24 -0700 Comment on attachment 204770 Patch Attachment 204770 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/913116 900790 3 204772 darin 2013-06-15 11:03:03 -0700 Created attachment 204772 Patch 900792 4 204772 rniwa 2013-06-15 11:18:13 -0700 Comment on attachment 204772 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204772&action=review > Source/WebCore/editing/mac/EditorMac.mm:278 > +// FIXME: Makes no sense that selectedTextForClipboard always includes alt text, but stringSelectionForPasteboard does not. > +// This was left in a bad state when selectedTextForClipboard was added. Need to look over clients and fix this. There is some discussion in https://bugs.webkit.org/show_bug.cgi?id=11200 but the idea is that we don't want to include alt text when we're exposing it to Mac services. I think the one that doesn't include alt should be postfixed with "ForClipboard". 900845 5 204772 commit-queue 2013-06-15 19:21:41 -0700 Comment on attachment 204772 Patch Clearing flags on attachment: 204772 Committed r151620: <http://trac.webkit.org/changeset/151620> 900846 6 commit-queue 2013-06-15 19:21:44 -0700 All reviewed patches have been landed. Closing bug. 204770 2013-06-15 10:35:15 -0700 2013-06-15 11:02:59 -0700 Patch bug-117673-20130615103331.patch text/plain 7762 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc3ODkzZWNkYjdiYmJm MmNlZGY3ZWJhMTExMzJjMzhkN2ZmOTYxNC4uNTkxMDU2YzRhOWIyZjhiY2Q5YWU3MjllZTY1Njdk MzNkYWRjODk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTE1ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFBhc3RlYm9hcmQ6Omdl dFN0cmluZ1NlbGVjdGlvbiB0byBFZGl0b3IsIGZpeGluZyBhIGxheWVyaW5nIHZpb2xhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5n L0VkaXRvci5oOiBBZGRlZCBzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkV2l0aEltYWdlQWx0 VGV4dC4KKworICAgICAgICAqIGVkaXRpbmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdl YkNvcmU6OkVkaXRvcjo6c3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZCk6IE1vdmVkIGNvZGUg aGVyZSBmcm9tIHRoZSBQYXN0ZWJvYXJkCisgICAgICAgIGNsYXNzLCBzaW5jZSBhbGwgdGhlIFBh c3RlYm9hcmQgY2xhc3MgZGlkIHJlYWxseSB3YXMgdHVybiBhcm91bmQgYW5kIGNhbGwgYmFjayBo ZXJlLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJv YXJkV2l0aEltYWdlQWx0VGV4dCk6IEFkZGVkLiBWYXJpYW50IG9mCisgICAgICAgIHRoZSBmdW5j dGlvbiBhYm92ZSB0aGF0IGluY2x1ZGVzIGltYWdlIGFsdCB0ZXh0LiBTZXBhcmF0ZSBuYW1lZCBm dW5jdGlvbnMgYXJlIG9mdGVuCisgICAgICAgIHRoZSBiZXN0IHBhdHRlcm4gZm9yIHNvbWV0aGlu ZyBsaWtlIHRoaXMgdW5sZXNzIHRoZXJlIGFyZSBtYW55IGRpZmZlcmVudCBjb21iaW5hdGlvbnMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmg6IFJlbW92ZSB0aGUgTWFjLW9ubHkg UGFzdGVib2FyZDo6Z2V0U3RyaW5nU2VsZWN0aW9vbi4KKworICAgICAgICAqIHBsYXRmb3JtL2lv cy9QYXN0ZWJvYXJkSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVT ZWxlY3Rpb24pOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb25Gb3JUeXBlcyk6CisgICAg ICAgIENhbGwgdGhlIHR3byBuZXcgZnVuY3Rpb25zIGluc3RlYWQgb2YgdGhlIG9sZCBQYXN0ZWJv YXJkOjpnZXRTdHJpbmdTZWxlY3Rpb24uCisKIDIwMTMtMDYtMTQgIERlYW4gSmFja3NvbiAgPGRp bm9AYXBwbGUuY29tPgogCiAgICAgICAgIENsaWNraW5nIG9uIHNuYXBzaG90dGluZyBwbHVnLWlu cyBkb2VzIG5vdCByZXN0YXJ0IHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCmluZGV4IDRiZWI5 MzI4MTMyMDRiYzkzNjQ3ZDg5NWZkOTM0N2MzNTQwMzYyNTMuLjM1MDhmYzAxNzRkYWFmYWZmOThi OTRmNWNmNTUxZjg2YTc0ZDdlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaApAQCAtMzk3LDYg KzM5Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdyaXRlU2VsZWN0aW9uVG9QYXN0ZWJvYXJkKGNv bnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXN0ZWJv YXJkVHlwZXMpOwogICAgIHZvaWQgcmVhZFNlbGVjdGlvbkZyb21QYXN0ZWJvYXJkKGNvbnN0IFN0 cmluZyYgcGFzdGVib2FyZE5hbWUpOwogICAgIFN0cmluZyBzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0 ZWJvYXJkKCk7CisgICAgU3RyaW5nIHN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmRXaXRoSW1h Z2VBbHRUZXh0KCk7CiAgICAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGRhdGFTZWxlY3Rpb25G b3JQYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpOwogI2VuZGlmCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCA2NmZiZDEwNzEyOGViYjMx MDI5NWJiYWEyODc4NzY1ODY5NDYyNDIwLi45ZTAxNzhjYmYwZGNhNzM5MTc3NWMzYjU0NDM1ZTE1 ODAzMmRlMTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JN YWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBAIC0y NzQsOSArMjc0LDIwIEBAIHZvaWQgRWRpdG9yOjpyZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQo Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSkKICAgICAgICAgcGFzdGVBc1BsYWluVGV4dFdp dGhQYXN0ZWJvYXJkKCZwYXN0ZWJvYXJkKTsgICAKIH0KIAorLy8gRklYTUU6IE1ha2VzIG5vIHNl bnNlIHRoYXQgc2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkIGFsd2F5cyBpbmNsdWRlcyBhbHQgdGV4 dCwgYnV0IHN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQgZG9lcyBub3QuCisvLyBUaGlzIHdh cyBsZWZ0IGluIGEgYmFkIHN0YXRlIHdoZW4gc2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkIHdhcyBh ZGRlZC4gTmVlZCB0byBsb29rIG92ZXIgY2xpZW50cyBhbmQgZml4IHRoaXMuCiBTdHJpbmcgRWRp dG9yOjpzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCkKIHsKLSAgICByZXR1cm4gUGFzdGVi b2FyZDo6Z2V0U3RyaW5nU2VsZWN0aW9uKG1fZnJhbWUsIERlZmF1bHRTZWxlY3RlZFRleHRUeXBl KTsKKyAgICBTdHJpbmcgdGV4dCA9IHNlbGVjdGVkVGV4dCgpOworICAgIHRleHQucmVwbGFjZShu b0JyZWFrU3BhY2UsICcgJyk7CisgICAgcmV0dXJuIHRleHQ7Cit9CisKK1N0cmluZyBFZGl0b3I6 OnN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmRXaXRoSW1hZ2VBbHRUZXh0KCkKK3sKKyAgICBT dHJpbmcgdGV4dCA9IHNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCgpOworICAgIHRleHQucmVwbGFj ZShub0JyZWFrU3BhY2UsICcgJyk7CisgICAgcmV0dXJuIHRleHQ7CiB9CiAKIFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiBFZGl0b3I6OmRhdGFTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKGNvbnN0IFN0 cmluZyYgcGFzdGVib2FyZFR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9QYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKaW5k ZXggYjAwMTE4YzU2OTA3YzJmYjA5NDhlZTQwZWI4OGI5M2MwYjc2YWQwMy4uOTM2YjI4NDY5OTM1 MmEwMjI2NGYxODNiNjMzN2Q3MTFhZjY5NTRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3Rl Ym9hcmQuaApAQCAtOTgsMTAgKzk4LDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gZ2V0RGF0YVNlbGVjdGlvbihGcmFtZSosIGNvbnN0IFN0cmluZyYgcGFz dGVib2FyZFR5cGUpOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGljIFN0 cmluZyBnZXRTdHJpbmdTZWxlY3Rpb24oRnJhbWUqLCBTaG91bGRTZXJpYWxpemVTZWxlY3RlZFRl eHRGb3JDbGlwYm9hcmQpOwotI2VuZGlmCi0KICNpZiBQTEFURk9STShHVEspCiAgICAgc3RhdGlj IFBhc3NPd25QdHI8UGFzdGVib2FyZD4gY3JlYXRlKFBhc3NSZWZQdHI8RGF0YU9iamVjdEd0az4p OwogICAgIHN0YXRpYyBQYXNzT3duUHRyPFBhc3RlYm9hcmQ+IGNyZWF0ZShHdGtDbGlwYm9hcmQq KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9T Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KaW5kZXgg YjA5Y2M0ZjYwMzY2OWYwY2NjNTQ3Njg1MjBlODJhMWVmY2ZiZGMzZS4uYzY5NTE0OGMyNzlhMDg5 Mjk3MTBkMDljYmQ1OTgzZTMxMTc1NmQ5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1Bhc3RlYm9hcmRJT1MubW0KQEAgLTExNCwxMyArMTE0LDYgQEAgdm9pZCBQYXN0ZWJvYXJk OjpjbGVhcigpCiB7CiB9CiAKLVN0cmluZyBQYXN0ZWJvYXJkOjpnZXRTdHJpbmdTZWxlY3Rpb24o RnJhbWUqIGZyYW1lLCBTaG91bGRTZXJpYWxpemVTZWxlY3RlZFRleHRGb3JDbGlwYm9hcmQgc2hv dWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkKQotewotICAgIFN0cmluZyB0ZXh0 ID0gc2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID09IEluY2x1ZGVJbWFn ZUFsdFRleHRGb3JDbGlwYm9hcmQgPyBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0Rm9yQ2xp cGJvYXJkKCkgOiBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0KCk7Ci0gICAgdGV4dC5yZXBs YWNlKG5vQnJlYWtTcGFjZSwgJyAnKTsKLSAgICByZXR1cm4gdGV4dDsKLX0KLQogdm9pZCBQYXN0 ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihSYW5nZSogc2VsZWN0ZWRSYW5nZSwgYm9vbCAvKmNhblNt YXJ0Q29weU9yRGVsZXRlKi8sIEZyYW1lICpmcmFtZSwgU2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRU ZXh0Rm9yQ2xpcGJvYXJkIHNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCkK IHsKICAgICBBU1NFUlQoc2VsZWN0ZWRSYW5nZSk7CkBAIC0xNTksNyArMTUyLDEwIEBAIHZvaWQg UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb24oUmFuZ2UqIHNlbGVjdGVkUmFuZ2UsIGJvb2wgLypj YW5TbWFydENvcHlPckRlbGV0CiAgICAgfQogCiAgICAgLy8gUHV0IHBsYWluIHN0cmluZyBvbiB0 aGUgcGFzdGVib2FyZC4KLSAgICBbcmVwcmVzZW50YXRpb25zLmdldCgpIHNldFZhbHVlOmdldFN0 cmluZ1NlbGVjdGlvbihmcmFtZSwgc2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJv YXJkKSBmb3JLZXk6KE5TU3RyaW5nICopa1VUVHlwZVRleHRdOworICAgIFN0cmluZyB0ZXh0ID0g c2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID09IEluY2x1ZGVJbWFnZUFs dFRleHRGb3JDbGlwYm9hcmQKKyAgICAgICAgPyBmcmFtZS0+ZWRpdG9yKCktPnN0cmluZ1NlbGVj dGlvbkZvclBhc3RlYm9hcmRXaXRoSW1hZ2VBbHRUZXh0KCkKKyAgICAgICAgOiBmcmFtZS0+ZWRp dG9yKCktPnN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoKTsKKyAgICBbcmVwcmVzZW50YXRp b25zLmdldCgpIHNldFZhbHVlOnRleHQgZm9yS2V5OihOU1N0cmluZyAqKWtVVFR5cGVUZXh0XTsK IAogICAgIGZyYW1lLT5lZGl0b3IoKS5jbGllbnQoKS0+d3JpdGVEYXRhVG9QYXN0ZWJvYXJkKHJl cHJlc2VudGF0aW9ucy5nZXQoKSk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Q YXN0ZWJvYXJkTWFjLm1tCmluZGV4IDAzODkyMzFjZDY2YjJhNDM5YWRlYTQ0M2FhNjFlZWRlOGE4 Y2FlMjguLjk4YzRkNDY2MTI3NDc5MGI1N2FjNzIyMTkzYWFjMTY4ZWExNmRmNmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCkBAIC0xNTgsMTMgKzE1 OCw2IEBAIHZvaWQgUGFzdGVib2FyZDo6Y2xlYXIoKQogICAgIHBsYXRmb3JtU3RyYXRlZ2llcygp LT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0VHlwZXMoVmVjdG9yPFN0cmluZz4oKSwgbV9wYXN0 ZWJvYXJkTmFtZSk7CiB9CiAKLVN0cmluZyBQYXN0ZWJvYXJkOjpnZXRTdHJpbmdTZWxlY3Rpb24o RnJhbWUqIGZyYW1lLCBTaG91bGRTZXJpYWxpemVTZWxlY3RlZFRleHRGb3JDbGlwYm9hcmQgc2hv dWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkKQotewotICAgIFN0cmluZyB0ZXh0 ID0gc2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID09IEluY2x1ZGVJbWFn ZUFsdFRleHRGb3JDbGlwYm9hcmQgPyBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0Rm9yQ2xp cGJvYXJkKCkgOiBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0KCk7Ci0gICAgdGV4dC5yZXBs YWNlKG5vQnJlYWtTcGFjZSwgJyAnKTsKLSAgICByZXR1cm4gdGV4dDsKLX0KLQogUGFzc1JlZlB0 cjxTaGFyZWRCdWZmZXI+IFBhc3RlYm9hcmQ6OmdldERhdGFTZWxlY3Rpb24oRnJhbWUqIGZyYW1l LCBjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmRUeXBlKQogewogICAgIGlmIChwYXN0ZWJvYXJkVHlw ZSA9PSBXZWJBcmNoaXZlUGJvYXJkVHlwZSkgewpAQCAtMjMwLDggKzIyMywxMiBAQCB2b2lkIFBh c3RlYm9hcmQ6OndyaXRlU2VsZWN0aW9uRm9yVHlwZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBh c3RlYm9hcmRUeXBlcywgYgogICAgICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2Fy ZFN0cmF0ZWd5KCktPnNldEJ1ZmZlckZvclR5cGUoZ2V0RGF0YVNlbGVjdGlvbihmcmFtZSwgTlNS VEZQYm9hcmRUeXBlKSwgTlNSVEZQYm9hcmRUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKICAgICAK ICAgICAvLyBQdXQgcGxhaW4gc3RyaW5nIG9uIHRoZSBwYXN0ZWJvYXJkLgotICAgIGlmICh0eXBl cy5jb250YWlucyhTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKSkpCi0gICAgICAgIHBsYXRmb3Jt U3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+c2V0U3RyaW5nRm9yVHlwZShnZXRT dHJpbmdTZWxlY3Rpb24oZnJhbWUsIHNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBi b2FyZCksIE5TU3RyaW5nUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSk7CisgICAgaWYgKHR5 cGVzLmNvbnRhaW5zKFN0cmluZyhOU1N0cmluZ1Bib2FyZFR5cGUpKSkgeworICAgICAgICBTdHJp bmcgdGV4dCA9IHNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCA9PSBJbmNs dWRlSW1hZ2VBbHRUZXh0Rm9yQ2xpcGJvYXJkCisgICAgICAgICAgICA/IGZyYW1lLT5lZGl0b3Io KS0+c3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZFdpdGhJbWFnZUFsdFRleHQoKQorICAgICAg ICAgICAgOiBmcmFtZS0+ZWRpdG9yKCktPnN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQoKTsK KyAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5zZXRT dHJpbmdGb3JUeXBlKHRleHQsIE5TU3RyaW5nUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSk7 CisgICAgfQogICAgIAogICAgIGlmICh0eXBlcy5jb250YWlucyhXZWJTbWFydFBhc3RlUGJvYXJk VHlwZSkpCiAgICAgICAgIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3ko KS0+c2V0QnVmZmVyRm9yVHlwZSgwLCBXZWJTbWFydFBhc3RlUGJvYXJkVHlwZSwgbV9wYXN0ZWJv YXJkTmFtZSk7Cg== 204772 2013-06-15 11:03:03 -0700 2013-06-15 19:21:41 -0700 Patch bug-117673-20130615110119.patch text/plain 7758 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjc3ODkzZWNkYjdiYmJm MmNlZGY3ZWJhMTExMzJjMzhkN2ZmOTYxNC4uNTkxMDU2YzRhOWIyZjhiY2Q5YWU3MjllZTY1Njdk MzNkYWRjODk0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTE1ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIFBhc3RlYm9hcmQ6Omdl dFN0cmluZ1NlbGVjdGlvbiB0byBFZGl0b3IsIGZpeGluZyBhIGxheWVyaW5nIHZpb2xhdGlvbgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NjczCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5n L0VkaXRvci5oOiBBZGRlZCBzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkV2l0aEltYWdlQWx0 VGV4dC4KKworICAgICAgICAqIGVkaXRpbmcvbWFjL0VkaXRvck1hYy5tbToKKyAgICAgICAgKFdl YkNvcmU6OkVkaXRvcjo6c3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZCk6IE1vdmVkIGNvZGUg aGVyZSBmcm9tIHRoZSBQYXN0ZWJvYXJkCisgICAgICAgIGNsYXNzLCBzaW5jZSBhbGwgdGhlIFBh c3RlYm9hcmQgY2xhc3MgZGlkIHJlYWxseSB3YXMgdHVybiBhcm91bmQgYW5kIGNhbGwgYmFjayBo ZXJlLgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJv YXJkV2l0aEltYWdlQWx0VGV4dCk6IEFkZGVkLiBWYXJpYW50IG9mCisgICAgICAgIHRoZSBmdW5j dGlvbiBhYm92ZSB0aGF0IGluY2x1ZGVzIGltYWdlIGFsdCB0ZXh0LiBTZXBhcmF0ZSBuYW1lZCBm dW5jdGlvbnMgYXJlIG9mdGVuCisgICAgICAgIHRoZSBiZXN0IHBhdHRlcm4gZm9yIHNvbWV0aGlu ZyBsaWtlIHRoaXMgdW5sZXNzIHRoZXJlIGFyZSBtYW55IGRpZmZlcmVudCBjb21iaW5hdGlvbnMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9QYXN0ZWJvYXJkLmg6IFJlbW92ZSB0aGUgTWFjLW9ubHkg UGFzdGVib2FyZDo6Z2V0U3RyaW5nU2VsZWN0aW9vbi4KKworICAgICAgICAqIHBsYXRmb3JtL2lv cy9QYXN0ZWJvYXJkSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVT ZWxlY3Rpb24pOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb25Gb3JUeXBlcyk6CisgICAg ICAgIENhbGwgdGhlIHR3byBuZXcgZnVuY3Rpb25zIGluc3RlYWQgb2YgdGhlIG9sZCBQYXN0ZWJv YXJkOjpnZXRTdHJpbmdTZWxlY3Rpb24uCisKIDIwMTMtMDYtMTQgIERlYW4gSmFja3NvbiAgPGRp bm9AYXBwbGUuY29tPgogCiAgICAgICAgIENsaWNraW5nIG9uIHNuYXBzaG90dGluZyBwbHVnLWlu cyBkb2VzIG5vdCByZXN0YXJ0IHRoZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvRWRpdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5oCmluZGV4IDRiZWI5 MzI4MTMyMDRiYzkzNjQ3ZDg5NWZkOTM0N2MzNTQwMzYyNTMuLjM1MDhmYzAxNzRkYWFmYWZmOThi OTRmNWNmNTUxZjg2YTc0ZDdlNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv RWRpdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuaApAQCAtMzk3LDYg KzM5Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdyaXRlU2VsZWN0aW9uVG9QYXN0ZWJvYXJkKGNv bnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXN0ZWJv YXJkVHlwZXMpOwogICAgIHZvaWQgcmVhZFNlbGVjdGlvbkZyb21QYXN0ZWJvYXJkKGNvbnN0IFN0 cmluZyYgcGFzdGVib2FyZE5hbWUpOwogICAgIFN0cmluZyBzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0 ZWJvYXJkKCk7CisgICAgU3RyaW5nIHN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmRXaXRoSW1h Z2VBbHRUZXh0KCk7CiAgICAgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IGRhdGFTZWxlY3Rpb25G b3JQYXN0ZWJvYXJkKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUpOwogI2VuZGlmCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbSBiL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0VkaXRvck1hYy5tbQppbmRleCA2NmZiZDEwNzEyOGViYjMx MDI5NWJiYWEyODc4NzY1ODY5NDYyNDIwLi45ZTAxNzhjYmYwZGNhNzM5MTc3NWMzYjU0NDM1ZTE1 ODAzMmRlMTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9FZGl0b3JN YWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYWMvRWRpdG9yTWFjLm1tCkBAIC0y NzQsOSArMjc0LDIwIEBAIHZvaWQgRWRpdG9yOjpyZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQo Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSkKICAgICAgICAgcGFzdGVBc1BsYWluVGV4dFdp dGhQYXN0ZWJvYXJkKCZwYXN0ZWJvYXJkKTsgICAKIH0KIAorLy8gRklYTUU6IE1ha2VzIG5vIHNl bnNlIHRoYXQgc2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkIGFsd2F5cyBpbmNsdWRlcyBhbHQgdGV4 dCwgYnV0IHN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmQgZG9lcyBub3QuCisvLyBUaGlzIHdh cyBsZWZ0IGluIGEgYmFkIHN0YXRlIHdoZW4gc2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkIHdhcyBh ZGRlZC4gTmVlZCB0byBsb29rIG92ZXIgY2xpZW50cyBhbmQgZml4IHRoaXMuCiBTdHJpbmcgRWRp dG9yOjpzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCkKIHsKLSAgICByZXR1cm4gUGFzdGVi b2FyZDo6Z2V0U3RyaW5nU2VsZWN0aW9uKG1fZnJhbWUsIERlZmF1bHRTZWxlY3RlZFRleHRUeXBl KTsKKyAgICBTdHJpbmcgdGV4dCA9IHNlbGVjdGVkVGV4dCgpOworICAgIHRleHQucmVwbGFjZShu b0JyZWFrU3BhY2UsICcgJyk7CisgICAgcmV0dXJuIHRleHQ7Cit9CisKK1N0cmluZyBFZGl0b3I6 OnN0cmluZ1NlbGVjdGlvbkZvclBhc3RlYm9hcmRXaXRoSW1hZ2VBbHRUZXh0KCkKK3sKKyAgICBT dHJpbmcgdGV4dCA9IHNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCgpOworICAgIHRleHQucmVwbGFj ZShub0JyZWFrU3BhY2UsICcgJyk7CisgICAgcmV0dXJuIHRleHQ7CiB9CiAKIFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiBFZGl0b3I6OmRhdGFTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKGNvbnN0IFN0 cmluZyYgcGFzdGVib2FyZFR5cGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9QYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJkLmgKaW5k ZXggYjAwMTE4YzU2OTA3YzJmYjA5NDhlZTQwZWI4OGI5M2MwYjc2YWQwMy4uOTM2YjI4NDY5OTM1 MmEwMjI2NGYxODNiNjMzN2Q3MTFhZjY5NTRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3Rl Ym9hcmQuaApAQCAtOTgsMTAgKzk4LDYgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gZ2V0RGF0YVNlbGVjdGlvbihGcmFtZSosIGNvbnN0IFN0cmluZyYgcGFz dGVib2FyZFR5cGUpOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShNQUMpCi0gICAgc3RhdGljIFN0 cmluZyBnZXRTdHJpbmdTZWxlY3Rpb24oRnJhbWUqLCBTaG91bGRTZXJpYWxpemVTZWxlY3RlZFRl eHRGb3JDbGlwYm9hcmQpOwotI2VuZGlmCi0KICNpZiBQTEFURk9STShHVEspCiAgICAgc3RhdGlj IFBhc3NPd25QdHI8UGFzdGVib2FyZD4gY3JlYXRlKFBhc3NSZWZQdHI8RGF0YU9iamVjdEd0az4p OwogICAgIHN0YXRpYyBQYXNzT3duUHRyPFBhc3RlYm9hcmQ+IGNyZWF0ZShHdGtDbGlwYm9hcmQq KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9T Lm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KaW5kZXgg YjA5Y2M0ZjYwMzY2OWYwY2NjNTQ3Njg1MjBlODJhMWVmY2ZiZGMzZS4uMjVkNjJmYjRiMTk4ZDQ0 MjhjYTdlYTA3ODM4ZWVjMjliZmE1YmU5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1Bhc3RlYm9hcmRJT1MubW0KQEAgLTExNCwxMyArMTE0LDYgQEAgdm9pZCBQYXN0ZWJvYXJk OjpjbGVhcigpCiB7CiB9CiAKLVN0cmluZyBQYXN0ZWJvYXJkOjpnZXRTdHJpbmdTZWxlY3Rpb24o RnJhbWUqIGZyYW1lLCBTaG91bGRTZXJpYWxpemVTZWxlY3RlZFRleHRGb3JDbGlwYm9hcmQgc2hv dWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkKQotewotICAgIFN0cmluZyB0ZXh0 ID0gc2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID09IEluY2x1ZGVJbWFn ZUFsdFRleHRGb3JDbGlwYm9hcmQgPyBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0Rm9yQ2xp cGJvYXJkKCkgOiBmcmFtZS0+ZWRpdG9yKCkuc2VsZWN0ZWRUZXh0KCk7Ci0gICAgdGV4dC5yZXBs YWNlKG5vQnJlYWtTcGFjZSwgJyAnKTsKLSAgICByZXR1cm4gdGV4dDsKLX0KLQogdm9pZCBQYXN0 ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbihSYW5nZSogc2VsZWN0ZWRSYW5nZSwgYm9vbCAvKmNhblNt YXJ0Q29weU9yRGVsZXRlKi8sIEZyYW1lICpmcmFtZSwgU2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRU ZXh0Rm9yQ2xpcGJvYXJkIHNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCkK IHsKICAgICBBU1NFUlQoc2VsZWN0ZWRSYW5nZSk7CkBAIC0xNTksNyArMTUyLDEwIEBAIHZvaWQg UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb24oUmFuZ2UqIHNlbGVjdGVkUmFuZ2UsIGJvb2wgLypj YW5TbWFydENvcHlPckRlbGV0CiAgICAgfQogCiAgICAgLy8gUHV0IHBsYWluIHN0cmluZyBvbiB0 aGUgcGFzdGVib2FyZC4KLSAgICBbcmVwcmVzZW50YXRpb25zLmdldCgpIHNldFZhbHVlOmdldFN0 cmluZ1NlbGVjdGlvbihmcmFtZSwgc2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJv YXJkKSBmb3JLZXk6KE5TU3RyaW5nICopa1VUVHlwZVRleHRdOworICAgIFN0cmluZyB0ZXh0ID0g c2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkID09IEluY2x1ZGVJbWFnZUFs dFRleHRGb3JDbGlwYm9hcmQKKyAgICAgICAgPyBmcmFtZS0+ZWRpdG9yKCkuc3RyaW5nU2VsZWN0 aW9uRm9yUGFzdGVib2FyZFdpdGhJbWFnZUFsdFRleHQoKQorICAgICAgICA6IGZyYW1lLT5lZGl0 b3IoKS5zdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCk7CisgICAgW3JlcHJlc2VudGF0aW9u cy5nZXQoKSBzZXRWYWx1ZTp0ZXh0IGZvcktleTooTlNTdHJpbmcgKilrVVRUeXBlVGV4dF07CiAK ICAgICBmcmFtZS0+ZWRpdG9yKCkuY2xpZW50KCktPndyaXRlRGF0YVRvUGFzdGVib2FyZChyZXBy ZXNlbnRhdGlvbnMuZ2V0KCkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFz dGVib2FyZE1hYy5tbQppbmRleCAwMzg5MjMxY2Q2NmIyYTQzOWFkZWE0NDNhYTYxZWVkZThhOGNh ZTI4Li42NzUwODUyMzE2YTg4ZWI3ZWI2YzYwYTgwNmU4ZTk4MTFkYTE3MjQ3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQpAQCAtMTU4LDEzICsxNTgs NiBAQCB2b2lkIFBhc3RlYm9hcmQ6OmNsZWFyKCkKICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+ cGFzdGVib2FyZFN0cmF0ZWd5KCktPnNldFR5cGVzKFZlY3RvcjxTdHJpbmc+KCksIG1fcGFzdGVi b2FyZE5hbWUpOwogfQogCi1TdHJpbmcgUGFzdGVib2FyZDo6Z2V0U3RyaW5nU2VsZWN0aW9uKEZy YW1lKiBmcmFtZSwgU2hvdWxkU2VyaWFsaXplU2VsZWN0ZWRUZXh0Rm9yQ2xpcGJvYXJkIHNob3Vs ZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCkKLXsKLSAgICBTdHJpbmcgdGV4dCA9 IHNob3VsZFNlcmlhbGl6ZVNlbGVjdGVkVGV4dEZvckNsaXBib2FyZCA9PSBJbmNsdWRlSW1hZ2VB bHRUZXh0Rm9yQ2xpcGJvYXJkID8gZnJhbWUtPmVkaXRvcigpLnNlbGVjdGVkVGV4dEZvckNsaXBi b2FyZCgpIDogZnJhbWUtPmVkaXRvcigpLnNlbGVjdGVkVGV4dCgpOwotICAgIHRleHQucmVwbGFj ZShub0JyZWFrU3BhY2UsICcgJyk7Ci0gICAgcmV0dXJuIHRleHQ7Ci19Ci0KIFBhc3NSZWZQdHI8 U2hhcmVkQnVmZmVyPiBQYXN0ZWJvYXJkOjpnZXREYXRhU2VsZWN0aW9uKEZyYW1lKiBmcmFtZSwg Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkVHlwZSkKIHsKICAgICBpZiAocGFzdGVib2FyZFR5cGUg PT0gV2ViQXJjaGl2ZVBib2FyZFR5cGUpIHsKQEAgLTIzMCw4ICsyMjMsMTIgQEAgdm9pZCBQYXN0 ZWJvYXJkOjp3cml0ZVNlbGVjdGlvbkZvclR5cGVzKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXN0 ZWJvYXJkVHlwZXMsIGIKICAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRT dHJhdGVneSgpLT5zZXRCdWZmZXJGb3JUeXBlKGdldERhdGFTZWxlY3Rpb24oZnJhbWUsIE5TUlRG UGJvYXJkVHlwZSksIE5TUlRGUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSk7CiAgICAgCiAg ICAgLy8gUHV0IHBsYWluIHN0cmluZyBvbiB0aGUgcGFzdGVib2FyZC4KLSAgICBpZiAodHlwZXMu Y29udGFpbnMoU3RyaW5nKE5TU3RyaW5nUGJvYXJkVHlwZSkpKQotICAgICAgICBwbGF0Zm9ybVN0 cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPnNldFN0cmluZ0ZvclR5cGUoZ2V0U3Ry aW5nU2VsZWN0aW9uKGZyYW1lLCBzaG91bGRTZXJpYWxpemVTZWxlY3RlZFRleHRGb3JDbGlwYm9h cmQpLCBOU1N0cmluZ1Bib2FyZFR5cGUsIG1fcGFzdGVib2FyZE5hbWUpOworICAgIGlmICh0eXBl cy5jb250YWlucyhTdHJpbmcoTlNTdHJpbmdQYm9hcmRUeXBlKSkpIHsKKyAgICAgICAgU3RyaW5n IHRleHQgPSBzaG91bGRTZXJpYWxpemVTZWxlY3RlZFRleHRGb3JDbGlwYm9hcmQgPT0gSW5jbHVk ZUltYWdlQWx0VGV4dEZvckNsaXBib2FyZAorICAgICAgICAgICAgPyBmcmFtZS0+ZWRpdG9yKCku c3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZFdpdGhJbWFnZUFsdFRleHQoKQorICAgICAgICAg ICAgOiBmcmFtZS0+ZWRpdG9yKCkuc3RyaW5nU2VsZWN0aW9uRm9yUGFzdGVib2FyZCgpOworICAg ICAgICBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPnNldFN0cmlu Z0ZvclR5cGUodGV4dCwgTlNTdHJpbmdQYm9hcmRUeXBlLCBtX3Bhc3RlYm9hcmROYW1lKTsKKyAg ICB9CiAgICAgCiAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFdlYlNtYXJ0UGFzdGVQYm9hcmRUeXBl KSkKICAgICAgICAgcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5z ZXRCdWZmZXJGb3JUeXBlKDAsIFdlYlNtYXJ0UGFzdGVQYm9hcmRUeXBlLCBtX3Bhc3RlYm9hcmRO YW1lKTsK