109650 2013-02-12 19:38:34 -0800 Use FocusEvent.relatedTarget in {FocusIn,FocusOut,Focus,Blur}EventDispatchMediator. 2013-02-12 22:10:59 -0800 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109561 109156 1 hayato hayato ojan.autocc webcomponents-bugzilla webkit.review.bot oldest_to_newest 831547 0 hayato 2013-02-12 19:38:34 -0800 Remove m_{old,new}FocusedNode member variable from these mediators It's redundant since FocusEvent has relatedTarget member variable. 831562 1 187996 hayato 2013-02-12 20:24:52 -0800 Created attachment 187996 Use FocusEvent.relatedTarget. 831563 2 hayato 2013-02-12 20:25:37 -0800 The uploaded patch depends on the patch in bug 109561. 831590 3 188000 hayato 2013-02-12 21:02:01 -0800 Created attachment 188000 Rabased 831606 4 188000 dglazkov 2013-02-12 21:25:43 -0800 Comment on attachment 188000 Rabased View in context: https://bugs.webkit.org/attachment.cgi?id=188000&action=review > Source/WebCore/dom/FocusEvent.h:101 > + FocusInEventDispatchMediator(PassRefPtr<FocusEvent>); explicit? > Source/WebCore/dom/FocusEvent.h:110 > + FocusOutEventDispatchMediator(PassRefPtr<FocusEvent>); explicit? 831609 5 hayato 2013-02-12 21:32:39 -0800 Thank you for the review. Let me land this after making these single parameter constructors explicit. (In reply to comment #4) > (From update of attachment 188000 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188000&action=review > > > Source/WebCore/dom/FocusEvent.h:101 > > + FocusInEventDispatchMediator(PassRefPtr<FocusEvent>); > > explicit? > > > Source/WebCore/dom/FocusEvent.h:110 > > + FocusOutEventDispatchMediator(PassRefPtr<FocusEvent>); > > explicit? 831618 6 188008 hayato 2013-02-12 21:41:47 -0800 Created attachment 188008 Patch for landing 831631 7 188008 webkit.review.bot 2013-02-12 22:10:54 -0800 Comment on attachment 188008 Patch for landing Clearing flags on attachment: 188008 Committed r142719: <http://trac.webkit.org/changeset/142719> 831632 8 webkit.review.bot 2013-02-12 22:10:59 -0800 All reviewed patches have been landed. Closing bug. 187996 2013-02-12 20:24:52 -0800 2013-02-12 21:01:57 -0800 Use FocusEvent.relatedTarget. bug-109650-20130213132121.patch text/plain 13408 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQzNDVlNDI2MDcxNDc4 M2Q3NWNmMDhhMWJhNWY5MzIyMjk3OGYwNi4uMjI0NWYzNjVlMzM2MTdkYjc4ODlmMTZmZTlkMmEz ZWNkOTUxMzkwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAyLTEzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgRm9jdXNFdmVudC5y ZWxhdGVkVGFyZ2V0IGluIHtGb2N1c0luLEZvY3VzT3V0LEZvY3VzLEJsdXJ9RXZlbnREaXNwYXRj aE1lZGlhdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA5NjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IEZvY3VzRXZlbnQucmVsYXRlZFRhcmdldCBpbiBpdHMgY29uc3RydWN0b3Igc28gdGhh dCBlYWNoCisgICAgICAgIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciBjYW4gdXNlIEZvY3VzRXZlbnQu cmVsYXRlZFRhcmdldCByYXRoZXIgdGhhbgorICAgICAgICBpdHMgcmVkdW5kYW50IG1fe29sZCxu ZXd9Rm9jdXNlZE5vZGUgbWVtYmVyIHZhcmlhYmxlLgorCisgICAgICAgIEkndmUgYWxzbyByZW1v dmVkIEZJWE1FIGNvbW1lbnRzLCBtZW50aW9uaW5nIGJ1ZyAxMDkyNjEsIHNpbmNlIEkKKyAgICAg ICAgY2FuIG5vdCByZXByb2R1Y2UgdGhlIGlzc3VlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g Tm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBkb20vRm9jdXNFdmVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0V2 ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0V2ZW50RGlzcGF0 Y2hNZWRpYXRvcjo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpCbHVyRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Qmx1ckV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAgICAgIChXZWJD b3JlOjpCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSk6CisgICAgICAg IChXZWJDb3JlOjpGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0luRXZlbnREaXNw YXRjaE1lZGlhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzSW5FdmVudERpc3BhdGNoTWVk aWF0b3I6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNPdXRFdmVudERp c3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c091dEV2ZW50 RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAg ICAoV2ViQ29yZTo6Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQp OgorICAgICAgICAqIGRvbS9Gb2N1c0V2ZW50Lmg6CisgICAgICAgIChGb2N1c0V2ZW50RGlzcGF0 Y2hNZWRpYXRvcik6CisgICAgICAgIChCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKToKKyAgICAg ICAgKEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAoRm9jdXNPdXRFdmVu dERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok5vZGU6OmRpc3BhdGNoRm9jdXNJbkV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok5v ZGU6OmRpc3BhdGNoRm9jdXNPdXRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkaXNw YXRjaEZvY3VzRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hCbHVyRXZl bnQpOgorCiAyMDEzLTAyLTEyICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBNYWtlIHtGb2N1c0luLEZvY3VzT3V0LEZvY3VzLEJsdXJ9RXZlbnREaXNwYXRjaE1l ZGlhdG9yIHR5cGUgc2FmZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2 ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmNwcAppbmRleCBmYzAyY2Vi YzRjMGJkMmRkMGE3ZDIzMDMyZTFmNGI1ZTcwMmFhYTMwLi5mYmQzMWU5MTM2NDk1YjFkNjE1N2Nl NmZiNDJhZjRmYmYzODg3N2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNF dmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzRXZlbnQuY3BwCkBAIC02NCw3 MSArNjQsNjcgQEAgRm9jdXNFdmVudDo6Rm9jdXNFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5 cGUsIGNvbnN0IEZvY3VzRXZlbnRJbml0JiBpbml0aWFsaXoKIHsKIH0KIAotUGFzc1JlZlB0cjxG b2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNy ZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4g b2xkRm9jdXNlZE5vZGUpCitQYXNzUmVmUHRyPEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBG b2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4g Zm9jdXNFdmVudCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZvY3VzRXZlbnREaXNwYXRj aE1lZGlhdG9yKGZvY3VzRXZlbnQsIG9sZEZvY3VzZWROb2RlKSk7CisgICAgcmV0dXJuIGFkb3B0 UmVmKG5ldyBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcihmb2N1c0V2ZW50KSk7CiB9CiAKLUZv Y3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNz UmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9jdXNl ZE5vZGUpCitGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNFdmVudERpc3BhdGNoTWVk aWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQogICAgIDogRXZlbnREaXNw YXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQpCi0gICAgLCBtX29sZEZvY3VzZWROb2RlKG9sZEZvY3Vz ZWROb2RlKQogewogfQogCiBib29sIEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRj aEV2ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKIHsKLSAgICBkaXNwYXRj aGVyLT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCksIG1fb2xkRm9jdXNlZE5vZGUpOworICAg IGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRl ZFRhcmdldCgpKTsKICAgICByZXR1cm4gRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2 ZW50KGRpc3BhdGNoZXIpOwogfQogCi1QYXNzUmVmUHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0 b3I+IEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpCitQYXNzUmVm UHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I+IEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6 OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQpCiB7Ci0gICAgcmV0dXJu IGFkb3B0UmVmKG5ldyBCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQsIG5ld0Zv Y3VzZWROb2RlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBCbHVyRXZlbnREaXNwYXRjaE1l ZGlhdG9yKGZvY3VzRXZlbnQpKTsKIH0KIAotQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Qmx1 ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQs IFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpCitCbHVyRXZlbnREaXNwYXRjaE1lZGlh dG9yOjpCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9j dXNFdmVudCkKICAgICA6IEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihmb2N1c0V2ZW50KQotICAgICwg bV9uZXdGb2N1c2VkTm9kZShuZXdGb2N1c2VkTm9kZSkKIHsKIH0KIAogYm9vbCBCbHVyRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hl cikgY29uc3QKIHsKLSAgICBkaXNwYXRjaGVyLT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCks IG1fbmV3Rm9jdXNlZE5vZGUpOworICAgIGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQo ZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRlZFRhcmdldCgpKTsKICAgICByZXR1cm4gRXZlbnREaXNw YXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KGRpc3BhdGNoZXIpOwogfQogCi1QYXNzUmVmUHRy PEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I+IEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0 b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8 Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitQYXNzUmVmUHRyPEZvY3VzSW5FdmVudERpc3BhdGNoTWVk aWF0b3I+IEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZv Y3VzRXZlbnQ+IGZvY3VzRXZlbnQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c0lu RXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQsIG9sZEZvY3VzZWROb2RlKSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZl bnQpKTsKIH0KIAotRm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNJbkV2ZW50RGlz cGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQ dHI8Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpG b2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNF dmVudCkKICAgICA6IEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihmb2N1c0V2ZW50KQotICAgICwgbV9v bGRGb2N1c2VkTm9kZShvbGRGb2N1c2VkTm9kZSkKIHsKIH0KIAogYm9vbCBGb2N1c0luRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hl cikgY29uc3QKIHsKLSAgICBkaXNwYXRjaGVyLT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCks IG1fb2xkRm9jdXNlZE5vZGUpOworICAgIGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQo ZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRlZFRhcmdldCgpKTsKICAgICByZXR1cm4gRXZlbnREaXNw YXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KGRpc3BhdGNoZXIpOwogfQogCi1QYXNzUmVmUHRy PEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yPiBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRp YXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0 cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKK1Bhc3NSZWZQdHI8Rm9jdXNPdXRFdmVudERpc3BhdGNo TWVkaWF0b3I+IEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoUGFzc1JlZlB0 cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgRm9j dXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCwgbmV3Rm9jdXNlZE5vZGUpKTsK KyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yKGZv Y3VzRXZlbnQpKTsKIH0KIAotRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OkZvY3VzT3V0 RXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCwg UGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKK0ZvY3VzT3V0RXZlbnREaXNwYXRjaE1l ZGlhdG9yOjpGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+IGZvY3VzRXZlbnQpCiAgICAgOiBFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkK LSAgICAsIG1fbmV3Rm9jdXNlZE5vZGUobmV3Rm9jdXNlZE5vZGUpCiB7CiB9CiAKIGJvb2wgRm9j dXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVy KiBkaXNwYXRjaGVyKSBjb25zdAogewotICAgIGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJn ZXQoZXZlbnQoKSwgbV9uZXdGb2N1c2VkTm9kZSk7CisgICAgZGlzcGF0Y2hlci0+YWRqdXN0UmVs YXRlZFRhcmdldChldmVudCgpLCBldmVudCgpLT5yZWxhdGVkVGFyZ2V0KCkpOwogICAgIHJldHVy biBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQoZGlzcGF0Y2hlcik7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRm9jdXNFdmVudC5oCmluZGV4IGNiY2ZmMWE4NWNiMzdiZTNmYmFhY2MxOWRlYWM0 MTVjYmZkZDFiYzIuLjdhNWI4OTIxODhmN2I5Y2M1MzkyZTczYTJkOWM1YTY2MzJmY2VjZjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmgKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL0ZvY3VzRXZlbnQuaApAQCAtNzgsNDIgKzc4LDM4IEBAIGlubGluZSBGb2N1c0V2 ZW50KiB0b0ZvY3VzRXZlbnQoRXZlbnQqIGV2ZW50KQogCiBjbGFzcyBGb2N1c0V2ZW50RGlzcGF0 Y2hNZWRpYXRvciA6IHB1YmxpYyBFdmVudERpc3BhdGNoTWVkaWF0b3IgewogcHVibGljOgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFz c1JlZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSk7Cisg ICAgc3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQ YXNzUmVmUHRyPEZvY3VzRXZlbnQ+KTsKIHByaXZhdGU6Ci0gICAgRm9jdXNFdmVudERpc3BhdGNo TWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1 c2VkTm9kZSk7CisgICAgRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1 c0V2ZW50Pik7CiAgICAgRm9jdXNFdmVudCogZXZlbnQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDxGb2N1c0V2ZW50Kj4oRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpldmVudCgpKTsgfQogICAg IHZpcnR1YWwgYm9vbCBkaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciopIGNvbnN0IE9WRVJS SURFOwotICAgIFJlZlB0cjxOb2RlPiBtX29sZEZvY3VzZWROb2RlOwogfTsKIAogY2xhc3MgQmx1 ckV2ZW50RGlzcGF0Y2hNZWRpYXRvciA6IHB1YmxpYyBFdmVudERpc3BhdGNoTWVkaWF0b3Igewog cHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I+ IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3Vz ZWROb2RlKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9y PiBjcmVhdGUoUGFzc1JlZlB0cjxGb2N1c0V2ZW50Pik7CiBwcml2YXRlOgotICAgIEJsdXJFdmVu dERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1JlZlB0cjxOb2Rl PiBuZXdGb2N1c2VkTm9kZSk7CisgICAgQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVm UHRyPEZvY3VzRXZlbnQ+KTsKICAgICBGb2N1c0V2ZW50KiBldmVudCgpIGNvbnN0IHsgcmV0dXJu IHN0YXRpY19jYXN0PEZvY3VzRXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkp OyB9CiAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29u c3QgT1ZFUlJJREU7Ci0gICAgUmVmUHRyPE5vZGU+IG1fbmV3Rm9jdXNlZE5vZGU7CiB9OwogCiBj bGFzcyBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGljIEV2ZW50RGlzcGF0Y2hN ZWRpYXRvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNJbkV2ZW50RGlz cGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4sIFBhc3NSZWZQdHI8 Tm9kZT4gb2xkRm9jdXNlZE5vZGUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZvY3VzSW5FdmVu dERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+KTsKIHByaXZh dGU6Ci0gICAgRm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG9sZEZvY3VzZWROb2RlKTsKKyAgICBGb2N1c0luRXZlbnRE aXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogICAgIEZvY3VzRXZlbnQq IGV2ZW50KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9jdXNFdmVudCo+KEV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSk7IH0KICAgICB2aXJ0dWFsIGJvb2wgZGlzcGF0Y2hFdmVu dChFdmVudERpc3BhdGNoZXIqKSBjb25zdCBPVkVSUklERTsKLSAgICBSZWZQdHI8Tm9kZT4gbV9v bGRGb2N1c2VkTm9kZTsKIH07CiAKIGNsYXNzIEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9y IDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBh c3NSZWZQdHI8Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRy PEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKTsKKyAgICBzdGF0 aWMgUGFzc1JlZlB0cjxGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NS ZWZQdHI8Rm9jdXNFdmVudD4pOwogcHJpdmF0ZToKLSAgICBGb2N1c091dEV2ZW50RGlzcGF0Y2hN ZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3Vz ZWROb2RlKTsKKyAgICBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZv Y3VzRXZlbnQ+KTsKICAgICBGb2N1c0V2ZW50KiBldmVudCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRp Y19jYXN0PEZvY3VzRXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkpOyB9CiAg ICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29uc3QgT1ZF UlJJREU7Ci0gICAgUmVmUHRyPE5vZGU+IG1fbmV3Rm9jdXNlZE5vZGU7CiB9OwogCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggODQwYzI0YzgxZTY5YjQxNWZkMDJk YjlmN2FhZDM3OTU5NmNjYmE2Yy4uNTdkMjVjZDJkMDkwN2IyMTU1MTljODkwNDczMGY5M2VkNTRm ZTFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMjM4MiwyMCArMjM4MiwxNCBAQCB2b2lkIE5vZGU6 OmRpc3BhdGNoRm9jdXNJbkV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBQYXNz UmVmUHRyPE5vZGU+CiB7CiAgICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246Omlz RXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBBU1NFUlQoZXZlbnRUeXBlID09IGV2ZW50 TmFtZXMoKS5mb2N1c2luRXZlbnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5ET01Gb2N1 c0luRXZlbnQpOwotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcGFzcyBvbGRGb2N1c2VkTm9kZSB0 byBGb2N1c0V2ZW50OjpjcmVhdGUoKSBhbmQKLSAgICAvLyByZW1vdmUgb2xkRm9jdXNlZE5vZGUg ZnJvbSBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoKS4KLSAgICAvLyBTZWUg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTI2MQotICAgIGRpc3Bh dGNoU2NvcGVkRXZlbnREaXNwYXRjaE1lZGlhdG9yKEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0 b3I6OmNyZWF0ZShGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCB0cnVlLCBmYWxzZSwgZG9j dW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCksIG9sZEZvY3VzZWROb2RlKSk7CisgICAgZGlz cGF0Y2hTY29wZWRFdmVudERpc3BhdGNoTWVkaWF0b3IoRm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRp YXRvcjo6Y3JlYXRlKEZvY3VzRXZlbnQ6OmNyZWF0ZShldmVudFR5cGUsIHRydWUsIGZhbHNlLCBk b2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCBvbGRGb2N1c2VkTm9kZSkpKTsKIH0KIAogdm9p ZCBOb2RlOjpkaXNwYXRjaEZvY3VzT3V0RXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5 cGUsIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpCiB7CiAgICAgQVNTRVJUKCFOb0V2 ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBB U1NFUlQoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5mb2N1c291dEV2ZW50IHx8IGV2ZW50VHlw ZSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNPdXRFdmVudCk7Ci0gICAgLy8gRklYTUU6IFdlIHNo b3VsZCBwYXNzIG5ld0ZvY3VzZWROb2RlIHRvIEZvY3VzRXZlbnQ6OmNyZWF0ZSgpIGFuZAotICAg IC8vIHJlbW92ZSBuZXdGb2N1c2VkTm9kZSBmcm9tIEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlh dG9yOjpjcmVhdGUoKS4KLSAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwOTI2MQotICAgIGRpc3BhdGNoU2NvcGVkRXZlbnREaXNwYXRjaE1lZGlhdG9y KEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoRm9jdXNFdmVudDo6Y3JlYXRl KGV2ZW50VHlwZSwgdHJ1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksIDAsIDAp LCBuZXdGb2N1c2VkTm9kZSkpOworICAgIGRpc3BhdGNoU2NvcGVkRXZlbnREaXNwYXRjaE1lZGlh dG9yKEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoRm9jdXNFdmVudDo6Y3Jl YXRlKGV2ZW50VHlwZSwgdHJ1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksIDAs IG5ld0ZvY3VzZWROb2RlKSkpOwogfQogCiBib29sIE5vZGU6OmRpc3BhdGNoRE9NQWN0aXZhdGVF dmVudChpbnQgZGV0YWlsLCBQYXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5aW5nRXZlbnQpCkBAIC0y NDU0LDExICsyNDQ4LDggQEAgdm9pZCBOb2RlOjpkaXNwYXRjaEZvY3VzRXZlbnQoUGFzc1JlZlB0 cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSwgRm9jdXNEaXJlY3Rpb24pCiAgICAgaWYgKGRvY3VtZW50 KCktPnBhZ2UoKSkKICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50 KCktPmVsZW1lbnREaWRGb2N1cyh0aGlzKTsKIAotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcGFz cyBvbGRGb2N1c2VkTm9kZSB0byBGb2N1c0V2ZW50OjpjcmVhdGUoKSBhbmQKLSAgICAvLyByZW1v dmUgb2xkRm9jdXNlZE5vZGUgZnJvbSBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRl KCkuCi0gICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDkyNjEKLSAgICBSZWZQdHI8Rm9jdXNFdmVudD4gZXZlbnQgPSBGb2N1c0V2ZW50OjpjcmVhdGUo ZXZlbnROYW1lcygpLmZvY3VzRXZlbnQsIGZhbHNlLCBmYWxzZSwgZG9jdW1lbnQoKS0+ZGVmYXVs dFZpZXcoKSwgMCwgMCk7Ci0gICAgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMs IEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoZXZlbnQucmVsZWFzZSgpLCBvbGRG b2N1c2VkTm9kZSkpOworICAgIFJlZlB0cjxGb2N1c0V2ZW50PiBldmVudCA9IEZvY3VzRXZlbnQ6 OmNyZWF0ZShldmVudE5hbWVzKCkuZm9jdXNFdmVudCwgZmFsc2UsIGZhbHNlLCBkb2N1bWVudCgp LT5kZWZhdWx0VmlldygpLCAwLCBvbGRGb2N1c2VkTm9kZSk7CisgICAgRXZlbnREaXNwYXRjaGVy OjpkaXNwYXRjaEV2ZW50KHRoaXMsIEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUo ZXZlbnQucmVsZWFzZSgpKSk7CiB9CiAKIHZvaWQgTm9kZTo6ZGlzcGF0Y2hCbHVyRXZlbnQoUGFz c1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKQEAgLTI0NjYsMTEgKzI0NTcsOCBAQCB2b2lk IE5vZGU6OmRpc3BhdGNoQmx1ckV2ZW50KFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUp CiAgICAgaWYgKGRvY3VtZW50KCktPnBhZ2UoKSkKICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgp LT5jaHJvbWUoKS0+Y2xpZW50KCktPmVsZW1lbnREaWRCbHVyKHRoaXMpOwogCi0gICAgLy8gRklY TUU6IFdlIHNob3VsZCBwYXNzIG5ld0ZvY3VzZWROb2RlIHRvIEZvY3VzRXZlbnQ6OmNyZWF0ZSgp IGFuZAotICAgIC8vIHJlbW92ZSBuZXdGb2N1c2VkTm9kZSBmcm9tIEJsdXJFdmVudERpc3BhdGNo TWVkaWF0b3I6OmNyZWF0ZSgpLgotICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTA5MjYxCi0gICAgUmVmUHRyPEZvY3VzRXZlbnQ+IGV2ZW50ID0gRm9j dXNFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5ibHVyRXZlbnQsIGZhbHNlLCBmYWxzZSwgZG9j dW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCk7Ci0gICAgRXZlbnREaXNwYXRjaGVyOjpkaXNw YXRjaEV2ZW50KHRoaXMsIEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShldmVudC5y ZWxlYXNlKCksIG5ld0ZvY3VzZWROb2RlKSk7CisgICAgUmVmUHRyPEZvY3VzRXZlbnQ+IGV2ZW50 ID0gRm9jdXNFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5ibHVyRXZlbnQsIGZhbHNlLCBmYWxz ZSwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgbmV3Rm9jdXNlZE5vZGUpOworICAgIEV2 ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBCbHVyRXZlbnREaXNwYXRjaE1lZGlh dG9yOjpjcmVhdGUoZXZlbnQucmVsZWFzZSgpKSk7CiB9CiAKIHZvaWQgTm9kZTo6ZGlzcGF0Y2hD aGFuZ2VFdmVudCgpCg== 188000 2013-02-12 21:02:01 -0800 2013-02-12 21:41:44 -0800 Rabased bug-109650-20130213135830.patch text/plain 13380 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE2ZDViYzVmOWRiOGUx NWNjZDk4ZDMzNjUxYzVmYmI2MzkzMjdjNi4uZGIwZGIzMDFhNzk1YTE3ZWZhNDIxYTNhOWU1MTcw NTI4MjM2MWJjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAyLTEzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgRm9jdXNFdmVudC5y ZWxhdGVkVGFyZ2V0IGluIHtGb2N1c0luLEZvY3VzT3V0LEZvY3VzLEJsdXJ9RXZlbnREaXNwYXRj aE1lZGlhdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA5NjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU2V0IEZvY3VzRXZlbnQucmVsYXRlZFRhcmdldCBpbiBpdHMgY29uc3RydWN0b3Igc28gdGhh dCBlYWNoCisgICAgICAgIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciBjYW4gdXNlIEZvY3VzRXZlbnQu cmVsYXRlZFRhcmdldCByYXRoZXIgdGhhbgorICAgICAgICBpdHMgcmVkdW5kYW50IG1fe29sZCxu ZXd9Rm9jdXNlZE5vZGUgbWVtYmVyIHZhcmlhYmxlLgorCisgICAgICAgIEkndmUgYWxzbyByZW1v dmVkIEZJWE1FIGNvbW1lbnRzLCBtZW50aW9uaW5nIGJ1ZyAxMDkyNjEsIHNpbmNlIEkKKyAgICAg ICAgY2FuIG5vdCByZXByb2R1Y2UgdGhlIGlzc3VlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g Tm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiBkb20vRm9jdXNFdmVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0V2 ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0V2ZW50RGlzcGF0 Y2hNZWRpYXRvcjo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpCbHVyRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Qmx1ckV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAgICAgIChXZWJD b3JlOjpCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSk6CisgICAgICAg IChXZWJDb3JlOjpGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0luRXZlbnREaXNw YXRjaE1lZGlhdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzSW5FdmVudERpc3BhdGNoTWVk aWF0b3I6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNPdXRFdmVudERp c3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c091dEV2ZW50 RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAg ICAoV2ViQ29yZTo6Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQp OgorICAgICAgICAqIGRvbS9Gb2N1c0V2ZW50Lmg6CisgICAgICAgIChGb2N1c0V2ZW50RGlzcGF0 Y2hNZWRpYXRvcik6CisgICAgICAgIChCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKToKKyAgICAg ICAgKEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAoRm9jdXNPdXRFdmVu dERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAqIGRvbS9Ob2RlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok5vZGU6OmRpc3BhdGNoRm9jdXNJbkV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok5v ZGU6OmRpc3BhdGNoRm9jdXNPdXRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpkaXNw YXRjaEZvY3VzRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6ZGlzcGF0Y2hCbHVyRXZl bnQpOgorCiAyMDEzLTAyLTEyICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgRWxlbWVudDo6ZW5zdXJlQXR0cmlidXRlRGF0YSgpLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzRXZlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L0ZvY3VzRXZlbnQuY3BwCmluZGV4IGZjMDJjZWJjNGMwYmQyZGQwYTdkMjMwMzJlMWY0YjVlNzAy YWFhMzAuLmZiZDMxZTkxMzY0OTViMWQ2MTU3Y2U2ZmI0MmFmNGZiZjM4ODc3YmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vRm9jdXNFdmVudC5jcHAKQEAgLTY0LDcxICs2NCw2NyBAQCBGb2N1c0V2ZW50OjpGb2N1 c0V2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgdHlwZSwgY29uc3QgRm9jdXNFdmVudEluaXQmIGlu aXRpYWxpegogewogfQogCi1QYXNzUmVmUHRyPEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBG b2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4g Zm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSkKK1Bhc3NSZWZQdHI8 Rm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I+IEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpj cmVhdGUoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQogewotICAgIHJldHVybiBh ZG9wdFJlZihuZXcgRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCwgb2xkRm9j dXNlZE5vZGUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZvY3VzRXZlbnREaXNwYXRjaE1l ZGlhdG9yKGZvY3VzRXZlbnQpKTsKIH0KIAotRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I6OkZv Y3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVu dCwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSkKK0ZvY3VzRXZlbnREaXNwYXRjaE1l ZGlhdG9yOjpGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+ IGZvY3VzRXZlbnQpCiAgICAgOiBFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkKLSAg ICAsIG1fb2xkRm9jdXNlZE5vZGUob2xkRm9jdXNlZE5vZGUpCiB7CiB9CiAKIGJvb2wgRm9jdXNF dmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKiBkaXNw YXRjaGVyKSBjb25zdAogewotICAgIGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZl bnQoKSwgbV9vbGRGb2N1c2VkTm9kZSk7CisgICAgZGlzcGF0Y2hlci0+YWRqdXN0UmVsYXRlZFRh cmdldChldmVudCgpLCBldmVudCgpLT5yZWxhdGVkVGFyZ2V0KCkpOwogICAgIHJldHVybiBFdmVu dERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQoZGlzcGF0Y2hlcik7CiB9CiAKLVBhc3NS ZWZQdHI8Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRv cjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxO b2RlPiBuZXdGb2N1c2VkTm9kZSkKK1Bhc3NSZWZQdHI8Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRv cj4gQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVu dD4gZm9jdXNFdmVudCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IEJsdXJFdmVudERpc3Bh dGNoTWVkaWF0b3IoZm9jdXNFdmVudCwgbmV3Rm9jdXNlZE5vZGUpKTsKKyAgICByZXR1cm4gYWRv cHRSZWYobmV3IEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkpOwogfQogCi1C bHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NS ZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2Vk Tm9kZSkKK0JsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OkJsdXJFdmVudERpc3BhdGNoTWVkaWF0 b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQogICAgIDogRXZlbnREaXNwYXRj aE1lZGlhdG9yKGZvY3VzRXZlbnQpCi0gICAgLCBtX25ld0ZvY3VzZWROb2RlKG5ld0ZvY3VzZWRO b2RlKQogewogfQogCiBib29sIEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZl bnQoRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAogewotICAgIGRpc3BhdGNoZXIt PmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgbV9uZXdGb2N1c2VkTm9kZSk7CisgICAgZGlz cGF0Y2hlci0+YWRqdXN0UmVsYXRlZFRhcmdldChldmVudCgpLCBldmVudCgpLT5yZWxhdGVkVGFy Z2V0KCkpOwogICAgIHJldHVybiBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQo ZGlzcGF0Y2hlcik7CiB9CiAKLVBhc3NSZWZQdHI8Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRv cj4gRm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNF dmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSkKK1Bhc3NS ZWZQdHI8Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gRm9jdXNJbkV2ZW50RGlzcGF0Y2hN ZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCkKIHsKLSAg ICByZXR1cm4gYWRvcHRSZWYobmV3IEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNF dmVudCwgb2xkRm9jdXNlZE5vZGUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZvY3VzSW5F dmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkpOwogfQogCi1Gb2N1c0luRXZlbnREaXNw YXRjaE1lZGlhdG9yOjpGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9j dXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSkKK0Zv Y3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OkZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3Io UGFzc1JlZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQogICAgIDogRXZlbnREaXNwYXRjaE1l ZGlhdG9yKGZvY3VzRXZlbnQpCi0gICAgLCBtX29sZEZvY3VzZWROb2RlKG9sZEZvY3VzZWROb2Rl KQogewogfQogCiBib29sIEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZl bnQoRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAogewotICAgIGRpc3BhdGNoZXIt PmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgbV9vbGRGb2N1c2VkTm9kZSk7CisgICAgZGlz cGF0Y2hlci0+YWRqdXN0UmVsYXRlZFRhcmdldChldmVudCgpLCBldmVudCgpLT5yZWxhdGVkVGFy Z2V0KCkpOwogICAgIHJldHVybiBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQo ZGlzcGF0Y2hlcik7CiB9CiAKLVBhc3NSZWZQdHI8Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0 b3I+IEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoUGFzc1JlZlB0cjxGb2N1 c0V2ZW50PiBmb2N1c0V2ZW50LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKQorUGFz c1JlZlB0cjxGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gRm9jdXNPdXRFdmVudERpc3Bh dGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQpCiB7 Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihm b2N1c0V2ZW50LCBuZXdGb2N1c2VkTm9kZSkpOworICAgIHJldHVybiBhZG9wdFJlZihuZXcgRm9j dXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkpOwogfQogCi1Gb2N1c091dEV2 ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1Jl ZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWRO b2RlKQorRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OkZvY3VzT3V0RXZlbnREaXNwYXRj aE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCkKICAgICA6IEV2ZW50 RGlzcGF0Y2hNZWRpYXRvcihmb2N1c0V2ZW50KQotICAgICwgbV9uZXdGb2N1c2VkTm9kZShuZXdG b2N1c2VkTm9kZSkKIHsKIH0KIAogYm9vbCBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6 ZGlzcGF0Y2hFdmVudChFdmVudERpc3BhdGNoZXIqIGRpc3BhdGNoZXIpIGNvbnN0CiB7Ci0gICAg ZGlzcGF0Y2hlci0+YWRqdXN0UmVsYXRlZFRhcmdldChldmVudCgpLCBtX25ld0ZvY3VzZWROb2Rl KTsKKyAgICBkaXNwYXRjaGVyLT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCksIGV2ZW50KCkt PnJlbGF0ZWRUYXJnZXQoKSk7CiAgICAgcmV0dXJuIEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZGlz cGF0Y2hFdmVudChkaXNwYXRjaGVyKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0ZvY3VzRXZlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmgKaW5kZXgg Y2JjZmYxYTg1Y2IzN2JlM2ZiYWFjYzE5ZGVhYzQxNWNiZmRkMWJjMi4uN2E1Yjg5MjE4OGY3Yjlj YzUzOTJlNzNhMmQ5YzVhNjYzMmZjZWNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L0ZvY3VzRXZlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNFdmVudC5oCkBAIC03 OCw0MiArNzgsMzggQEAgaW5saW5lIEZvY3VzRXZlbnQqIHRvRm9jdXNFdmVudChFdmVudCogZXZl bnQpCiAKIGNsYXNzIEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGljIEV2ZW50RGlz cGF0Y2hNZWRpYXRvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNFdmVu dERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+LCBQYXNzUmVm UHRyPE5vZGU+IG9sZEZvY3VzZWROb2RlKTsKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxGb2N1c0V2 ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogcHJp dmF0ZToKLSAgICBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG9sZEZvY3VzZWROb2RlKTsKKyAgICBGb2N1c0V2ZW50RGlz cGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+KTsKICAgICBGb2N1c0V2ZW50KiBl dmVudCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEZvY3VzRXZlbnQqPihFdmVudERpc3Bh dGNoTWVkaWF0b3I6OmV2ZW50KCkpOyB9CiAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQo RXZlbnREaXNwYXRjaGVyKikgY29uc3QgT1ZFUlJJREU7Ci0gICAgUmVmUHRyPE5vZGU+IG1fb2xk Rm9jdXNlZE5vZGU7CiB9OwogCiBjbGFzcyBCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVi bGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQ dHI8Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVu dD4sIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpOworICAgIHN0YXRpYyBQYXNzUmVm UHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+KTsKIHByaXZhdGU6Ci0gICAgQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRy PEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKTsKKyAgICBCbHVy RXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogICAgIEZvY3Vz RXZlbnQqIGV2ZW50KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9jdXNFdmVudCo+KEV2 ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSk7IH0KICAgICB2aXJ0dWFsIGJvb2wgZGlzcGF0 Y2hFdmVudChFdmVudERpc3BhdGNoZXIqKSBjb25zdCBPVkVSUklERTsKLSAgICBSZWZQdHI8Tm9k ZT4gbV9uZXdGb2N1c2VkTm9kZTsKIH07CiAKIGNsYXNzIEZvY3VzSW5FdmVudERpc3BhdGNoTWVk aWF0b3IgOiBwdWJsaWMgRXZlbnREaXNwYXRjaE1lZGlhdG9yIHsKIHB1YmxpYzoKLSAgICBzdGF0 aWMgUGFzc1JlZlB0cjxGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFzc1Jl ZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSk7CisgICAg c3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBh c3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogcHJpdmF0ZToKLSAgICBGb2N1c0luRXZlbnREaXNwYXRj aE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4sIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9j dXNlZE5vZGUpOworICAgIEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxG b2N1c0V2ZW50Pik7CiAgICAgRm9jdXNFdmVudCogZXZlbnQoKSBjb25zdCB7IHJldHVybiBzdGF0 aWNfY2FzdDxGb2N1c0V2ZW50Kj4oRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpldmVudCgpKTsgfQog ICAgIHZpcnR1YWwgYm9vbCBkaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciopIGNvbnN0IE9W RVJSSURFOwotICAgIFJlZlB0cjxOb2RlPiBtX29sZEZvY3VzZWROb2RlOwogfTsKIAogY2xhc3Mg Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3IgOiBwdWJsaWMgRXZlbnREaXNwYXRjaE1lZGlh dG9yIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxGb2N1c091dEV2ZW50RGlzcGF0 Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4sIFBhc3NSZWZQdHI8Tm9k ZT4gbmV3Rm9jdXNlZE5vZGUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZvY3VzT3V0RXZlbnRE aXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFzc1JlZlB0cjxGb2N1c0V2ZW50Pik7CiBwcml2YXRl OgotICAgIEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVu dD4sIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpOworICAgIEZvY3VzT3V0RXZlbnRE aXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogICAgIEZvY3VzRXZlbnQq IGV2ZW50KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9jdXNFdmVudCo+KEV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSk7IH0KICAgICB2aXJ0dWFsIGJvb2wgZGlzcGF0Y2hFdmVu dChFdmVudERpc3BhdGNoZXIqKSBjb25zdCBPVkVSUklERTsKLSAgICBSZWZQdHI8Tm9kZT4gbV9u ZXdGb2N1c2VkTm9kZTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAppbmRleCA4NDBjMjRjODFlNjliNDE1ZmQwMmRiOWY3YWFkMzc5NTk2Y2NiYTZjLi41N2QyNWNk MmQwOTA3YjIxNTUxOWM4OTA0NzMwZjkzZWQ1NGZlMWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0y MzgyLDIwICsyMzgyLDE0IEBAIHZvaWQgTm9kZTo6ZGlzcGF0Y2hGb2N1c0luRXZlbnQoY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUsIFBhc3NSZWZQdHI8Tm9kZT4KIHsKICAgICBBU1NFUlQo IU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoRm9yYmlkZGVuKCkpOwog ICAgIEFTU0VSVChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLmZvY3VzaW5FdmVudCB8fCBldmVu dFR5cGUgPT0gZXZlbnROYW1lcygpLkRPTUZvY3VzSW5FdmVudCk7Ci0gICAgLy8gRklYTUU6IFdl IHNob3VsZCBwYXNzIG9sZEZvY3VzZWROb2RlIHRvIEZvY3VzRXZlbnQ6OmNyZWF0ZSgpIGFuZAot ICAgIC8vIHJlbW92ZSBvbGRGb2N1c2VkTm9kZSBmcm9tIEZvY3VzSW5FdmVudERpc3BhdGNoTWVk aWF0b3I6OmNyZWF0ZSgpLgotICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTA5MjYxCi0gICAgZGlzcGF0Y2hTY29wZWRFdmVudERpc3BhdGNoTWVkaWF0 b3IoRm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKEZvY3VzRXZlbnQ6OmNyZWF0 ZShldmVudFR5cGUsIHRydWUsIGZhbHNlLCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCAw KSwgb2xkRm9jdXNlZE5vZGUpKTsKKyAgICBkaXNwYXRjaFNjb3BlZEV2ZW50RGlzcGF0Y2hNZWRp YXRvcihGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoRm9jdXNFdmVudDo6Y3Jl YXRlKGV2ZW50VHlwZSwgdHJ1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksIDAs IG9sZEZvY3VzZWROb2RlKSkpOwogfQogCiB2b2lkIE5vZGU6OmRpc3BhdGNoRm9jdXNPdXRFdmVu dChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1 c2VkTm9kZSkKIHsKICAgICBBU1NFUlQoIU5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVu dERpc3BhdGNoRm9yYmlkZGVuKCkpOwogICAgIEFTU0VSVChldmVudFR5cGUgPT0gZXZlbnROYW1l cygpLmZvY3Vzb3V0RXZlbnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5ET01Gb2N1c091 dEV2ZW50KTsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHBhc3MgbmV3Rm9jdXNlZE5vZGUgdG8g Rm9jdXNFdmVudDo6Y3JlYXRlKCkgYW5kCi0gICAgLy8gcmVtb3ZlIG5ld0ZvY3VzZWROb2RlIGZy b20gRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSgpLgotICAgIC8vIFNlZSBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MjYxCi0gICAgZGlzcGF0 Y2hTY29wZWRFdmVudERpc3BhdGNoTWVkaWF0b3IoRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0 b3I6OmNyZWF0ZShGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCB0cnVlLCBmYWxzZSwgZG9j dW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCksIG5ld0ZvY3VzZWROb2RlKSk7CisgICAgZGlz cGF0Y2hTY29wZWRFdmVudERpc3BhdGNoTWVkaWF0b3IoRm9jdXNPdXRFdmVudERpc3BhdGNoTWVk aWF0b3I6OmNyZWF0ZShGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCB0cnVlLCBmYWxzZSwg ZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgbmV3Rm9jdXNlZE5vZGUpKSk7CiB9CiAKIGJv b2wgTm9kZTo6ZGlzcGF0Y2hET01BY3RpdmF0ZUV2ZW50KGludCBkZXRhaWwsIFBhc3NSZWZQdHI8 RXZlbnQ+IHVuZGVybHlpbmdFdmVudCkKQEAgLTI0NTQsMTEgKzI0NDgsOCBAQCB2b2lkIE5vZGU6 OmRpc3BhdGNoRm9jdXNFdmVudChQYXNzUmVmUHRyPE5vZGU+IG9sZEZvY3VzZWROb2RlLCBGb2N1 c0RpcmVjdGlvbikKICAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgpKQogICAgICAgICBkb2N1bWVu dCgpLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+ZWxlbWVudERpZEZvY3VzKHRoaXMpOwog Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIG9sZEZvY3VzZWROb2RlIHRvIEZvY3VzRXZl bnQ6OmNyZWF0ZSgpIGFuZAotICAgIC8vIHJlbW92ZSBvbGRGb2N1c2VkTm9kZSBmcm9tIEZvY3Vz RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoKS4KLSAgICAvLyBTZWUgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTI2MQotICAgIFJlZlB0cjxGb2N1c0V2ZW50 PiBldmVudCA9IEZvY3VzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuZm9jdXNFdmVudCwgZmFs c2UsIGZhbHNlLCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCAwKTsKLSAgICBFdmVudERp c3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I6 OmNyZWF0ZShldmVudC5yZWxlYXNlKCksIG9sZEZvY3VzZWROb2RlKSk7CisgICAgUmVmUHRyPEZv Y3VzRXZlbnQ+IGV2ZW50ID0gRm9jdXNFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5mb2N1c0V2 ZW50LCBmYWxzZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRWaWV3KCksIDAsIG9sZEZvY3Vz ZWROb2RlKTsKKyAgICBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgRm9jdXNF dmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShldmVudC5yZWxlYXNlKCkpKTsKIH0KIAogdm9p ZCBOb2RlOjpkaXNwYXRjaEJsdXJFdmVudChQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2Rl KQpAQCAtMjQ2NiwxMSArMjQ1Nyw4IEBAIHZvaWQgTm9kZTo6ZGlzcGF0Y2hCbHVyRXZlbnQoUGFz c1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKICAgICBpZiAoZG9jdW1lbnQoKS0+cGFnZSgp KQogICAgICAgICBkb2N1bWVudCgpLT5wYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+ZWxlbWVu dERpZEJsdXIodGhpcyk7CiAKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHBhc3MgbmV3Rm9jdXNl ZE5vZGUgdG8gRm9jdXNFdmVudDo6Y3JlYXRlKCkgYW5kCi0gICAgLy8gcmVtb3ZlIG5ld0ZvY3Vz ZWROb2RlIGZyb20gQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKCkuCi0gICAgLy8g U2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDkyNjEKLSAgICBS ZWZQdHI8Rm9jdXNFdmVudD4gZXZlbnQgPSBGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnROYW1lcygp LmJsdXJFdmVudCwgZmFsc2UsIGZhbHNlLCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCAw KTsKLSAgICBFdmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgQmx1ckV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKGV2ZW50LnJlbGVhc2UoKSwgbmV3Rm9jdXNlZE5vZGUpKTsK KyAgICBSZWZQdHI8Rm9jdXNFdmVudD4gZXZlbnQgPSBGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnRO YW1lcygpLmJsdXJFdmVudCwgZmFsc2UsIGZhbHNlLCBkb2N1bWVudCgpLT5kZWZhdWx0Vmlldygp LCAwLCBuZXdGb2N1c2VkTm9kZSk7CisgICAgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50 KHRoaXMsIEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShldmVudC5yZWxlYXNlKCkp KTsKIH0KIAogdm9pZCBOb2RlOjpkaXNwYXRjaENoYW5nZUV2ZW50KCkK 188008 2013-02-12 21:41:47 -0800 2013-02-12 22:10:54 -0800 Patch for landing bug-109650-20130213143816.patch text/plain 13417 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNzE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE2ZDViYzVmOWRiOGUx NWNjZDk4ZDMzNjUxYzVmYmI2MzkzMjdjNi4uMjFiYzdjMjgyZmMwZTllNzA4ZTY5ODliM2YxZmRl ZjdmYWE4MjdkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAyLTEzICBIYXlh dG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKworICAgICAgICBVc2UgRm9jdXNFdmVudC5y ZWxhdGVkVGFyZ2V0IGluIHtGb2N1c0luLEZvY3VzT3V0LEZvY3VzLEJsdXJ9RXZlbnREaXNwYXRj aE1lZGlhdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTA5NjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgorCisgICAg ICAgIFNldCBGb2N1c0V2ZW50LnJlbGF0ZWRUYXJnZXQgaW4gaXRzIGNvbnN0cnVjdG9yIHNvIHRo YXQgZWFjaAorICAgICAgICBFdmVudERpc3BhdGNoTWVkaWF0b3IgY2FuIHVzZSBGb2N1c0V2ZW50 LnJlbGF0ZWRUYXJnZXQgcmF0aGVyIHRoYW4KKyAgICAgICAgaXRzIHJlZHVuZGFudCBtX3tvbGQs bmV3fUZvY3VzZWROb2RlIG1lbWJlciB2YXJpYWJsZS4KKworICAgICAgICBJJ3ZlIGFsc28gcmVt b3ZlZCBGSVhNRSBjb21tZW50cywgbWVudGlvbmluZyBidWcgMTA5MjYxLCBzaW5jZSBJCisgICAg ICAgIGNhbiBub3QgcmVwcm9kdWNlIHRoZSBpc3N1ZS4KKworICAgICAgICBObyBuZXcgdGVzdHMu IE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogZG9tL0ZvY3VzRXZlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNF dmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNFdmVudERpc3Bh dGNoTWVkaWF0b3I6OmRpc3BhdGNoRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Qmx1ckV2ZW50 RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OkJsdXJFdmVudERp c3BhdGNoTWVkaWF0b3I6OkJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3IpOgorICAgICAgICAoV2Vi Q29yZTo6Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAg IChXZWJDb3JlOjpGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Rm9jdXNJbkV2ZW50RGlz cGF0Y2hNZWRpYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpGb2N1c0luRXZlbnREaXNwYXRjaE1l ZGlhdG9yOjpkaXNwYXRjaEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkZvY3VzT3V0RXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Rm9jdXNPdXRFdmVu dERpc3BhdGNoTWVkaWF0b3I6OkZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yKToKKyAgICAg ICAgKFdlYkNvcmU6OkZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50 KToKKyAgICAgICAgKiBkb20vRm9jdXNFdmVudC5oOgorICAgICAgICAoRm9jdXNFdmVudERpc3Bh dGNoTWVkaWF0b3IpOgorICAgICAgICAoQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcik6CisgICAg ICAgIChGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yKToKKyAgICAgICAgKEZvY3VzT3V0RXZl bnREaXNwYXRjaE1lZGlhdG9yKToKKyAgICAgICAgKiBkb20vTm9kZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpOb2RlOjpkaXNwYXRjaEZvY3VzSW5FdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpO b2RlOjpkaXNwYXRjaEZvY3VzT3V0RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6ZGlz cGF0Y2hGb2N1c0V2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoQmx1ckV2 ZW50KToKKwogMjAxMy0wMi0xMiAgQW5kcmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgUmVtb3ZlIEVsZW1lbnQ6OmVuc3VyZUF0dHJpYnV0ZURhdGEoKS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Gb2N1c0V2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9Gb2N1c0V2ZW50LmNwcAppbmRleCBmYzAyY2ViYzRjMGJkMmRkMGE3ZDIzMDMyZTFmNGI1ZTcw MmFhYTMwLi5mYmQzMWU5MTM2NDk1YjFkNjE1N2NlNmZiNDJhZjRmYmYzODg3N2JiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNFdmVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZG9tL0ZvY3VzRXZlbnQuY3BwCkBAIC02NCw3MSArNjQsNjcgQEAgRm9jdXNFdmVudDo6Rm9j dXNFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGNvbnN0IEZvY3VzRXZlbnRJbml0JiBp bml0aWFsaXoKIHsKIH0KIAotUGFzc1JlZlB0cjxGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcj4g Rm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+ IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitQYXNzUmVmUHRy PEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6 Y3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCkKIHsKLSAgICByZXR1cm4g YWRvcHRSZWYobmV3IEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQsIG9sZEZv Y3VzZWROb2RlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c0V2ZW50RGlzcGF0Y2hN ZWRpYXRvcihmb2N1c0V2ZW50KSk7CiB9CiAKLUZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpG b2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZl bnQsIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitGb2N1c0V2ZW50RGlzcGF0Y2hN ZWRpYXRvcjo6Rm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50 PiBmb2N1c0V2ZW50KQogICAgIDogRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQpCi0g ICAgLCBtX29sZEZvY3VzZWROb2RlKG9sZEZvY3VzZWROb2RlKQogewogfQogCiBib29sIEZvY3Vz RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlz cGF0Y2hlcikgY29uc3QKIHsKLSAgICBkaXNwYXRjaGVyLT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2 ZW50KCksIG1fb2xkRm9jdXNlZE5vZGUpOworICAgIGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRU YXJnZXQoZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRlZFRhcmdldCgpKTsKICAgICByZXR1cm4gRXZl bnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50KGRpc3BhdGNoZXIpOwogfQogCi1QYXNz UmVmUHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I+IEJsdXJFdmVudERpc3BhdGNoTWVkaWF0 b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8 Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpCitQYXNzUmVmUHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0 b3I+IEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZl bnQ+IGZvY3VzRXZlbnQpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBCbHVyRXZlbnREaXNw YXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQsIG5ld0ZvY3VzZWROb2RlKSk7CisgICAgcmV0dXJuIGFk b3B0UmVmKG5ldyBCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQpKTsKIH0KIAot Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Qmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNz UmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNl ZE5vZGUpCitCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpCbHVyRXZlbnREaXNwYXRjaE1lZGlh dG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCkKICAgICA6IEV2ZW50RGlzcGF0 Y2hNZWRpYXRvcihmb2N1c0V2ZW50KQotICAgICwgbV9uZXdGb2N1c2VkTm9kZShuZXdGb2N1c2Vk Tm9kZSkKIHsKIH0KIAogYm9vbCBCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2 ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKIHsKLSAgICBkaXNwYXRjaGVy LT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCksIG1fbmV3Rm9jdXNlZE5vZGUpOworICAgIGRp c3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRlZFRh cmdldCgpKTsKICAgICByZXR1cm4gRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50 KGRpc3BhdGNoZXIpOwogfQogCi1QYXNzUmVmUHRyPEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0 b3I+IEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3Vz RXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitQYXNz UmVmUHRyPEZvY3VzSW5FdmVudERpc3BhdGNoTWVkaWF0b3I+IEZvY3VzSW5FdmVudERpc3BhdGNo TWVkaWF0b3I6OmNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQpCiB7Ci0g ICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3Vz RXZlbnQsIG9sZEZvY3VzZWROb2RlKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBGb2N1c0lu RXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQpKTsKIH0KIAotRm9jdXNJbkV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZv Y3VzRXZlbnQ+IGZvY3VzRXZlbnQsIFBhc3NSZWZQdHI8Tm9kZT4gb2xkRm9jdXNlZE5vZGUpCitG b2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9y KFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCkKICAgICA6IEV2ZW50RGlzcGF0Y2hN ZWRpYXRvcihmb2N1c0V2ZW50KQotICAgICwgbV9vbGRGb2N1c2VkTm9kZShvbGRGb2N1c2VkTm9k ZSkKIHsKIH0KIAogYm9vbCBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2 ZW50KEV2ZW50RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKIHsKLSAgICBkaXNwYXRjaGVy LT5hZGp1c3RSZWxhdGVkVGFyZ2V0KGV2ZW50KCksIG1fb2xkRm9jdXNlZE5vZGUpOworICAgIGRp c3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgZXZlbnQoKS0+cmVsYXRlZFRh cmdldCgpKTsKICAgICByZXR1cm4gRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpkaXNwYXRjaEV2ZW50 KGRpc3BhdGNoZXIpOwogfQogCi1QYXNzUmVmUHRyPEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlh dG9yPiBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKFBhc3NSZWZQdHI8Rm9j dXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKK1Bh c3NSZWZQdHI8Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I+IEZvY3VzT3V0RXZlbnREaXNw YXRjaE1lZGlhdG9yOjpjcmVhdGUoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiBmb2N1c0V2ZW50KQog ewotICAgIHJldHVybiBhZG9wdFJlZihuZXcgRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3Io Zm9jdXNFdmVudCwgbmV3Rm9jdXNlZE5vZGUpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEZv Y3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yKGZvY3VzRXZlbnQpKTsKIH0KIAotRm9jdXNPdXRF dmVudERpc3BhdGNoTWVkaWF0b3I6OkZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NS ZWZQdHI8Rm9jdXNFdmVudD4gZm9jdXNFdmVudCwgUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2Vk Tm9kZSkKK0ZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpGb2N1c091dEV2ZW50RGlzcGF0 Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+IGZvY3VzRXZlbnQpCiAgICAgOiBFdmVu dERpc3BhdGNoTWVkaWF0b3IoZm9jdXNFdmVudCkKLSAgICAsIG1fbmV3Rm9jdXNlZE5vZGUobmV3 Rm9jdXNlZE5vZGUpCiB7CiB9CiAKIGJvb2wgRm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I6 OmRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAogewotICAg IGRpc3BhdGNoZXItPmFkanVzdFJlbGF0ZWRUYXJnZXQoZXZlbnQoKSwgbV9uZXdGb2N1c2VkTm9k ZSk7CisgICAgZGlzcGF0Y2hlci0+YWRqdXN0UmVsYXRlZFRhcmdldChldmVudCgpLCBldmVudCgp LT5yZWxhdGVkVGFyZ2V0KCkpOwogICAgIHJldHVybiBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmRp c3BhdGNoRXZlbnQoZGlzcGF0Y2hlcik7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Gb2N1c0V2ZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRm9jdXNFdmVudC5oCmluZGV4 IGNiY2ZmMWE4NWNiMzdiZTNmYmFhY2MxOWRlYWM0MTVjYmZkZDFiYzIuLjIwYzM2Y2QzZWYxOGQw MTliYjQxNmZmYWUwMjg1NjFhN2NiNzlkOWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Gb2N1c0V2ZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0ZvY3VzRXZlbnQuaApAQCAt NzgsNDIgKzc4LDM4IEBAIGlubGluZSBGb2N1c0V2ZW50KiB0b0ZvY3VzRXZlbnQoRXZlbnQqIGV2 ZW50KQogCiBjbGFzcyBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRvciA6IHB1YmxpYyBFdmVudERp c3BhdGNoTWVkaWF0b3IgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZvY3VzRXZl bnREaXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFzc1JlZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1Jl ZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNF dmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+KTsKIHBy aXZhdGU6Ci0gICAgRm9jdXNFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2 ZW50PiwgUGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSk7CisgICAgZXhwbGljaXQgRm9j dXNFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0cjxGb2N1c0V2ZW50Pik7CiAgICAgRm9j dXNFdmVudCogZXZlbnQoKSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxGb2N1c0V2ZW50Kj4o RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpldmVudCgpKTsgfQogICAgIHZpcnR1YWwgYm9vbCBkaXNw YXRjaEV2ZW50KEV2ZW50RGlzcGF0Y2hlciopIGNvbnN0IE9WRVJSSURFOwotICAgIFJlZlB0cjxO b2RlPiBtX29sZEZvY3VzZWROb2RlOwogfTsKIAogY2xhc3MgQmx1ckV2ZW50RGlzcGF0Y2hNZWRp YXRvciA6IHB1YmxpYyBFdmVudERpc3BhdGNoTWVkaWF0b3IgewogcHVibGljOgotICAgIHN0YXRp YyBQYXNzUmVmUHRyPEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRy PEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKTsKKyAgICBzdGF0 aWMgUGFzc1JlZlB0cjxCbHVyRXZlbnREaXNwYXRjaE1lZGlhdG9yPiBjcmVhdGUoUGFzc1JlZlB0 cjxGb2N1c0V2ZW50Pik7CiBwcml2YXRlOgotICAgIEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3Io UGFzc1JlZlB0cjxGb2N1c0V2ZW50PiwgUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSk7 CisgICAgZXhwbGljaXQgQmx1ckV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3Vz RXZlbnQ+KTsKICAgICBGb2N1c0V2ZW50KiBldmVudCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PEZvY3VzRXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkpOyB9CiAgICAg dmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29uc3QgT1ZFUlJJ REU7Ci0gICAgUmVmUHRyPE5vZGU+IG1fbmV3Rm9jdXNlZE5vZGU7CiB9OwogCiBjbGFzcyBGb2N1 c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRp YXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4sIFBhc3NSZWZQdHI8Tm9kZT4gb2xk Rm9jdXNlZE5vZGUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRyPEZvY3VzSW5FdmVudERpc3BhdGNo TWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+KTsKIHByaXZhdGU6Ci0gICAg Rm9jdXNJbkV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+LCBQYXNz UmVmUHRyPE5vZGU+IG9sZEZvY3VzZWROb2RlKTsKKyAgICBleHBsaWNpdCBGb2N1c0luRXZlbnRE aXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8Rm9jdXNFdmVudD4pOwogICAgIEZvY3VzRXZlbnQq IGV2ZW50KCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8Rm9jdXNFdmVudCo+KEV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSk7IH0KICAgICB2aXJ0dWFsIGJvb2wgZGlzcGF0Y2hFdmVu dChFdmVudERpc3BhdGNoZXIqKSBjb25zdCBPVkVSUklERTsKLSAgICBSZWZQdHI8Tm9kZT4gbV9v bGRGb2N1c2VkTm9kZTsKIH07CiAKIGNsYXNzIEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9y IDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBh c3NSZWZQdHI8Rm9jdXNPdXRFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShQYXNzUmVmUHRy PEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3VzZWROb2RlKTsKKyAgICBzdGF0 aWMgUGFzc1JlZlB0cjxGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NS ZWZQdHI8Rm9jdXNFdmVudD4pOwogcHJpdmF0ZToKLSAgICBGb2N1c091dEV2ZW50RGlzcGF0Y2hN ZWRpYXRvcihQYXNzUmVmUHRyPEZvY3VzRXZlbnQ+LCBQYXNzUmVmUHRyPE5vZGU+IG5ld0ZvY3Vz ZWROb2RlKTsKKyAgICBleHBsaWNpdCBGb2N1c091dEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNz UmVmUHRyPEZvY3VzRXZlbnQ+KTsKICAgICBGb2N1c0V2ZW50KiBldmVudCgpIGNvbnN0IHsgcmV0 dXJuIHN0YXRpY19jYXN0PEZvY3VzRXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50 KCkpOyB9CiAgICAgdmlydHVhbCBib29sIGRpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKikg Y29uc3QgT1ZFUlJJREU7Ci0gICAgUmVmUHRyPE5vZGU+IG1fbmV3Rm9jdXNlZE5vZGU7CiB9Owog CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggODQwYzI0YzgxZTY5 YjQxNWZkMDJkYjlmN2FhZDM3OTU5NmNjYmE2Yy4uNTdkMjVjZDJkMDkwN2IyMTU1MTljODkwNDcz MGY5M2VkNTRmZTFmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtMjM4MiwyMCArMjM4MiwxNCBAQCB2 b2lkIE5vZGU6OmRpc3BhdGNoRm9jdXNJbkV2ZW50KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRU eXBlLCBQYXNzUmVmUHRyPE5vZGU+CiB7CiAgICAgQVNTRVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3Nl cnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigpKTsKICAgICBBU1NFUlQoZXZlbnRUeXBl ID09IGV2ZW50TmFtZXMoKS5mb2N1c2luRXZlbnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMo KS5ET01Gb2N1c0luRXZlbnQpOwotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgcGFzcyBvbGRGb2N1 c2VkTm9kZSB0byBGb2N1c0V2ZW50OjpjcmVhdGUoKSBhbmQKLSAgICAvLyByZW1vdmUgb2xkRm9j dXNlZE5vZGUgZnJvbSBGb2N1c0luRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoKS4KLSAg ICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTI2MQot ICAgIGRpc3BhdGNoU2NvcGVkRXZlbnREaXNwYXRjaE1lZGlhdG9yKEZvY3VzSW5FdmVudERpc3Bh dGNoTWVkaWF0b3I6OmNyZWF0ZShGb2N1c0V2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCB0cnVlLCBm YWxzZSwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCksIG9sZEZvY3VzZWROb2RlKSk7 CisgICAgZGlzcGF0Y2hTY29wZWRFdmVudERpc3BhdGNoTWVkaWF0b3IoRm9jdXNJbkV2ZW50RGlz cGF0Y2hNZWRpYXRvcjo6Y3JlYXRlKEZvY3VzRXZlbnQ6OmNyZWF0ZShldmVudFR5cGUsIHRydWUs IGZhbHNlLCBkb2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCBvbGRGb2N1c2VkTm9kZSkpKTsK IH0KIAogdm9pZCBOb2RlOjpkaXNwYXRjaEZvY3VzT3V0RXZlbnQoY29uc3QgQXRvbWljU3RyaW5n JiBldmVudFR5cGUsIFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9jdXNlZE5vZGUpCiB7CiAgICAgQVNT RVJUKCFOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnREaXNwYXRjaEZvcmJpZGRlbigp KTsKICAgICBBU1NFUlQoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5mb2N1c291dEV2ZW50IHx8 IGV2ZW50VHlwZSA9PSBldmVudE5hbWVzKCkuRE9NRm9jdXNPdXRFdmVudCk7Ci0gICAgLy8gRklY TUU6IFdlIHNob3VsZCBwYXNzIG5ld0ZvY3VzZWROb2RlIHRvIEZvY3VzRXZlbnQ6OmNyZWF0ZSgp IGFuZAotICAgIC8vIHJlbW92ZSBuZXdGb2N1c2VkTm9kZSBmcm9tIEZvY3VzT3V0RXZlbnREaXNw YXRjaE1lZGlhdG9yOjpjcmVhdGUoKS4KLSAgICAvLyBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwOTI2MQotICAgIGRpc3BhdGNoU2NvcGVkRXZlbnREaXNwYXRj aE1lZGlhdG9yKEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoRm9jdXNFdmVu dDo6Y3JlYXRlKGV2ZW50VHlwZSwgdHJ1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRWaWV3 KCksIDAsIDApLCBuZXdGb2N1c2VkTm9kZSkpOworICAgIGRpc3BhdGNoU2NvcGVkRXZlbnREaXNw YXRjaE1lZGlhdG9yKEZvY3VzT3V0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoRm9jdXNF dmVudDo6Y3JlYXRlKGV2ZW50VHlwZSwgdHJ1ZSwgZmFsc2UsIGRvY3VtZW50KCktPmRlZmF1bHRW aWV3KCksIDAsIG5ld0ZvY3VzZWROb2RlKSkpOwogfQogCiBib29sIE5vZGU6OmRpc3BhdGNoRE9N QWN0aXZhdGVFdmVudChpbnQgZGV0YWlsLCBQYXNzUmVmUHRyPEV2ZW50PiB1bmRlcmx5aW5nRXZl bnQpCkBAIC0yNDU0LDExICsyNDQ4LDggQEAgdm9pZCBOb2RlOjpkaXNwYXRjaEZvY3VzRXZlbnQo UGFzc1JlZlB0cjxOb2RlPiBvbGRGb2N1c2VkTm9kZSwgRm9jdXNEaXJlY3Rpb24pCiAgICAgaWYg KGRvY3VtZW50KCktPnBhZ2UoKSkKICAgICAgICAgZG9jdW1lbnQoKS0+cGFnZSgpLT5jaHJvbWUo KS0+Y2xpZW50KCktPmVsZW1lbnREaWRGb2N1cyh0aGlzKTsKIAotICAgIC8vIEZJWE1FOiBXZSBz aG91bGQgcGFzcyBvbGRGb2N1c2VkTm9kZSB0byBGb2N1c0V2ZW50OjpjcmVhdGUoKSBhbmQKLSAg ICAvLyByZW1vdmUgb2xkRm9jdXNlZE5vZGUgZnJvbSBGb2N1c0V2ZW50RGlzcGF0Y2hNZWRpYXRv cjo6Y3JlYXRlKCkuCi0gICAgLy8gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDkyNjEKLSAgICBSZWZQdHI8Rm9jdXNFdmVudD4gZXZlbnQgPSBGb2N1c0V2ZW50 OjpjcmVhdGUoZXZlbnROYW1lcygpLmZvY3VzRXZlbnQsIGZhbHNlLCBmYWxzZSwgZG9jdW1lbnQo KS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCk7Ci0gICAgRXZlbnREaXNwYXRjaGVyOjpkaXNwYXRjaEV2 ZW50KHRoaXMsIEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoZXZlbnQucmVsZWFz ZSgpLCBvbGRGb2N1c2VkTm9kZSkpOworICAgIFJlZlB0cjxGb2N1c0V2ZW50PiBldmVudCA9IEZv Y3VzRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuZm9jdXNFdmVudCwgZmFsc2UsIGZhbHNlLCBk b2N1bWVudCgpLT5kZWZhdWx0VmlldygpLCAwLCBvbGRGb2N1c2VkTm9kZSk7CisgICAgRXZlbnRE aXNwYXRjaGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEZvY3VzRXZlbnREaXNwYXRjaE1lZGlhdG9y OjpjcmVhdGUoZXZlbnQucmVsZWFzZSgpKSk7CiB9CiAKIHZvaWQgTm9kZTo6ZGlzcGF0Y2hCbHVy RXZlbnQoUGFzc1JlZlB0cjxOb2RlPiBuZXdGb2N1c2VkTm9kZSkKQEAgLTI0NjYsMTEgKzI0NTcs OCBAQCB2b2lkIE5vZGU6OmRpc3BhdGNoQmx1ckV2ZW50KFBhc3NSZWZQdHI8Tm9kZT4gbmV3Rm9j dXNlZE5vZGUpCiAgICAgaWYgKGRvY3VtZW50KCktPnBhZ2UoKSkKICAgICAgICAgZG9jdW1lbnQo KS0+cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPmVsZW1lbnREaWRCbHVyKHRoaXMpOwogCi0g ICAgLy8gRklYTUU6IFdlIHNob3VsZCBwYXNzIG5ld0ZvY3VzZWROb2RlIHRvIEZvY3VzRXZlbnQ6 OmNyZWF0ZSgpIGFuZAotICAgIC8vIHJlbW92ZSBuZXdGb2N1c2VkTm9kZSBmcm9tIEJsdXJFdmVu dERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZSgpLgotICAgIC8vIFNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MjYxCi0gICAgUmVmUHRyPEZvY3VzRXZlbnQ+IGV2 ZW50ID0gRm9jdXNFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5ibHVyRXZlbnQsIGZhbHNlLCBm YWxzZSwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgMCk7Ci0gICAgRXZlbnREaXNwYXRj aGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEJsdXJFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0 ZShldmVudC5yZWxlYXNlKCksIG5ld0ZvY3VzZWROb2RlKSk7CisgICAgUmVmUHRyPEZvY3VzRXZl bnQ+IGV2ZW50ID0gRm9jdXNFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5ibHVyRXZlbnQsIGZh bHNlLCBmYWxzZSwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwgMCwgbmV3Rm9jdXNlZE5vZGUp OworICAgIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBCbHVyRXZlbnREaXNw YXRjaE1lZGlhdG9yOjpjcmVhdGUoZXZlbnQucmVsZWFzZSgpKSk7CiB9CiAKIHZvaWQgTm9kZTo6 ZGlzcGF0Y2hDaGFuZ2VFdmVudCgpCg==