146173 2015-06-19 17:36:19 -0700 Deselection of text causes a noticeable jump on force touch machines 2015-06-20 23:44:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue dino sam simon.fraser oldest_to_newest 1103514 0 thorton 2015-06-19 17:36:19 -0700 Deselection of text causes a noticeable jump on force touch machines 1103516 1 255253 thorton 2015-06-19 17:37:00 -0700 Created attachment 255253 Patch 1103697 2 255253 commit-queue 2015-06-20 23:44:00 -0700 Comment on attachment 255253 Patch Clearing flags on attachment: 255253 Committed r185804: <http://trac.webkit.org/changeset/185804> 1103698 3 commit-queue 2015-06-20 23:44:04 -0700 All reviewed patches have been landed. Closing bug. 255253 2015-06-19 17:37:00 -0700 2015-06-20 23:44:00 -0700 Patch bug-146173-20150619173621.patch text/plain 17189 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmEwNjg3YWMyMTZmYTZl MTM0ZmMyZmJkODIwOTdjMjcxMzU0YzAwZi4uY2E4NDBhZGVkNmNiNzJlZWU2ZDFkYTZhMWQ1OGYw YTgxY2FhYjgxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE1LTA2LTE5ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIERlc2VsZWN0aW9u IG9mIHRleHQgY2F1c2VzIGEgbm90aWNlYWJsZSBqdW1wIG9uIGZvcmNlIHRvdWNoIG1hY2hpbmVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDYxNzMK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIwOTkyODQyPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gd2UgaGF2ZSBhIFRleHRJbmRpY2F0b3Ig b2YgdHlwZSBDcm9zc2ZhZGUsIHdlIGVuZCB1cCBwdXR0aW5nCisgICAgICAgIGEgbGF5ZXIgd2l0 aCB0aGUgYmx1ZSBoaWdobGlnaHQgKyB0ZXh0IHBhaW50ZWQgaW50byBpdCBvbiB0b3Agb2YgdGhl CisgICAgICAgIGNvbnRlbnQsIGFuZCBjcm9zcy1mYWRpbmcgdGhhdCBsYXllciB0byB0aGUgeWVs bG93LWhpZ2hsaWdodGVkIHRleHQuCisKKyAgICAgICAgVGhpcyBpcyBuZWNlc3NhcnkgZm9yIEJv dW5jZUFuZENyb3NzZmFkZSBUZXh0SW5kaWNhdG9ycywgYmVjYXVzZSB0aGUKKyAgICAgICAgYmx1 ZSBoaWdobGlnaHQgaGFzIHRvIGJvdW5jZSwgYnV0IGlzIG5vdCBuZWNlc3NhcnkgZm9yIENyb3Nz ZmFkZS1vbmx5CisgICAgICAgIG9uZXM7IHdlIGNhbiBqdXN0IGZhZGUgaW4gdGhlIHllbGxvdyBo aWdobGlnaHQgb24gdG9wIG9mIHRoZQorICAgICAgICBleGlzdGluZyBibHVlIHBhZ2UgaGlnaGxp Z2h0LCBhbmQgYWxsIGlzIHdlbGwuCisKKyAgICAgICAgU28sIGdldCByaWQgb2YgdGhlIENyb3Nz ZmFkZSBUZXh0SW5kaWNhdG9yIHR5cGUgYW5kIHVzZSBGYWRlSW4sIHNlcGFyYXRlbHkKKyAgICAg ICAga2VlcGluZyB0cmFjayBvZiB3aGV0aGVyIG9yIG5vdCB3ZSBjYW4gYWRkIGEgbWFyZ2luICh3 ZSBzdGlsbCBjYW4ndAorICAgICAgICBhZGQgYSBtYXJnaW4gdG8gVGV4dEluZGljYXRvcnMgdGhh dCBpbmRpY2F0ZSB0aGUgcGFnZSdzIGN1cnJlbnQgc2VsZWN0aW9uLAorICAgICAgICBiZWNhdXNl IHRoZSBibHVlIGhpZ2hsaWdodCBjYW5ub3QgaGF2ZSB0aGUgbWFyZ2luIGFwcGxpZWQgdG8gaXQs IGFuZCB3ZQorICAgICAgICB3YW50IHRoZSBib3VuZHMgdG8gbWF0Y2ggZXhhY3RseSkuCisKKyAg ICAgICAgKiBwYWdlL1RleHRJbmRpY2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dElu ZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKToKKyAgICAgICAgSWYgdGhlIHJhbmdlIGlzIHRoZSBz YW1lIGFzIHRoZSBzZWxlY3Rpb24sIHR1cm4gb2ZmIHRoZSBtYXJnaW4uCisgICAgICAgIFdlIHdl cmUgcHJldmlvdXNseSBkb2luZyB0aGlzIGJhc2VkIG9uIHRoZSBwcmVzZW50YXRpb24gdHJhbnNp dGlvbiwgYnV0IG5vdworICAgICAgICB0aGVyZSdzIG5vIGRpZmZlcmVuY2UgaW4gcHJlc2VudGF0 aW9uIHRyYW5zaXRpb24gaW4gdGhpcyBjYXNlLgorCisgICAgICAgIChXZWJDb3JlOjpUZXh0SW5k aWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpU ZXh0SW5kaWNhdG9yOjp3YW50c0JvdW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0SW5kaWNh dG9yOjp3YW50c0NvbnRlbnRDcm9zc2ZhZGUpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEluZGlj YXRvcjo6d2FudHNGYWRlSW4pOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRvcjo6d2Fu dHNNYW51YWxBbmltYXRpb24pOgorICAgICAgICAqIHBhZ2UvVGV4dEluZGljYXRvci5oOgorICAg ICAgICBHZXQgcmlkIG9mIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpDcm9z c2ZhZGUuCisKKyAgICAgICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OnNldFdhbnRzTWFyZ2lu KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OndhbnRzTWFyZ2luKToKKyAgICAg ICAgS2VlcCB0cmFjayBvZiB3aGV0aGVyIHdlIHdhbnQgYSBtYXJnaW4uCisKKyAgICAgICAgKiBw YWdlL21hYy9UZXh0SW5kaWNhdG9yV2luZG93Lm1tOgorICAgICAgICAoLVtXZWJUZXh0SW5kaWNh dG9yVmlldyBpbml0V2l0aEZyYW1lOnRleHRJbmRpY2F0b3I6bWFyZ2luOl0pOgorICAgICAgICBE ZXRlcm1pbmUgaWYgd2Ugc2hvdWxkIHVzZSBhIG1hcmdpbiBiYXNlZCBvbiB3YW50c01hcmdpbiBp bnN0ZWFkIG9mIHRoZQorICAgICAgICBwcmVzZW50YXRpb24gdHJhbnNpdGlvbi4KKwogMjAxNS0w Ni0xOSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CiAKICAgICAgICAgUGxheWVkIDxh dWRpbz4gbG9va3MgaW52aXNpYmxlIGFnYWluc3QgdGhlIGdyYXkgYmFja2dyb3VuZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hh bmdlTG9nCmluZGV4IDVhNTM2YjY0MWUzNjk5YTdkN2JhYTY4ODYyNDMxOTYwMGMxMWJiOTAuLmMy NTk4MDM3MzdmOGEyNTY3NTk5ZjE3ZmE3YjA2YWQyOWVmNDViMmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNSBAQAorMjAxNS0wNi0xOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9u QGFwcGxlLmNvbT4KKworICAgICAgICBEZXNlbGVjdGlvbiBvZiB0ZXh0IGNhdXNlcyBhIG5vdGlj ZWFibGUganVtcCBvbiBmb3JjZSB0b3VjaCBtYWNoaW5lcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2MTczCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8yMDk5Mjg0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFdlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlci5tbToKKyAgICAgICAg KC1bV2ViSW1tZWRpYXRlQWN0aW9uQ29udHJvbGxlciBfYW5pbWF0aW9uQ29udHJvbGxlckZvclRl eHRdKToKKyAgICAgICAgR2V0IHJpZCBvZiBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNp dGlvbjo6Q3Jvc3NmYWRlLgorCiAyMDE1LTA2LTE5ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIEFsbCBjYWxscyBvZiBJbWFnZUJ1ZmZlcjo6Y3JlYXRlIHNo b3VsZCBudWxsIGNoZWNrIHRoZSByZXR1cm4gdmFsdWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNzJjNWQ3OTM5 ODMyOWU2MTEzMzlkMmE2MDVlM2EwYTFiODk0MTBkLi42M2Y2NWNiNWJiZjVjNGRlNGM5ZTlkMzRh ZDU1OWVkMDg1ODQ2YTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTUtMDYtMTkg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRGVzZWxl Y3Rpb24gb2YgdGV4dCBjYXVzZXMgYSBub3RpY2VhYmxlIGp1bXAgb24gZm9yY2UgdG91Y2ggbWFj aGluZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NjE3MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjA5OTI4NDI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmNwcDoKKyAgICAgICAgKElQQzo6QXJndW1lbnRDb2RlcjxUZXh0SW5kaWNhdG9yRGF0 YT46OmVuY29kZSk6CisgICAgICAgIChJUEM6OkFyZ3VtZW50Q29kZXI8VGV4dEluZGljYXRvckRh dGE+OjpkZWNvZGUpOgorICAgICAgICBFbmNvZGUvZGVjb2RlIHdhbnRzTWFyZ2luLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlOjpwZXJmb3JtSW1tZWRpYXRlQWN0aW9uSGl0VGVzdEF0TG9jYXRpb24pOgor ICAgICAgICAoV2ViS2l0Ojp0ZXh0SW5kaWNhdG9yVHJhbnNpdGlvbkZvckltbWVkaWF0ZUFjdGlv bik6IERlbGV0ZWQuCisgICAgICAgIEdldCByaWQgb2YgVGV4dEluZGljYXRvclByZXNlbnRhdGlv blRyYW5zaXRpb246OkNyb3NzZmFkZS4KKwogMjAxNS0wNi0xOSAgQnJhZHkgRWlkc29uICA8YmVp ZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIFdLU2VjdXJpdHlPcmlnaW4uaC9jcHAg dG8gV0tTZWN1cml0eU9yaWdpblJlZi5oL2NwcC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvVGV4dEluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0 b3IuY3BwCmluZGV4IDQ4NjJlNDc5Yjc2YWU1ZWIwOWE1ZThkNmRmODIwYmNmZjUzYjQ1YjkuLjEw NTJkNTBjNTE1N2E5MGQ3NmUyYzcwNjQ4NThkMDJjZjFiMjIwOTYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9UZXh0SW5kaWNhdG9yLmNwcApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgIkltYWdlQnVm ZmVyLmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKKyNpbmNsdWRl ICJSYW5nZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTAzLDYgKzEwNCw4 IEBAIFJlZlB0cjxUZXh0SW5kaWNhdG9yPiBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2Uo Y29uc3QgUmFuZ2UmIHJhbmdlLCBUZXh0SW5kCiAgICAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IGlu ZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKCpmcmFt ZSwgcHJlc2VudGF0aW9uVHJhbnNpdGlvbik7CiAKICAgICBmcmFtZS0+c2VsZWN0aW9uKCkuc2V0 U2VsZWN0aW9uKG9sZFNlbGVjdGlvbik7CisKKyAgICBpbmRpY2F0b3ItPnNldFdhbnRzTWFyZ2lu KCFhcmVSYW5nZXNFcXVhbCgmcmFuZ2UsIG9sZFNlbGVjdGlvbi50b05vcm1hbGl6ZWRSYW5nZSgp LmdldCgpKSk7CiAgICAgCiAgICAgcmV0dXJuIGluZGljYXRvci5yZWxlYXNlKCk7CiB9CkBAIC0x NDEsNyArMTQ0LDcgQEAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0b3I6OmNyZWF0 ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKEZyYW1lJiBmcmFtZSwgVGUKICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAKICAgICBSZWZQdHI8SW1hZ2U+IGluZGljYXRvckJpdG1hcFdpdGhIaWdobGlnaHQ7 Ci0gICAgaWYgKHByZXNlbnRhdGlvblRyYW5zaXRpb24gPT0gVGV4dEluZGljYXRvclByZXNlbnRh dGlvblRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFkZSB8fCBwcmVzZW50YXRpb25UcmFuc2l0 aW9uID09IFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpDcm9zc2ZhZGUpCisg ICAgaWYgKHByZXNlbnRhdGlvblRyYW5zaXRpb24gPT0gVGV4dEluZGljYXRvclByZXNlbnRhdGlv blRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFkZSkKICAgICAgICAgaW5kaWNhdG9yQml0bWFw V2l0aEhpZ2hsaWdodCA9IHNuYXBzaG90U2VsZWN0aW9uV2l0aEhpZ2hsaWdodChmcmFtZSk7CiAK ICAgICAvLyBTdG9yZSB0aGUgc2VsZWN0aW9uIHJlY3QgaW4gd2luZG93IGNvb3JkaW5hdGVzLCB0 byBiZSB1c2VkIHN1YnNlcXVlbnRseQpAQCAtMTc2LDYgKzE3OSw3IEBAIFJlZlB0cjxUZXh0SW5k aWNhdG9yPiBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2VsZWN0aW9uSW5GcmFtZShGcmFtZSYg ZnJhbWUsIFRlCiAgICAgZGF0YS5jb250ZW50SW1hZ2UgPSBpbmRpY2F0b3JCaXRtYXA7CiAgICAg ZGF0YS5jb250ZW50SW1hZ2VXaXRoSGlnaGxpZ2h0ID0gaW5kaWNhdG9yQml0bWFwV2l0aEhpZ2hs aWdodDsKICAgICBkYXRhLnByZXNlbnRhdGlvblRyYW5zaXRpb24gPSBwcmVzZW50YXRpb25UcmFu c2l0aW9uOworICAgIGRhdGEud2FudHNNYXJnaW4gPSB0cnVlOwogCiAgICAgcmV0dXJuIFRleHRJ bmRpY2F0b3I6OmNyZWF0ZShkYXRhKTsKIH0KQEAgLTIwMyw3ICsyMDcsNiBAQCBib29sIFRleHRJ bmRpY2F0b3I6OndhbnRzQm91bmNlKCkgY29uc3QKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAg ICAgIAogICAgIGNhc2UgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJ bjoKLSAgICBjYXNlIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpDcm9zc2Zh ZGU6CiAgICAgY2FzZSBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Tm9uZToK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KQEAgLTIxOSw3ICsyMjIsNiBAQCBib29sIFRl eHRJbmRpY2F0b3I6OndhbnRzQ29udGVudENyb3NzZmFkZSgpIGNvbnN0CiAgICAgCiAgICAgc3dp dGNoIChtX2RhdGEucHJlc2VudGF0aW9uVHJhbnNpdGlvbikgewogICAgIGNhc2UgVGV4dEluZGlj YXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkJvdW5jZUFuZENyb3NzZmFkZToKLSAgICBjYXNl IFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpDcm9zc2ZhZGU6CiAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICAKICAgICBjYXNlIFRleHRJbmRpY2F0b3JQcmVzZW50YXRp b25UcmFuc2l0aW9uOjpCb3VuY2U6CkBAIC0yNDAsNyArMjQyLDYgQEAgYm9vbCBUZXh0SW5kaWNh dG9yOjp3YW50c0ZhZGVJbigpIGNvbnN0CiAgICAgICAgIAogICAgIGNhc2UgVGV4dEluZGljYXRv clByZXNlbnRhdGlvblRyYW5zaXRpb246OkJvdW5jZToKICAgICBjYXNlIFRleHRJbmRpY2F0b3JQ cmVzZW50YXRpb25UcmFuc2l0aW9uOjpCb3VuY2VBbmRDcm9zc2ZhZGU6Ci0gICAgY2FzZSBUZXh0 SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Q3Jvc3NmYWRlOgogICAgIGNhc2UgVGV4 dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246Ok5vbmU6CiAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICB9CkBAIC0yNTMsNyArMjU0LDYgQEAgYm9vbCBUZXh0SW5kaWNhdG9yOjp3YW50 c01hbnVhbEFuaW1hdGlvbigpIGNvbnN0CiB7CiAgICAgc3dpdGNoIChtX2RhdGEucHJlc2VudGF0 aW9uVHJhbnNpdGlvbikgewogICAgIGNhc2UgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5z aXRpb246OkZhZGVJbjoKLSAgICBjYXNlIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0 aW9uOjpDcm9zc2ZhZGU6CiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgY2FzZSBUZXh0SW5k aWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6Qm91bmNlOgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJ bmRpY2F0b3IuaAppbmRleCBjNmM5ZmZiZGQ2MzUyZDIzM2Q4NTY0YzI5ZWFjMGZjMjEyMTMwOGI2 Li44OTZlMTA4NzVmMjQ4ZTVjYTQ3Y2I0MDBkZThhYWZkYWU5MzkyN2U2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuaApAQCAtNTEsOSArNTEsOCBAQCBlbnVtIGNsYXNzIFRleHRJbmRp Y2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uIHsKICAgICBCb3VuY2UsCiAgICAgQm91bmNlQW5k Q3Jvc3NmYWRlLAogCi0gICAgLy8gVGhlc2UgYW5pbWF0aW9ucyBuZWVkIHRvIGJlIGRyaXZlbiBt YW51YWxseSB2aWEgVGV4dEluZGljYXRvcldpbmRvdzo6c2V0QW5pbWF0aW9uUHJvZ3Jlc3MuCisg ICAgLy8gVGhpcyBhbmltYXRpb24gbmVlZHMgdG8gYmUgZHJpdmVuIG1hbnVhbGx5IHZpYSBUZXh0 SW5kaWNhdG9yV2luZG93OjpzZXRBbmltYXRpb25Qcm9ncmVzcy4KICAgICBGYWRlSW4sCi0gICAg Q3Jvc3NmYWRlCiB9OwogCiBlbnVtIGNsYXNzIFRleHRJbmRpY2F0b3JMaWZldGltZSB7CkBAIC03 Nyw2ICs3Niw3IEBAIHN0cnVjdCBUZXh0SW5kaWNhdG9yRGF0YSB7CiAgICAgUmVmUHRyPEltYWdl PiBjb250ZW50SW1hZ2VXaXRoSGlnaGxpZ2h0OwogICAgIFJlZlB0cjxJbWFnZT4gY29udGVudElt YWdlOwogICAgIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uIHByZXNlbnRhdGlv blRyYW5zaXRpb247CisgICAgYm9vbCB3YW50c01hcmdpbjsKIH07CiAKIGNsYXNzIFRleHRJbmRp Y2F0b3IgOiBwdWJsaWMgUmVmQ291bnRlZDxUZXh0SW5kaWNhdG9yPiB7CkBAIC0xMDQsNiArMTA0 LDkgQEAgcHVibGljOgogICAgIGJvb2wgd2FudHNGYWRlSW4oKSBjb25zdDsKICAgICBib29sIHdh bnRzTWFudWFsQW5pbWF0aW9uKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldFdhbnRzTWFyZ2luKGJv b2wgd2FudHNNYXJnaW4pIHsgbV9kYXRhLndhbnRzTWFyZ2luID0gd2FudHNNYXJnaW47IH0KKyAg ICBib29sIHdhbnRzTWFyZ2luKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLndhbnRzTWFyZ2luOyB9 CisKIHByaXZhdGU6CiAgICAgVGV4dEluZGljYXRvcihjb25zdCBUZXh0SW5kaWNhdG9yRGF0YSYp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9UZXh0SW5kaWNhdG9yV2lu ZG93Lm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvVGV4dEluZGljYXRvcldpbmRvdy5tbQpp bmRleCA3ZGQ5M2NmYzFhMzBiNjFhOGQ4ZmFjN2E5MWQxODNiYTJiMjFkMDhjLi5jY2Q0ZWZhODk0 MmY5MWY2OWMyMGQ0OGFlYWQ2MWM1OWRkZmVhYmUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL21hYy9UZXh0SW5kaWNhdG9yV2luZG93Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvbWFjL1RleHRJbmRpY2F0b3JXaW5kb3cubW0KQEAgLTEwMiwxMiArMTAyLDEwIEBAIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIHNlbGYud2FudHNMYXllciA9IFlFUzsKICAgICBzZWxm LmxheWVyLmFuY2hvclBvaW50ID0gQ0dQb2ludFplcm87CiAKLSAgICBib29sIHdhbnRzQ3Jvc3Nm YWRlID0gX3RleHRJbmRpY2F0b3ItPndhbnRzQ29udGVudENyb3NzZmFkZSgpOwotCiAgICAgRmxv YXRTaXplIGNvbnRlbnRzSW1hZ2VMb2dpY2FsU2l6ZSA9IF90ZXh0SW5kaWNhdG9yLT5jb250ZW50 SW1hZ2UoKS0+c2l6ZSgpOwogICAgIGNvbnRlbnRzSW1hZ2VMb2dpY2FsU2l6ZS5zY2FsZSgxIC8g X3RleHRJbmRpY2F0b3ItPmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yKCkpOwogICAgIFJldGFpblB0 cjxDR0ltYWdlUmVmPiBjb250ZW50c0ltYWdlOwotICAgIGlmICh3YW50c0Nyb3NzZmFkZSkKKyAg ICBpZiAoX3RleHRJbmRpY2F0b3ItPndhbnRzQ29udGVudENyb3NzZmFkZSgpKQogICAgICAgICBj b250ZW50c0ltYWdlID0gX3RleHRJbmRpY2F0b3ItPmNvbnRlbnRJbWFnZVdpdGhIaWdobGlnaHQo KS0+Z2V0Q0dJbWFnZVJlZigpOwogICAgIGVsc2UKICAgICAgICAgY29udGVudHNJbWFnZSA9IF90 ZXh0SW5kaWNhdG9yLT5jb250ZW50SW1hZ2UoKS0+Z2V0Q0dJbWFnZVJlZigpOwpAQCAtMTM3LDcg KzEzNSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgICAgICBGbG9hdFJlY3QgeWVs bG93SGlnaGxpZ2h0UmVjdChGbG9hdFBvaW50KCksIGJvdW5jZUxheWVyUmVjdC5zaXplKCkpOwog ICAgICAgICAvLyBGSVhNRSAoMTM4ODg4KTogSWRlYWxseSB3ZSB3b3VsZG4ndCByZW1vdmUgdGhl IG1hcmdpbiBpbiB0aGlzIGNhc2UsIGJ1dCB3ZSBuZWVkIHRvCiAgICAgICAgIC8vIGVuc3VyZSB0 aGF0IHRoZSB5ZWxsb3cgaGlnaGxpZ2h0IGFuZCBjb250ZW50SW1hZ2VXaXRoSGlnaGxpZ2h0IG92 ZXJsYXAgcHJlY2lzZWx5LgotICAgICAgICBpZiAod2FudHNDcm9zc2ZhZGUpIHsKKyAgICAgICAg aWYgKCFfdGV4dEluZGljYXRvci0+d2FudHNNYXJnaW4oKSkgewogICAgICAgICAgICAgeWVsbG93 SGlnaGxpZ2h0UmVjdC5pbmZsYXRlWCgtaG9yaXpvbnRhbEJvcmRlcik7CiAgICAgICAgICAgICB5 ZWxsb3dIaWdobGlnaHRSZWN0LmluZmxhdGVZKC12ZXJ0aWNhbEJvcmRlcik7CiAgICAgICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0aW9u Q29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViSW1tZWRpYXRlQWN0 aW9uQ29udHJvbGxlci5tbQppbmRleCAyNzg1MjgwZjAwN2Q3NTFhNDY3OTZlNGVjNTc4MmM4ZGNm YmIzYzNkLi45MjFjNzU4ZjQ3NmYxNTkzNzJlYzMzODM1M2ZiZWJiY2I2NWVmMGFlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkltbWVkaWF0ZUFjdGlvbkNvbnRyb2xs ZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJJbW1lZGlhdGVBY3Rpb25D b250cm9sbGVyLm1tCkBAIC01MjgsOCArNTI4LDcgQEAgc3RhdGljIERpY3Rpb25hcnlQb3B1cElu Zm8gZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdlKEZyYW1lKiBmcmFtZSwgUmFuZ2UmIHJhbmcK ICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIFJlZlB0cjxSYW5nZT4gc2VsZWN0aW9uUmFuZ2Ug PSBmcmFtZS0+cGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKS5z ZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5maXJzdFJhbmdlKCk7Ci0gICAgYm9vbCByYW5nZU1hdGNo ZXNTZWxlY3Rpb24gPSBhcmVSYW5nZXNFcXVhbChkaWN0aW9uYXJ5UmFuZ2UuZ2V0KCksIHNlbGVj dGlvblJhbmdlLmdldCgpKTsKLSAgICBEaWN0aW9uYXJ5UG9wdXBJbmZvIGRpY3Rpb25hcnlQb3B1 cEluZm8gPSBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoZnJhbWUsICpkaWN0aW9uYXJ5UmFu Z2UsIG9wdGlvbnMsIHJhbmdlTWF0Y2hlc1NlbGVjdGlvbiA/IFRleHRJbmRpY2F0b3JQcmVzZW50 YXRpb25UcmFuc2l0aW9uOjpDcm9zc2ZhZGUgOiBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJh bnNpdGlvbjo6RmFkZUluKTsKKyAgICBEaWN0aW9uYXJ5UG9wdXBJbmZvIGRpY3Rpb25hcnlQb3B1 cEluZm8gPSBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFuZ2UoZnJhbWUsICpkaWN0aW9uYXJ5UmFu Z2UsIG9wdGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpGYWRlSW4p OwogICAgIGlmICghZGljdGlvbmFyeVBvcHVwSW5mby5hdHRyaWJ1dGVkU3RyaW5nKQogICAgICAg ICByZXR1cm4gbmlsOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViQ29y ZUFyZ3VtZW50Q29kZXJzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1l bnRDb2RlcnMuY3BwCmluZGV4IGY5MTk3MThiZmU4ZDlkNTA3YTI4NzcyYzY1NjUwMmVmMGViYTgw NzQuLjhmYTJhMGEyNzY0ZDVmNDc1NzZjOGY0Yjk5MzZmNmYwNWYxYzE2NjcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuY3BwCkBAIC0yMTAyLDYg KzIxMDIsNyBAQCB2b2lkIEFyZ3VtZW50Q29kZXI8VGV4dEluZGljYXRvckRhdGE+OjplbmNvZGUo QXJndW1lbnRFbmNvZGVyJiBlbmNvZGVyLCBjb25zdCBUZQogICAgIGVuY29kZXIgPDwgdGV4dElu ZGljYXRvckRhdGEudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29yZGluYXRlczsKICAgICBl bmNvZGVyIDw8IHRleHRJbmRpY2F0b3JEYXRhLnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRp bmF0ZXM7CiAgICAgZW5jb2RlciA8PCB0ZXh0SW5kaWNhdG9yRGF0YS5jb250ZW50SW1hZ2VTY2Fs ZUZhY3RvcjsKKyAgICBlbmNvZGVyIDw8IHRleHRJbmRpY2F0b3JEYXRhLndhbnRzTWFyZ2luOwog ICAgIGVuY29kZXIuZW5jb2RlRW51bSh0ZXh0SW5kaWNhdG9yRGF0YS5wcmVzZW50YXRpb25UcmFu c2l0aW9uKTsKIAogICAgIGJvb2wgaGFzSW1hZ2UgPSB0ZXh0SW5kaWNhdG9yRGF0YS5jb250ZW50 SW1hZ2U7CkBAIC0yMTI5LDYgKzIxMzAsOSBAQCBib29sIEFyZ3VtZW50Q29kZXI8VGV4dEluZGlj YXRvckRhdGE+OjpkZWNvZGUoQXJndW1lbnREZWNvZGVyJiBkZWNvZGVyLCBUZXh0SW5kaQogICAg IGlmICghZGVjb2Rlci5kZWNvZGUodGV4dEluZGljYXRvckRhdGEuY29udGVudEltYWdlU2NhbGVG YWN0b3IpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVjb2Rl KHRleHRJbmRpY2F0b3JEYXRhLndhbnRzTWFyZ2luKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUVudW0odGV4dEluZGljYXRvckRhdGEucHJlc2VudGF0 aW9uVHJhbnNpdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IDkzZmE2 MGUzYjA4ZDc5NGQxNDZlMWM4MzcxZjRkZmUwOGM4N2IxOTUuLjE2NDQyYTg0YzZhNjdhMzk2Yzky ZDhlYTdkYjA2YjYzN2RjNTlhNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KQEAgLTEwNjIsMjAgKzEwNjIsNiBAQCBTdHJp bmcgV2ViUGFnZTo6cGxhdGZvcm1Vc2VyQWdlbnQoY29uc3QgVVJMJikgY29uc3QKICAgICByZXR1 cm4gU3RyaW5nKCk7CiB9CiAKLXN0YXRpYyBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNp dGlvbiB0ZXh0SW5kaWNhdG9yVHJhbnNpdGlvbkZvckltbWVkaWF0ZUFjdGlvbihSYW5nZSogc2Vs ZWN0aW9uUmFuZ2UsIFJhbmdlJiBpbmRpY2F0b3JSYW5nZSwgYm9vbCBmb3JEYXRhRGV0ZWN0b3Jz KQotewotICAgIGlmIChhcmVSYW5nZXNFcXVhbCgmaW5kaWNhdG9yUmFuZ2UsIHNlbGVjdGlvblJh bmdlKSkKLSAgICAgICAgcmV0dXJuIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9u OjpDcm9zc2ZhZGU7Ci0gICAgcmV0dXJuIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0 aW9uOjpGYWRlSW47Ci19Ci0KLSNpZiBFTkFCTEUoUERGS0lUX1BMVUdJTikKLXN0YXRpYyBUZXh0 SW5kaWNhdG9yUHJlc2VudGF0aW9uVHJhbnNpdGlvbiB0ZXh0SW5kaWNhdG9yVHJhbnNpdGlvbkZv ckltbWVkaWF0ZUFjdGlvbigpCi17Ci0gICAgcmV0dXJuIFRleHRJbmRpY2F0b3JQcmVzZW50YXRp b25UcmFuc2l0aW9uOjpGYWRlSW47Ci19Ci0jZW5kaWYKLQogdm9pZCBXZWJQYWdlOjpwZXJmb3Jt SW1tZWRpYXRlQWN0aW9uSGl0VGVzdEF0TG9jYXRpb24oV2ViQ29yZTo6RmxvYXRQb2ludCBsb2Nh dGlvbkluVmlld0Nvb3JkaW5hdGVzKQogewogICAgIGxheW91dElmTmVlZGVkKCk7CkBAIC0xMTA0 LDcgKzEwOTAsNyBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1JbW1lZGlhdGVBY3Rpb25IaXRUZXN0 QXRMb2NhdGlvbihXZWJDb3JlOjpGbG9hdFBvaW50IGxvY2F0aQogICAgIEVsZW1lbnQgKlVSTEVs ZW1lbnQgPSBoaXRUZXN0UmVzdWx0LlVSTEVsZW1lbnQoKTsKICAgICBpZiAoIWFic29sdXRlTGlu a1VSTC5pc0VtcHR5KCkgJiYgVVJMRWxlbWVudCkgewogICAgICAgICBSZWZQdHI8UmFuZ2U+IGxp bmtSYW5nZSA9IHJhbmdlT2ZDb250ZW50cygqVVJMRWxlbWVudCk7Ci0gICAgICAgIGltbWVkaWF0 ZUFjdGlvblJlc3VsdC5saW5rVGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0ZVdp dGhSYW5nZSgqbGlua1JhbmdlLCB0ZXh0SW5kaWNhdG9yVHJhbnNpdGlvbkZvckltbWVkaWF0ZUFj dGlvbihzZWxlY3Rpb25SYW5nZS5nZXQoKSwgKmxpbmtSYW5nZSwgZmFsc2UpKTsKKyAgICAgICAg aW1tZWRpYXRlQWN0aW9uUmVzdWx0LmxpbmtUZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6 Y3JlYXRlV2l0aFJhbmdlKCpsaW5rUmFuZ2UsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFu c2l0aW9uOjpGYWRlSW4pOwogICAgIH0KIAogICAgIE5TRGljdGlvbmFyeSAqb3B0aW9ucyA9IG5p bDsKQEAgLTExMTQsNyArMTEwMCw3IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9ybUltbWVkaWF0ZUFj dGlvbkhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQgbG9jYXRpCiAgICAgaWYg KGxvb2t1cFJhbmdlKSB7CiAgICAgICAgIGlmIChOb2RlKiBub2RlID0gaGl0VGVzdFJlc3VsdC5p bm5lck5vZGUoKSkgewogICAgICAgICAgICAgaWYgKEZyYW1lKiBoaXRUZXN0UmVzdWx0RnJhbWUg PSBub2RlLT5kb2N1bWVudCgpLmZyYW1lKCkpCi0gICAgICAgICAgICAgICAgaW1tZWRpYXRlQWN0 aW9uUmVzdWx0LmRpY3Rpb25hcnlQb3B1cEluZm8gPSBkaWN0aW9uYXJ5UG9wdXBJbmZvRm9yUmFu Z2UoaGl0VGVzdFJlc3VsdEZyYW1lLCAqbG9va3VwUmFuZ2UuZ2V0KCksICZvcHRpb25zLCB0ZXh0 SW5kaWNhdG9yVHJhbnNpdGlvbkZvckltbWVkaWF0ZUFjdGlvbihzZWxlY3Rpb25SYW5nZS5nZXQo KSwgKmxvb2t1cFJhbmdlLCBmYWxzZSkpOworICAgICAgICAgICAgICAgIGltbWVkaWF0ZUFjdGlv blJlc3VsdC5kaWN0aW9uYXJ5UG9wdXBJbmZvID0gZGljdGlvbmFyeVBvcHVwSW5mb0ZvclJhbmdl KGhpdFRlc3RSZXN1bHRGcmFtZSwgKmxvb2t1cFJhbmdlLmdldCgpLCAmb3B0aW9ucywgVGV4dElu ZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7CiAgICAgICAgIH0KICAgICB9 CiAKQEAgLTExNDAsNyArMTEyNiw3IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9ybUltbWVkaWF0ZUFj dGlvbkhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQgbG9jYXRpCiAgICAgICAg ICAgICBkZXRlY3RlZERhdGFCb3VuZGluZ0JveC51bml0ZShmcmFtZVZpZXctPmNvbnRlbnRzVG9X aW5kb3cocXVhZC5lbmNsb3NpbmdCb3VuZGluZ0JveCgpKSk7CiAKICAgICAgICAgaW1tZWRpYXRl QWN0aW9uUmVzdWx0LmRldGVjdGVkRGF0YUJvdW5kaW5nQm94ID0gZGV0ZWN0ZWREYXRhQm91bmRp bmdCb3g7Ci0gICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5kZXRlY3RlZERhdGFUZXh0SW5k aWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKCptYWluUmVzdWx0UmFuZ2Us IHRleHRJbmRpY2F0b3JUcmFuc2l0aW9uRm9ySW1tZWRpYXRlQWN0aW9uKHNlbGVjdGlvblJhbmdl LmdldCgpLCAqbWFpblJlc3VsdFJhbmdlLCB0cnVlKSk7CisgICAgICAgIGltbWVkaWF0ZUFjdGlv blJlc3VsdC5kZXRlY3RlZERhdGFUZXh0SW5kaWNhdG9yID0gVGV4dEluZGljYXRvcjo6Y3JlYXRl V2l0aFJhbmdlKCptYWluUmVzdWx0UmFuZ2UsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFu c2l0aW9uOjpGYWRlSW4pOwogICAgICAgICBpbW1lZGlhdGVBY3Rpb25SZXN1bHQuZGV0ZWN0ZWRE YXRhT3JpZ2luYXRpbmdQYWdlT3ZlcmxheSA9IG92ZXJsYXktPnBhZ2VPdmVybGF5SUQoKTsKIAog ICAgICAgICBicmVhazsKQEAgLTExNTMsNyArMTEzOSw3IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9y bUltbWVkaWF0ZUFjdGlvbkhpdFRlc3RBdExvY2F0aW9uKFdlYkNvcmU6OkZsb2F0UG9pbnQgbG9j YXRpCiAgICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5kZXRlY3RlZERhdGFBY3Rpb25Db250 ZXh0ID0gRGF0YURldGVjdGlvbjo6ZGV0ZWN0SXRlbUFyb3VuZEhpdFRlc3RSZXN1bHQoaGl0VGVz dFJlc3VsdCwgZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3gsIGRldGVjdGVkRGF0YVJhbmdlKTsKICAg ICAgICAgaWYgKGltbWVkaWF0ZUFjdGlvblJlc3VsdC5kZXRlY3RlZERhdGFBY3Rpb25Db250ZXh0 ICYmIGRldGVjdGVkRGF0YVJhbmdlKSB7CiAgICAgICAgICAgICBpbW1lZGlhdGVBY3Rpb25SZXN1 bHQuZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3ggPSBkZXRlY3RlZERhdGFCb3VuZGluZ0JveDsKLSAg ICAgICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5kZXRlY3RlZERhdGFUZXh0SW5kaWNhdG9y ID0gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKCpkZXRlY3RlZERhdGFSYW5nZSwgdGV4 dEluZGljYXRvclRyYW5zaXRpb25Gb3JJbW1lZGlhdGVBY3Rpb24oc2VsZWN0aW9uUmFuZ2UuZ2V0 KCksICpkZXRlY3RlZERhdGFSYW5nZSwgdHJ1ZSkpOworICAgICAgICAgICAgaW1tZWRpYXRlQWN0 aW9uUmVzdWx0LmRldGVjdGVkRGF0YVRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVh dGVXaXRoUmFuZ2UoKmRldGVjdGVkRGF0YVJhbmdlLCBUZXh0SW5kaWNhdG9yUHJlc2VudGF0aW9u VHJhbnNpdGlvbjo6RmFkZUluKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTE4MSw3ICsxMTY3 LDcgQEAgdm9pZCBXZWJQYWdlOjpwZXJmb3JtSW1tZWRpYXRlQWN0aW9uSGl0VGVzdEF0TG9jYXRp b24oV2ViQ29yZTo6RmxvYXRQb2ludCBsb2NhdGkKICAgICAgICAgICAgICAgICBpbW1lZGlhdGVB Y3Rpb25SZXN1bHQuaXNTZWxlY3RlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgaW1tZWRpYXRl QWN0aW9uUmVzdWx0LmFsbG93c0NvcHkgPSB0cnVlOwogCi0gICAgICAgICAgICAgICAgaW1tZWRp YXRlQWN0aW9uUmVzdWx0LmRpY3Rpb25hcnlQb3B1cEluZm8gPSBkaWN0aW9uYXJ5UG9wdXBJbmZv Rm9yU2VsZWN0aW9uSW5QREZQbHVnaW4oc2VsZWN0aW9uLCAqcGRmUHVnaW4sICZvcHRpb25zLCB0 ZXh0SW5kaWNhdG9yVHJhbnNpdGlvbkZvckltbWVkaWF0ZUFjdGlvbigpKTsKKyAgICAgICAgICAg ICAgICBpbW1lZGlhdGVBY3Rpb25SZXN1bHQuZGljdGlvbmFyeVBvcHVwSW5mbyA9IGRpY3Rpb25h cnlQb3B1cEluZm9Gb3JTZWxlY3Rpb25JblBERlBsdWdpbihzZWxlY3Rpb24sICpwZGZQdWdpbiwg Jm9wdGlvbnMsIFRleHRJbmRpY2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpGYWRlSW4pOwog ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQo=