135959 2014-08-14 15:45:29 -0700 Service overlays stay fixed when <iframe> scrolls 2014-08-15 12:10:47 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton beidson enrica oldest_to_newest 1029245 0 thorton 2014-08-14 15:45:29 -0700 <rdar://problem/17957716> 1029248 1 236632 thorton 2014-08-14 15:47:03 -0700 Created attachment 236632 patch 1029249 2 236633 thorton 2014-08-14 15:49:30 -0700 Created attachment 236633 patch 1029252 3 thorton 2014-08-14 15:56:58 -0700 Needs a little more iteration. 1029256 4 236633 thorton 2014-08-14 16:07:23 -0700 Comment on attachment 236633 patch The thing I found is not a regression from this patch. 1029408 5 236633 enrica 2014-08-15 11:46:36 -0700 Comment on attachment 236633 patch Looks good! 1029410 6 thorton 2014-08-15 11:49:06 -0700 http://trac.webkit.org/changeset/172636 1029418 7 236664 thorton 2014-08-15 12:05:39 -0700 Created attachment 236664 tiny followup 1029422 8 236664 enrica 2014-08-15 12:08:18 -0700 Comment on attachment 236664 tiny followup Sure! 1029423 9 thorton 2014-08-15 12:10:47 -0700 Followup in http://trac.webkit.org/changeset/172639 236632 2014-08-14 15:47:03 -0700 2014-08-14 15:49:30 -0700 patch iframe.diff text/plain 15001 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3ZjcxYTJhLi43NmIzOGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYg QEAKKzIwMTQtMDgtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgU2VydmljZSBvdmVybGF5cyBzdGF5IGZpeGVkIHdoZW4gPGlmcmFtZT4gc2Nyb2xs cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTU5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzk1NzcxNj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5OjpkaWRTY3JvbGxGcmFtZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5Lmg6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VPdmVybGF5OjpDbGllbnQ6OmRpZFNjcm9sbEZyYW1lKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UGFnZU92ZXJsYXlDb250cm9sbGVyOjpkaWRTY3JvbGxGcmFtZSk6CisgICAgICAgIFB1 c2ggZGlkU2Nyb2xsRnJhbWUgZG93biB0byB0aGUgb3ZlcmxheXMuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9tYWMvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5tbToKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0OjpjcmVhdGVG b3JTZWxlY3Rpb24pOgorICAgICAgICBIb2xkIG9uIHRvIHRoZSBzZWxlY3Rpb24ncyBSYW5nZSBz byB3ZSBjYW4gdXNlIGl0IHRvIGNvbXBhcmUgSGlnaGxpZ2h0cyBsYXRlci4KKworICAgICAgICAo V2ViS2l0OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ6OkhpZ2hsaWdodCk6 CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OkhpZ2hsaWdodDo6 c2V0RERIaWdobGlnaHQpOgorICAgICAgICBGYWN0b3IgdGhlIGNvZGUgdG8gc2V0IHVwIGFuZCBw YWludCB0aGUgaGlnaGxpZ2h0IG91dCwgc28gdGhhdCB3ZSBjYW4KKyAgICAgICAgc2V0IGEgbmV3 IERESGlnaGxpZ2h0UmVmIG9uIGEgSGlnaGxpZ2h0IGFuZCB0aGUgbGF5ZXIgbW92ZXMvcmVzaGFw ZXMvcmVwYWludHMuCisKKyAgICAgICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJvbGxl cjo6YnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNl c092ZXJsYXlDb250cm9sbGVyOjpidWlsZFNlbGVjdGlvbkhpZ2hsaWdodCk6CisgICAgICAgIChX ZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OnJlcGxhY2VIaWdobGlnaHRzT2ZUeXBl UHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRzKToKKyAgICAgICAgRmFjdG9yIHJlcGxhY2VI aWdobGlnaHRzT2ZUeXBlUHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRzIG91dAorICAgICAg ICBzbyB0aGF0IHdlIGNhbiB1c2UgaXQgZm9yIGJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0IGFzIHdl bGwuCisKKyAgICAgICAgU3RlYWwgdGhlIERESGlnaGxpZ2h0UmVmIGZyb20gdGhlIG5ldyBIaWdo bGlnaHQgd2hlbiByZS11c2luZyBhbiBvbGQgb25lCisgICAgICAgIHNvIHRoYXQgdGhlIG5ld2x5 IGNvbXB1dGVkIHJlY3RzIGFyZSB1c2VkIGluc3RlYWQgb2YgdGhlIG9sZCBvbmVzLgorCisgICAg ICAgIChXZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OmhpZ2hsaWdodHNBcmVFcXVp dmFsZW50KToKKyAgICAgICAgV2Ugd2lsbCBhbHdheXMgaGF2ZSBhIFJhbmdlIG5vdywgc28gd2Ug Y2FuIGFsd2F5cyBjaGVjayBlcXVpdmFsZW5jZSB1c2luZyBpdC4KKworICAgICAgICAoV2ViS2l0 OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpkaWRTY3JvbGxGcmFtZSk6CisgICAgICAgIFJl YnVpbGQgYWxsIGhpZ2hsaWdodHMgdXBvbiBzdWJmcmFtZSBzY3JvbGwsIGFzIHRoZXkgbWlnaHQg aGF2ZSBtb3ZlZC4KKyAgICAgICAgV2UgY291bGQgb3B0aW1pemUgdGhpcyBpbiB0aGUgZnV0dXJl LCBidXQgZm9yIG5vdyBpdCdzIGNoZWFwIGVub3VnaAorICAgICAgICBhbmQgcmFyZSBlbm91Z2gg dGhhdCBpdCBkb2Vzbid0IG1hdHRlci4KKwogMjAxNC0wOC0xNCAgRW5yaWNhIENhc3VjY2kgIDxl bnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFtTZXJ2aWNlcyB3aXRoIFVJXSBTZWxlY3Rpb24g c2VydmljZXMgZG9uJ3Qgd29yayBpbnNpZGUgPGlmcmFtZXM+LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAKaW5kZXggODIxMmVkMi4uOGQ4 ODFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VP dmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92 ZXJsYXkuY3BwCkBAIC0xNzAsNiArMTcwLDExIEBAIGJvb2wgUGFnZU92ZXJsYXk6Om1vdXNlRXZl bnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKICAgICByZXR1cm4gbV9jbGllbnQt Pm1vdXNlRXZlbnQodGhpcywgbW91c2VFdmVudCk7CiB9CiAKK3ZvaWQgUGFnZU92ZXJsYXk6OmRp ZFNjcm9sbEZyYW1lKEZyYW1lKiBmcmFtZSkKK3sKKyAgICBtX2NsaWVudC0+ZGlkU2Nyb2xsRnJh bWUodGhpcywgZnJhbWUpOworfQorCiBXS1R5cGVSZWYgUGFnZU92ZXJsYXk6OmNvcHlBY2Nlc3Np YmlsaXR5QXR0cmlidXRlVmFsdWUoV0tTdHJpbmdSZWYgYXR0cmlidXRlLCBXS1R5cGVSZWYgcGFy YW1ldGVyKQogewogICAgIHJldHVybiBtX2NsaWVudC0+Y29weUFjY2Vzc2liaWxpdHlBdHRyaWJ1 dGVWYWx1ZSh0aGlzLCBhdHRyaWJ1dGUsIHBhcmFtZXRlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5oCmluZGV4IDgwMjVlZGYuLjMyMjVmMGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zlcmxh eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5o CkBAIC0zNCwxMiArMzQsMTQgQEAKICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CitjbGFzcyBGcmFtZTsKIGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKIGNsYXNz IEdyYXBoaWNzTGF5ZXI7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJGcmFt ZTsKIGNsYXNzIFdlYk1vdXNlRXZlbnQ7CiBjbGFzcyBXZWJQYWdlOwogCkBAIC01NSw2ICs1Nyw3 IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZE1vdmVUb1dlYlBhZ2UoUGFnZU92 ZXJsYXkqLCBXZWJQYWdlKikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZHJhd1JlY3QoUGFn ZU92ZXJsYXkqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiBkaXJ0eVJlY3QpID0gMDsKICAgICAgICAgdmlydHVhbCBib29sIG1vdXNlRXZlbnQoUGFn ZU92ZXJsYXkqLCBjb25zdCBXZWJNb3VzZUV2ZW50JikgPSAwOworICAgICAgICB2aXJ0dWFsIHZv aWQgZGlkU2Nyb2xsRnJhbWUoUGFnZU92ZXJsYXkqLCBXZWJDb3JlOjpGcmFtZSopIHsgfQogCiAg ICAgICAgIHZpcnR1YWwgV0tUeXBlUmVmIGNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWUo UGFnZU92ZXJsYXkqLCBXS1N0cmluZ1JlZiAvKiBhdHRyaWJ1dGUgKi8sIFdLVHlwZVJlZiAvKiBw YXJhbWV0ZXIgKi8pIHsgcmV0dXJuIDA7IH0KICAgICAgICAgdmlydHVhbCBXS0FycmF5UmVmIGNv cHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlTmFtZXMoUGFnZU92ZXJsYXkqLCBib29sIC8qIHBhcmFt ZXRlcml6ZWROYW1lcyAqLykgeyByZXR1cm4gMDsgfQpAQCAtNzQsNiArNzcsNyBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIGRyYXdSZWN0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAgYm9vbCBtb3VzZUV2ZW50KGNvbnN0IFdl Yk1vdXNlRXZlbnQmKTsKKyAgICB2b2lkIGRpZFNjcm9sbEZyYW1lKFdlYkNvcmU6OkZyYW1lKik7 CiAKICAgICBXS1R5cGVSZWYgY29weUFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZShXS1N0cmlu Z1JlZiBhdHRyaWJ1dGUsIFdLVHlwZVJlZiBwYXJhbWV0ZXIpOwogICAgIFdLQXJyYXlSZWYgY29w eUFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVOYW1lcyhib29sIHBhcmFtZXRlcml6ZWROYW1lcyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXlD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheUNvbnRyb2xsZXIuY3BwCmluZGV4IGViNjY2YjkuLjg2NDU3YzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRy b2xsZXIuY3BwCkBAIC0yMTgsNiArMjE4LDcgQEAgdm9pZCBQYWdlT3ZlcmxheUNvbnRyb2xsZXI6 OmRpZFNjcm9sbEZyYW1lKEZyYW1lKiBmcmFtZSkKICAgICBmb3IgKGF1dG8mIG92ZXJsYXlBbmRM YXllciA6IG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzKSB7CiAgICAgICAgIGlmIChvdmVybGF5QW5k TGF5ZXIua2V5LT5vdmVybGF5VHlwZSgpID09IFBhZ2VPdmVybGF5OjpPdmVybGF5VHlwZTo6Vmll dyB8fCAhZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgICAgICBvdmVybGF5QW5kTGF5ZXIu dmFsdWUtPnNldE5lZWRzRGlzcGxheSgpOworICAgICAgICBvdmVybGF5QW5kTGF5ZXIua2V5LT5k aWRTY3JvbGxGcmFtZShmcmFtZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIu aAppbmRleCA0M2I4NmFiLi44ZTcyMzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9TZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyLmgKQEAg LTU5LDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICBjbGFzcyBIaWdobGlnaHQgOiBwdWJsaWMgUmVm Q291bnRlZDxIaWdobGlnaHQ+LCBwcml2YXRlIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDbGllbnQg ewogICAgICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShIaWdobGlnaHQpOwogICAgIHB1YmxpYzoK LSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SGlnaGxpZ2h0PiBjcmVhdGVGb3JTZWxlY3Rpb24o U2VydmljZXNPdmVybGF5Q29udHJvbGxlciYsIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4pOwor ICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIaWdobGlnaHQ+IGNyZWF0ZUZvclNlbGVjdGlvbihT ZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyJiwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiwgUGFz c1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4pOwogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIaWdo bGlnaHQ+IGNyZWF0ZUZvclRlbGVwaG9uZU51bWJlcihTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVy JiwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4p OwogICAgICAgICB+SGlnaGxpZ2h0KCk7CiAKQEAgLTc4LDYgKzc4LDggQEAgcHJpdmF0ZToKICAg ICAgICAgdm9pZCBmYWRlSW4oKTsKICAgICAgICAgdm9pZCBmYWRlT3V0KCk7CiAKKyAgICAgICAg dm9pZCBzZXREREhpZ2hsaWdodChEREhpZ2hsaWdodFJlZik7CisKICAgICBwcml2YXRlOgogICAg ICAgICBleHBsaWNpdCBIaWdobGlnaHQoU2VydmljZXNPdmVybGF5Q29udHJvbGxlciYsIFR5cGUs IFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4sIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+KTsK IApAQCAtMTAyLDEyICsxMDQsMTQgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlkTW92 ZVRvV2ViUGFnZShQYWdlT3ZlcmxheSosIFdlYlBhZ2UqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IHZvaWQgZHJhd1JlY3QoUGFnZU92ZXJsYXkqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg Ym9vbCBtb3VzZUV2ZW50KFBhZ2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdmVudCYpIG92ZXJy aWRlOworICAgIHZpcnR1YWwgdm9pZCBkaWRTY3JvbGxGcmFtZShQYWdlT3ZlcmxheSosIFdlYkNv cmU6OkZyYW1lKikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIGNyZWF0ZU92ZXJsYXlJZk5lZWRlZCgp OwogICAgIHZvaWQgaGFuZGxlQ2xpY2soY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBIaWdobGln aHQmKTsKIAogICAgIHZvaWQgZHJhd0hpZ2hsaWdodChIaWdobGlnaHQmLCBXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQmKTsKIAorICAgIHZvaWQgcmVwbGFjZUhpZ2hsaWdodHNPZlR5cGVQcmVzZXJ2 aW5nRXF1aXZhbGVudEhpZ2hsaWdodHMoSGFzaFNldDxSZWZQdHI8SGlnaGxpZ2h0Pj4mLCBIaWdo bGlnaHQ6OlR5cGUpOwogICAgIHZvaWQgcmVtb3ZlQWxsUG90ZW50aWFsSGlnaGxpZ2h0c09mVHlw ZShIaWdobGlnaHQ6OlR5cGUpOwogICAgIHZvaWQgYnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMo KTsKICAgICB2b2lkIGJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2VzT3ZlcmxheUNvbnRyb2xs ZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXIubW0KaW5kZXggMjU3YmVlZi4uMmQ1OTFiMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNlc092ZXJsYXlDb250cm9s bGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvU2Vydmlj ZXNPdmVybGF5Q29udHJvbGxlci5tbQpAQCAtNzEsOSArNzEsOSBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBhc3NSZWZQdHI8U2VydmljZXNPdmVy bGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0PiBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdo bGlnaHQ6OmNyZWF0ZUZvclNlbGVjdGlvbihTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyJiBjb250 cm9sbGVyLCBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IGRkSGlnaGxpZ2h0KQorUGFzc1JlZlB0 cjxTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ+IFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXI6OkhpZ2hsaWdodDo6Y3JlYXRlRm9yU2VsZWN0aW9uKFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXImIGNvbnRyb2xsZXIsIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4gZGRIaWdobGln aHQsIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdlKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcg SGlnaGxpZ2h0KGNvbnRyb2xsZXIsIFR5cGU6OlNlbGVjdGlvbiwgZGRIaWdobGlnaHQsIG51bGxw dHIpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEhpZ2hsaWdodChjb250cm9sbGVyLCBUeXBl OjpTZWxlY3Rpb24sIGRkSGlnaGxpZ2h0LCByYW5nZSkpOwogfQogCiBQYXNzUmVmUHRyPFNlcnZp Y2VzT3ZlcmxheUNvbnRyb2xsZXI6OkhpZ2hsaWdodD4gU2VydmljZXNPdmVybGF5Q29udHJvbGxl cjo6SGlnaGxpZ2h0OjpjcmVhdGVGb3JUZWxlcGhvbmVOdW1iZXIoU2VydmljZXNPdmVybGF5Q29u dHJvbGxlciYgY29udHJvbGxlciwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiBkZEhpZ2hsaWdo dCwgUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2UpCkBAIC04MiwyMiArODIsMTggQEAgUGFzc1JlZlB0 cjxTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ+IFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXI6OkhpZ2gKIH0KIAogU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0 OjpIaWdobGlnaHQoU2VydmljZXNPdmVybGF5Q29udHJvbGxlciYgY29udHJvbGxlciwgVHlwZSB0 eXBlLCBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IGRkSGlnaGxpZ2h0LCBQYXNzUmVmUHRyPFdl YkNvcmU6OlJhbmdlPiByYW5nZSkKLSAgICA6IG1fZGRIaWdobGlnaHQoZGRIaWdobGlnaHQpCi0g ICAgLCBtX3JhbmdlKHJhbmdlKQorICAgIDogbV9yYW5nZShyYW5nZSkKICAgICAsIG1fdHlwZSh0 eXBlKQogICAgICwgbV9jb250cm9sbGVyKCZjb250cm9sbGVyKQogewotICAgIEFTU0VSVChtX2Rk SGlnaGxpZ2h0KTsKLSAgICBBU1NFUlQodHlwZSAhPSBUeXBlOjpUZWxlcGhvbmVOdW1iZXIgfHwg bV9yYW5nZSk7CisgICAgQVNTRVJUKGRkSGlnaGxpZ2h0KTsKKyAgICBBU1NFUlQocmFuZ2UpOwog CiAgICAgRHJhd2luZ0FyZWEqIGRyYXdpbmdBcmVhID0gY29udHJvbGxlci53ZWJQYWdlKCkuZHJh d2luZ0FyZWEoKTsKICAgICBtX2dyYXBoaWNzTGF5ZXIgPSBHcmFwaGljc0xheWVyOjpjcmVhdGUo ZHJhd2luZ0FyZWEgPyBkcmF3aW5nQXJlYS0+Z3JhcGhpY3NMYXllckZhY3RvcnkoKSA6IG51bGxw dHIsICp0aGlzKTsKICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldERyYXdzQ29udGVudCh0cnVlKTsK LSAgICBtX2dyYXBoaWNzTGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOwogCi0gICAgQ0dSZWN0IGhp Z2hsaWdodEJvdW5kaW5nUmVjdCA9IERESGlnaGxpZ2h0R2V0Qm91bmRpbmdSZWN0KGRkSGlnaGxp Z2h0LmdldCgpKTsKLSAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQo aGlnaGxpZ2h0Qm91bmRpbmdSZWN0Lm9yaWdpbikpOwotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0 U2l6ZShGbG9hdFNpemUoaGlnaGxpZ2h0Qm91bmRpbmdSZWN0LnNpemUpKTsKKyAgICBzZXREREhp Z2hsaWdodChkZEhpZ2hsaWdodC5nZXQoKSk7CiAKICAgICAvLyBTZXQgZGlyZWN0bHkgb24gdGhl IFBsYXRmb3JtQ0FMYXllciBzbyB0aGF0IHdoZW4gd2UgbGVhdmUgdGhlICdmcm9tJyB2YWx1ZSBp bXBsaWNpdAogICAgIC8vIGluIG91ciBhbmltYXRpb25zLCB3ZSBnZXQgdGhlIHJpZ2h0IGluaXRp YWwgdmFsdWUgcmVnYXJkbGVzcyBvZiBmbHVzaCB0aW1pbmcuCkBAIC0xMTIsNiArMTA4LDIzIEBA IFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OkhpZ2hsaWdodDo6fkhpZ2hsaWdodCgpCiAgICAg ICAgIG1fY29udHJvbGxlci0+d2lsbERlc3Ryb3lIaWdobGlnaHQodGhpcyk7CiB9CiAKK3ZvaWQg U2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0OjpzZXREREhpZ2hsaWdodChEREhp Z2hsaWdodFJlZiBoaWdobGlnaHQpCit7CisgICAgaWYgKCFtX2NvbnRyb2xsZXIpCisgICAgICAg IHJldHVybjsKKworICAgIG1fZGRIaWdobGlnaHQgPSBoaWdobGlnaHQ7CisKKyAgICBpZiAoIW1f ZGRIaWdobGlnaHQpCisgICAgICAgIHJldHVybjsKKworICAgIENHUmVjdCBoaWdobGlnaHRCb3Vu ZGluZ1JlY3QgPSBEREhpZ2hsaWdodEdldEJvdW5kaW5nUmVjdChtX2RkSGlnaGxpZ2h0LmdldCgp KTsKKyAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBvc2l0aW9uKEZsb2F0UG9pbnQoaGlnaGxpZ2h0 Qm91bmRpbmdSZWN0Lm9yaWdpbikpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0U2l6ZShGbG9h dFNpemUoaGlnaGxpZ2h0Qm91bmRpbmdSZWN0LnNpemUpKTsKKworICAgIG1fZ3JhcGhpY3NMYXll ci0+c2V0TmVlZHNEaXNwbGF5KCk7Cit9CisKIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxl cjo6SGlnaGxpZ2h0OjppbnZhbGlkYXRlKCkKIHsKICAgICBsYXllcigpLT5yZW1vdmVGcm9tUGFy ZW50KCk7CkBAIC00ODYsMzQgKzQ5OSwxNCBAQCB2b2lkIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xs ZXI6OmJ1aWxkUGhvbmVOdW1iZXJIaWdobGlnaHRzKCkKICAgICAgICAgfQogICAgIH0KIAotICAg IC8vIElmIGFueSBvbGQgSGlnaGxpZ2h0cyBhcmUgZXF1aXZhbGVudCAoYnkgUmFuZ2UpIHRvIGEg bmV3IEhpZ2hsaWdodCwgcmV1c2UgdGhlIG9sZAotICAgIC8vIG9uZSBzbyB0aGF0IGFueSBtZXRh ZGF0YSBpcyByZXRhaW5lZC4KLSAgICBIYXNoU2V0PFJlZlB0cjxIaWdobGlnaHQ+PiByZXVzZWRQ b3RlbnRpYWxIaWdobGlnaHRzOwotCi0gICAgZm9yIChhdXRvJiBvbGRIaWdobGlnaHQgOiBtX3Bv dGVudGlhbEhpZ2hsaWdodHMpIHsKLSAgICAgICAgaWYgKG9sZEhpZ2hsaWdodC0+dHlwZSgpICE9 IEhpZ2hsaWdodDo6VHlwZTo6VGVsZXBob25lTnVtYmVyKQotICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgZm9yIChhdXRvJiBuZXdIaWdobGlnaHQgOiBuZXdQb3RlbnRpYWxIaWdobGln aHRzKSB7Ci0gICAgICAgICAgICBpZiAoaGlnaGxpZ2h0c0FyZUVxdWl2YWxlbnQob2xkSGlnaGxp Z2h0LmdldCgpLCBuZXdIaWdobGlnaHQuZ2V0KCkpKSB7Ci0gICAgICAgICAgICAgICAgcmV1c2Vk UG90ZW50aWFsSGlnaGxpZ2h0cy5hZGQob2xkSGlnaGxpZ2h0KTsKLSAgICAgICAgICAgICAgICBu ZXdQb3RlbnRpYWxIaWdobGlnaHRzLnJlbW92ZShuZXdIaWdobGlnaHQpOwotICAgICAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmVtb3Zl QWxsUG90ZW50aWFsSGlnaGxpZ2h0c09mVHlwZShIaWdobGlnaHQ6OlR5cGU6OlRlbGVwaG9uZU51 bWJlcik7Ci0KLSAgICBtX3BvdGVudGlhbEhpZ2hsaWdodHMuYWRkKG5ld1BvdGVudGlhbEhpZ2hs aWdodHMuYmVnaW4oKSwgbmV3UG90ZW50aWFsSGlnaGxpZ2h0cy5lbmQoKSk7Ci0gICAgbV9wb3Rl bnRpYWxIaWdobGlnaHRzLmFkZChyZXVzZWRQb3RlbnRpYWxIaWdobGlnaHRzLmJlZ2luKCksIHJl dXNlZFBvdGVudGlhbEhpZ2hsaWdodHMuZW5kKCkpOworICAgIHJlcGxhY2VIaWdobGlnaHRzT2ZU eXBlUHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRzKG5ld1BvdGVudGlhbEhpZ2hsaWdodHMs IEhpZ2hsaWdodDo6VHlwZTo6VGVsZXBob25lTnVtYmVyKTsKIAogICAgIGRpZFJlYnVpbGRQb3Rl bnRpYWxIaWdobGlnaHRzKCk7CiB9CiAKIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6 YnVpbGRTZWxlY3Rpb25IaWdobGlnaHQoKQogewotICAgIHJlbW92ZUFsbFBvdGVudGlhbEhpZ2hs aWdodHNPZlR5cGUoSGlnaGxpZ2h0OjpUeXBlOjpTZWxlY3Rpb24pOworICAgIEhhc2hTZXQ8UmVm UHRyPEhpZ2hsaWdodD4+IG5ld1BvdGVudGlhbEhpZ2hsaWdodHM7CiAKICAgICBWZWN0b3I8Q0dS ZWN0PiBjZ1JlY3RzOwogICAgIGNnUmVjdHMucmVzZXJ2ZUNhcGFjaXR5KG1fY3VycmVudFNlbGVj dGlvblJlY3RzLnNpemUoKSk7CkBAIC01MzQsMTMgKzUyNyw0MyBAQCB2b2lkIFNlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXI6OmJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0KCkKICAgICAgICAgICAgIENH UmVjdCB2aXNpYmxlUmVjdCA9IG1fd2ViUGFnZS5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS52aWV3 KCktPnZpc2libGVDb250ZW50UmVjdCgpOwogICAgICAgICAgICAgUmV0YWluUHRyPERESGlnaGxp Z2h0UmVmPiBkZEhpZ2hsaWdodCA9IGFkb3B0Q0YoRERIaWdobGlnaHRDcmVhdGVXaXRoUmVjdHNJ blZpc2libGVSZWN0V2l0aFN0eWxlQW5kRGlyZWN0aW9uKG51bGxwdHIsIGNnUmVjdHMuYmVnaW4o KSwgY2dSZWN0cy5zaXplKCksIHZpc2libGVSZWN0LCBEREhpZ2hsaWdodE5vT3V0bGluZVdpdGhB cnJvdywgWUVTLCBOU1dyaXRpbmdEaXJlY3Rpb25OYXR1cmFsLCBOTywgWUVTKSk7CiAgICAgICAg ICAgICAKLSAgICAgICAgICAgIG1fcG90ZW50aWFsSGlnaGxpZ2h0cy5hZGQoSGlnaGxpZ2h0Ojpj cmVhdGVGb3JTZWxlY3Rpb24oKnRoaXMsIGRkSGlnaGxpZ2h0KSk7CisgICAgICAgICAgICBuZXdQ b3RlbnRpYWxIaWdobGlnaHRzLmFkZChIaWdobGlnaHQ6OmNyZWF0ZUZvclNlbGVjdGlvbigqdGhp cywgZGRIaWdobGlnaHQsIHNlbGVjdGlvblJhbmdlKSk7CiAgICAgICAgIH0KICAgICB9CiAKKyAg ICByZXBsYWNlSGlnaGxpZ2h0c09mVHlwZVByZXNlcnZpbmdFcXVpdmFsZW50SGlnaGxpZ2h0cyhu ZXdQb3RlbnRpYWxIaWdobGlnaHRzLCBIaWdobGlnaHQ6OlR5cGU6OlNlbGVjdGlvbik7CisKICAg ICBkaWRSZWJ1aWxkUG90ZW50aWFsSGlnaGxpZ2h0cygpOwogfQogCit2b2lkIFNlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXI6OnJlcGxhY2VIaWdobGlnaHRzT2ZUeXBlUHJlc2VydmluZ0VxdWl2YWxl bnRIaWdobGlnaHRzKEhhc2hTZXQ8UmVmUHRyPEhpZ2hsaWdodD4+JiBuZXdQb3RlbnRpYWxIaWdo bGlnaHRzLCBIaWdobGlnaHQ6OlR5cGUgdHlwZSkKK3sKKyAgICAvLyBJZiBhbnkgb2xkIEhpZ2hs aWdodHMgYXJlIGVxdWl2YWxlbnQgKGJ5IFJhbmdlKSB0byBhIG5ldyBIaWdobGlnaHQsIHJldXNl IHRoZSBvbGQKKyAgICAvLyBvbmUgc28gdGhhdCBhbnkgbWV0YWRhdGEgaXMgcmV0YWluZWQuCisg ICAgSGFzaFNldDxSZWZQdHI8SGlnaGxpZ2h0Pj4gcmV1c2VkUG90ZW50aWFsSGlnaGxpZ2h0czsK KworICAgIGZvciAoYXV0byYgb2xkSGlnaGxpZ2h0IDogbV9wb3RlbnRpYWxIaWdobGlnaHRzKSB7 CisgICAgICAgIGlmIChvbGRIaWdobGlnaHQtPnR5cGUoKSAhPSB0eXBlKQorICAgICAgICAgICAg Y29udGludWU7CisKKyAgICAgICAgZm9yIChhdXRvJiBuZXdIaWdobGlnaHQgOiBuZXdQb3RlbnRp YWxIaWdobGlnaHRzKSB7CisgICAgICAgICAgICBpZiAoaGlnaGxpZ2h0c0FyZUVxdWl2YWxlbnQo b2xkSGlnaGxpZ2h0LmdldCgpLCBuZXdIaWdobGlnaHQuZ2V0KCkpKSB7CisgICAgICAgICAgICAg ICAgb2xkSGlnaGxpZ2h0LT5zZXREREhpZ2hsaWdodChuZXdIaWdobGlnaHQtPmRkSGlnaGxpZ2h0 KCkpOworCisgICAgICAgICAgICAgICAgcmV1c2VkUG90ZW50aWFsSGlnaGxpZ2h0cy5hZGQob2xk SGlnaGxpZ2h0KTsKKyAgICAgICAgICAgICAgICBuZXdQb3RlbnRpYWxIaWdobGlnaHRzLnJlbW92 ZShuZXdIaWdobGlnaHQpOworCisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZW1vdmVBbGxQb3RlbnRpYWxIaWdobGlnaHRzT2ZU eXBlKHR5cGUpOworCisgICAgbV9wb3RlbnRpYWxIaWdobGlnaHRzLmFkZChuZXdQb3RlbnRpYWxI aWdobGlnaHRzLmJlZ2luKCksIG5ld1BvdGVudGlhbEhpZ2hsaWdodHMuZW5kKCkpOworICAgIG1f cG90ZW50aWFsSGlnaGxpZ2h0cy5hZGQocmV1c2VkUG90ZW50aWFsSGlnaGxpZ2h0cy5iZWdpbigp LCByZXVzZWRQb3RlbnRpYWxIaWdobGlnaHRzLmVuZCgpKTsKK30KKwogYm9vbCBTZXJ2aWNlc092 ZXJsYXlDb250cm9sbGVyOjpoYXNSZWxldmFudFNlbGVjdGlvblNlcnZpY2VzKCkKIHsKICAgICBy ZXR1cm4gKG1faXNUZXh0T25seSAmJiBXZWJQcm9jZXNzOjpzaGFyZWQoKS5oYXNTZWxlY3Rpb25T ZXJ2aWNlcygpKSB8fCBXZWJQcm9jZXNzOjpzaGFyZWQoKS5oYXNSaWNoQ29udGVudFNlcnZpY2Vz KCk7CkBAIC01OTAsNyArNjEzLDcgQEAgYm9vbCBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpo aWdobGlnaHRzQXJlRXF1aXZhbGVudChjb25zdCBIaWdobGlnaHQqIGEsIGNvbnMKICAgICBpZiAo IWEgfHwgIWIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmIChhLT50eXBlKCkgPT0g SGlnaGxpZ2h0OjpUeXBlOjpUZWxlcGhvbmVOdW1iZXIgJiYgYi0+dHlwZSgpID09IEhpZ2hsaWdo dDo6VHlwZTo6VGVsZXBob25lTnVtYmVyICYmIGFyZVJhbmdlc0VxdWFsKGEtPnJhbmdlKCksIGIt PnJhbmdlKCkpKQorICAgIGlmIChhcmVSYW5nZXNFcXVhbChhLT5yYW5nZSgpLCBiLT5yYW5nZSgp KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICByZXR1cm4gZmFsc2U7CkBAIC03NDAsNiAr NzYzLDE4IEBAIGJvb2wgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6bW91c2VFdmVudChQYWdl T3ZlcmxheSosIGNvbnN0IFdlYk1vdXNlRXZlbnQmIGV2CiAgICAgcmV0dXJuIGZhbHNlOwogfQog Cit2b2lkIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OmRpZFNjcm9sbEZyYW1lKFBhZ2VPdmVy bGF5KiwgRnJhbWUqIGZyYW1lKQoreworICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgYnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMoKTsKKyAgICBi dWlsZFNlbGVjdGlvbkhpZ2hsaWdodCgpOworCisgICAgYm9vbCBtb3VzZUlzT3ZlckFjdGl2ZUhp Z2hsaWdodEJ1dHRvbjsKKyAgICBkZXRlcm1pbmVBY3RpdmVIaWdobGlnaHQobW91c2VJc092ZXJB Y3RpdmVIaWdobGlnaHRCdXR0b24pOworfQorCiB2b2lkIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xs ZXI6OmhhbmRsZUNsaWNrKGNvbnN0IEludFBvaW50JiBjbGlja1BvaW50LCBIaWdobGlnaHQmIGhp Z2hsaWdodCkKIHsKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fd2ViUGFnZS5tYWluRnJh bWVWaWV3KCk7Cg== 236633 2014-08-14 15:49:30 -0700 2014-08-15 11:46:36 -0700 patch iframe.diff text/plain 15003 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3ZjcxYTJhLi43NmIzOGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDYg QEAKKzIwMTQtMDgtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgU2VydmljZSBvdmVybGF5cyBzdGF5IGZpeGVkIHdoZW4gPGlmcmFtZT4gc2Nyb2xs cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTU5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzk1NzcxNj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5OjpkaWRTY3JvbGxGcmFtZSk6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5Lmg6CisgICAgICAgIChX ZWJLaXQ6OlBhZ2VPdmVybGF5OjpDbGllbnQ6OmRpZFNjcm9sbEZyYW1lKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXlDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdl YktpdDo6UGFnZU92ZXJsYXlDb250cm9sbGVyOjpkaWRTY3JvbGxGcmFtZSk6CisgICAgICAgIFB1 c2ggZGlkU2Nyb2xsRnJhbWUgZG93biB0byB0aGUgb3ZlcmxheXMuCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9tYWMvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5tbToKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0OjpjcmVhdGVG b3JTZWxlY3Rpb24pOgorICAgICAgICBIb2xkIG9uIHRvIHRoZSBzZWxlY3Rpb24ncyBSYW5nZSBz byB3ZSBjYW4gdXNlIGl0IHRvIGNvbXBhcmUgSGlnaGxpZ2h0cyBsYXRlci4KKworICAgICAgICAo V2ViS2l0OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ6OkhpZ2hsaWdodCk6 CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OkhpZ2hsaWdodDo6 c2V0RERIaWdobGlnaHQpOgorICAgICAgICBGYWN0b3IgdGhlIGNvZGUgdG8gc2V0IHVwIGFuZCBw YWludCB0aGUgaGlnaGxpZ2h0IG91dCwgc28gdGhhdCB3ZSBjYW4KKyAgICAgICAgc2V0IGEgbmV3 IERESGlnaGxpZ2h0UmVmIG9uIGEgSGlnaGxpZ2h0IGFuZCB0aGUgbGF5ZXIgbW92ZXMvcmVzaGFw ZXMvcmVwYWludHMuCisKKyAgICAgICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJvbGxl cjo6YnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNl c092ZXJsYXlDb250cm9sbGVyOjpidWlsZFNlbGVjdGlvbkhpZ2hsaWdodCk6CisgICAgICAgIChX ZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OnJlcGxhY2VIaWdobGlnaHRzT2ZUeXBl UHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRzKToKKyAgICAgICAgRmFjdG9yIHJlcGxhY2VI aWdobGlnaHRzT2ZUeXBlUHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRzIG91dAorICAgICAg ICBzbyB0aGF0IHdlIGNhbiB1c2UgaXQgZm9yIGJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0IGFzIHdl bGwuCisKKyAgICAgICAgU3RlYWwgdGhlIERESGlnaGxpZ2h0UmVmIGZyb20gdGhlIG5ldyBIaWdo bGlnaHQgd2hlbiByZS11c2luZyBhbiBvbGQgb25lCisgICAgICAgIHNvIHRoYXQgdGhlIG5ld2x5 IGNvbXB1dGVkIHJlY3RzIGFyZSB1c2VkIGluc3RlYWQgb2YgdGhlIG9sZCBvbmVzLgorCisgICAg ICAgIChXZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6OmhpZ2hsaWdodHNBcmVFcXVp dmFsZW50KToKKyAgICAgICAgV2Ugd2lsbCBhbHdheXMgaGF2ZSBhIFJhbmdlIG5vdywgc28gd2Ug Y2FuIGFsd2F5cyBjaGVjayBlcXVpdmFsZW5jZSB1c2luZyBpdC4KKworICAgICAgICAoV2ViS2l0 OjpTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpkaWRTY3JvbGxGcmFtZSk6CisgICAgICAgIFJl YnVpbGQgYWxsIGhpZ2hsaWdodHMgdXBvbiBzdWJmcmFtZSBzY3JvbGwsIGFzIHRoZXkgbWlnaHQg aGF2ZSBtb3ZlZC4KKyAgICAgICAgV2UgY291bGQgb3B0aW1pemUgdGhpcyBpbiB0aGUgZnV0dXJl LCBidXQgZm9yIG5vdyBpdCdzIGNoZWFwIGVub3VnaAorICAgICAgICBhbmQgcmFyZSBlbm91Z2gg dGhhdCBpdCBkb2Vzbid0IG1hdHRlci4KKwogMjAxNC0wOC0xNCAgRW5yaWNhIENhc3VjY2kgIDxl bnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFtTZXJ2aWNlcyB3aXRoIFVJXSBTZWxlY3Rpb24g c2VydmljZXMgZG9uJ3Qgd29yayBpbnNpZGUgPGlmcmFtZXM+LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAKaW5kZXggODIxMmVkMi4uOGQ4 ODFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VP dmVybGF5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92 ZXJsYXkuY3BwCkBAIC0xNzAsNiArMTcwLDExIEBAIGJvb2wgUGFnZU92ZXJsYXk6Om1vdXNlRXZl bnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKICAgICByZXR1cm4gbV9jbGllbnQt Pm1vdXNlRXZlbnQodGhpcywgbW91c2VFdmVudCk7CiB9CiAKK3ZvaWQgUGFnZU92ZXJsYXk6OmRp ZFNjcm9sbEZyYW1lKEZyYW1lKiBmcmFtZSkKK3sKKyAgICBtX2NsaWVudC0+ZGlkU2Nyb2xsRnJh bWUodGhpcywgZnJhbWUpOworfQorCiBXS1R5cGVSZWYgUGFnZU92ZXJsYXk6OmNvcHlBY2Nlc3Np YmlsaXR5QXR0cmlidXRlVmFsdWUoV0tTdHJpbmdSZWYgYXR0cmlidXRlLCBXS1R5cGVSZWYgcGFy YW1ldGVyKQogewogICAgIHJldHVybiBtX2NsaWVudC0+Y29weUFjY2Vzc2liaWxpdHlBdHRyaWJ1 dGVWYWx1ZSh0aGlzLCBhdHRyaWJ1dGUsIHBhcmFtZXRlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5oCmluZGV4IDgwMjVlZGYuLjMyMjVmMGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zlcmxh eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5o CkBAIC0zNCwxMiArMzQsMTQgQEAKICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CitjbGFzcyBGcmFtZTsKIGNsYXNzIEdyYXBoaWNzQ29udGV4dDsKIGNsYXNz IEdyYXBoaWNzTGF5ZXI7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCitjbGFzcyBXZWJGcmFt ZTsKIGNsYXNzIFdlYk1vdXNlRXZlbnQ7CiBjbGFzcyBXZWJQYWdlOwogCkBAIC01NSw2ICs1Nyw3 IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZE1vdmVUb1dlYlBhZ2UoUGFnZU92 ZXJsYXkqLCBXZWJQYWdlKikgPSAwOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZHJhd1JlY3QoUGFn ZU92ZXJsYXkqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBjb25zdCBXZWJDb3JlOjpJbnRS ZWN0JiBkaXJ0eVJlY3QpID0gMDsKICAgICAgICAgdmlydHVhbCBib29sIG1vdXNlRXZlbnQoUGFn ZU92ZXJsYXkqLCBjb25zdCBXZWJNb3VzZUV2ZW50JikgPSAwOworICAgICAgICB2aXJ0dWFsIHZv aWQgZGlkU2Nyb2xsRnJhbWUoUGFnZU92ZXJsYXkqLCBXZWJDb3JlOjpGcmFtZSopIHsgfQogCiAg ICAgICAgIHZpcnR1YWwgV0tUeXBlUmVmIGNvcHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWUo UGFnZU92ZXJsYXkqLCBXS1N0cmluZ1JlZiAvKiBhdHRyaWJ1dGUgKi8sIFdLVHlwZVJlZiAvKiBw YXJhbWV0ZXIgKi8pIHsgcmV0dXJuIDA7IH0KICAgICAgICAgdmlydHVhbCBXS0FycmF5UmVmIGNv cHlBY2Nlc3NpYmlsaXR5QXR0cmlidXRlTmFtZXMoUGFnZU92ZXJsYXkqLCBib29sIC8qIHBhcmFt ZXRlcml6ZWROYW1lcyAqLykgeyByZXR1cm4gMDsgfQpAQCAtNzQsNiArNzcsNyBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIGRyYXdSZWN0KFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAgYm9vbCBtb3VzZUV2ZW50KGNvbnN0IFdl Yk1vdXNlRXZlbnQmKTsKKyAgICB2b2lkIGRpZFNjcm9sbEZyYW1lKFdlYkNvcmU6OkZyYW1lKik7 CiAKICAgICBXS1R5cGVSZWYgY29weUFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZShXS1N0cmlu Z1JlZiBhdHRyaWJ1dGUsIFdLVHlwZVJlZiBwYXJhbWV0ZXIpOwogICAgIFdLQXJyYXlSZWYgY29w eUFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVOYW1lcyhib29sIHBhcmFtZXRlcml6ZWROYW1lcyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXlD b250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3Zl cmxheUNvbnRyb2xsZXIuY3BwCmluZGV4IGViNjY2YjkuLjg2NDU3YzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRyb2xsZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheUNvbnRy b2xsZXIuY3BwCkBAIC0yMTgsNiArMjE4LDcgQEAgdm9pZCBQYWdlT3ZlcmxheUNvbnRyb2xsZXI6 OmRpZFNjcm9sbEZyYW1lKEZyYW1lKiBmcmFtZSkKICAgICBmb3IgKGF1dG8mIG92ZXJsYXlBbmRM YXllciA6IG1fb3ZlcmxheUdyYXBoaWNzTGF5ZXJzKSB7CiAgICAgICAgIGlmIChvdmVybGF5QW5k TGF5ZXIua2V5LT5vdmVybGF5VHlwZSgpID09IFBhZ2VPdmVybGF5OjpPdmVybGF5VHlwZTo6Vmll dyB8fCAhZnJhbWUtPmlzTWFpbkZyYW1lKCkpCiAgICAgICAgICAgICBvdmVybGF5QW5kTGF5ZXIu dmFsdWUtPnNldE5lZWRzRGlzcGxheSgpOworICAgICAgICBvdmVybGF5QW5kTGF5ZXIua2V5LT5k aWRTY3JvbGxGcmFtZShmcmFtZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIu aAppbmRleCA0M2I4NmFiLi44ZTcyMzVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9TZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyLmgKQEAg LTU5LDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICBjbGFzcyBIaWdobGlnaHQgOiBwdWJsaWMgUmVm Q291bnRlZDxIaWdobGlnaHQ+LCBwcml2YXRlIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDbGllbnQg ewogICAgICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShIaWdobGlnaHQpOwogICAgIHB1YmxpYzoK LSAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8SGlnaGxpZ2h0PiBjcmVhdGVGb3JTZWxlY3Rpb24o U2VydmljZXNPdmVybGF5Q29udHJvbGxlciYsIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4pOwor ICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIaWdobGlnaHQ+IGNyZWF0ZUZvclNlbGVjdGlvbihT ZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyJiwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiwgUGFz c1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4pOwogICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIaWdo bGlnaHQ+IGNyZWF0ZUZvclRlbGVwaG9uZU51bWJlcihTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVy JiwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiwgUGFzc1JlZlB0cjxXZWJDb3JlOjpSYW5nZT4p OwogICAgICAgICB+SGlnaGxpZ2h0KCk7CiAKQEAgLTc4LDYgKzc4LDggQEAgcHJpdmF0ZToKICAg ICAgICAgdm9pZCBmYWRlSW4oKTsKICAgICAgICAgdm9pZCBmYWRlT3V0KCk7CiAKKyAgICAgICAg dm9pZCBzZXREREhpZ2hsaWdodChEREhpZ2hsaWdodFJlZik7CisKICAgICBwcml2YXRlOgogICAg ICAgICBleHBsaWNpdCBIaWdobGlnaHQoU2VydmljZXNPdmVybGF5Q29udHJvbGxlciYsIFR5cGUs IFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4sIFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+KTsK IApAQCAtMTAyLDEyICsxMDQsMTQgQEAgcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgZGlkTW92 ZVRvV2ViUGFnZShQYWdlT3ZlcmxheSosIFdlYlBhZ2UqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFs IHZvaWQgZHJhd1JlY3QoUGFnZU92ZXJsYXkqLCBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmLCBj b25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg Ym9vbCBtb3VzZUV2ZW50KFBhZ2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdmVudCYpIG92ZXJy aWRlOworICAgIHZpcnR1YWwgdm9pZCBkaWRTY3JvbGxGcmFtZShQYWdlT3ZlcmxheSosIFdlYkNv cmU6OkZyYW1lKikgb3ZlcnJpZGU7CiAKICAgICB2b2lkIGNyZWF0ZU92ZXJsYXlJZk5lZWRlZCgp OwogICAgIHZvaWQgaGFuZGxlQ2xpY2soY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmLCBIaWdobGln aHQmKTsKIAogICAgIHZvaWQgZHJhd0hpZ2hsaWdodChIaWdobGlnaHQmLCBXZWJDb3JlOjpHcmFw aGljc0NvbnRleHQmKTsKIAorICAgIHZvaWQgcmVwbGFjZUhpZ2hsaWdodHNPZlR5cGVQcmVzZXJ2 aW5nRXF1aXZhbGVudEhpZ2hsaWdodHMoSGFzaFNldDxSZWZQdHI8SGlnaGxpZ2h0Pj4mLCBIaWdo bGlnaHQ6OlR5cGUpOwogICAgIHZvaWQgcmVtb3ZlQWxsUG90ZW50aWFsSGlnaGxpZ2h0c09mVHlw ZShIaWdobGlnaHQ6OlR5cGUpOwogICAgIHZvaWQgYnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMo KTsKICAgICB2b2lkIGJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2VzT3ZlcmxheUNvbnRyb2xs ZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXIubW0KaW5kZXggMjU3YmVlZi4uZTdkYzFmMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNlc092ZXJsYXlDb250cm9s bGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvU2Vydmlj ZXNPdmVybGF5Q29udHJvbGxlci5tbQpAQCAtNzEsOSArNzEsOSBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBhc3NSZWZQdHI8U2VydmljZXNPdmVy bGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0PiBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdo bGlnaHQ6OmNyZWF0ZUZvclNlbGVjdGlvbihTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyJiBjb250 cm9sbGVyLCBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IGRkSGlnaGxpZ2h0KQorUGFzc1JlZlB0 cjxTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ+IFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXI6OkhpZ2hsaWdodDo6Y3JlYXRlRm9yU2VsZWN0aW9uKFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXImIGNvbnRyb2xsZXIsIFJldGFpblB0cjxEREhpZ2hsaWdodFJlZj4gZGRIaWdobGln aHQsIFBhc3NSZWZQdHI8UmFuZ2U+IHJhbmdlKQogewotICAgIHJldHVybiBhZG9wdFJlZihuZXcg SGlnaGxpZ2h0KGNvbnRyb2xsZXIsIFR5cGU6OlNlbGVjdGlvbiwgZGRIaWdobGlnaHQsIG51bGxw dHIpKTsKKyAgICByZXR1cm4gYWRvcHRSZWYobmV3IEhpZ2hsaWdodChjb250cm9sbGVyLCBUeXBl OjpTZWxlY3Rpb24sIGRkSGlnaGxpZ2h0LCByYW5nZSkpOwogfQogCiBQYXNzUmVmUHRyPFNlcnZp Y2VzT3ZlcmxheUNvbnRyb2xsZXI6OkhpZ2hsaWdodD4gU2VydmljZXNPdmVybGF5Q29udHJvbGxl cjo6SGlnaGxpZ2h0OjpjcmVhdGVGb3JUZWxlcGhvbmVOdW1iZXIoU2VydmljZXNPdmVybGF5Q29u dHJvbGxlciYgY29udHJvbGxlciwgUmV0YWluUHRyPERESGlnaGxpZ2h0UmVmPiBkZEhpZ2hsaWdo dCwgUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2UpCkBAIC04MiwyMiArODIsMTggQEAgUGFzc1JlZlB0 cjxTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ+IFNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXI6OkhpZ2gKIH0KIAogU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0 OjpIaWdobGlnaHQoU2VydmljZXNPdmVybGF5Q29udHJvbGxlciYgY29udHJvbGxlciwgVHlwZSB0 eXBlLCBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IGRkSGlnaGxpZ2h0LCBQYXNzUmVmUHRyPFdl YkNvcmU6OlJhbmdlPiByYW5nZSkKLSAgICA6IG1fZGRIaWdobGlnaHQoZGRIaWdobGlnaHQpCi0g ICAgLCBtX3JhbmdlKHJhbmdlKQorICAgIDogbV9yYW5nZShyYW5nZSkKICAgICAsIG1fdHlwZSh0 eXBlKQogICAgICwgbV9jb250cm9sbGVyKCZjb250cm9sbGVyKQogewotICAgIEFTU0VSVChtX2Rk SGlnaGxpZ2h0KTsKLSAgICBBU1NFUlQodHlwZSAhPSBUeXBlOjpUZWxlcGhvbmVOdW1iZXIgfHwg bV9yYW5nZSk7CisgICAgQVNTRVJUKGRkSGlnaGxpZ2h0KTsKKyAgICBBU1NFUlQobV9yYW5nZSk7 CiAKICAgICBEcmF3aW5nQXJlYSogZHJhd2luZ0FyZWEgPSBjb250cm9sbGVyLndlYlBhZ2UoKS5k cmF3aW5nQXJlYSgpOwogICAgIG1fZ3JhcGhpY3NMYXllciA9IEdyYXBoaWNzTGF5ZXI6OmNyZWF0 ZShkcmF3aW5nQXJlYSA/IGRyYXdpbmdBcmVhLT5ncmFwaGljc0xheWVyRmFjdG9yeSgpIDogbnVs bHB0ciwgKnRoaXMpOwogICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0RHJhd3NDb250ZW50KHRydWUp OwotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0TmVlZHNEaXNwbGF5KCk7CiAKLSAgICBDR1JlY3Qg aGlnaGxpZ2h0Qm91bmRpbmdSZWN0ID0gRERIaWdobGlnaHRHZXRCb3VuZGluZ1JlY3QoZGRIaWdo bGlnaHQuZ2V0KCkpOwotICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0UG9zaXRpb24oRmxvYXRQb2lu dChoaWdobGlnaHRCb3VuZGluZ1JlY3Qub3JpZ2luKSk7Ci0gICAgbV9ncmFwaGljc0xheWVyLT5z ZXRTaXplKEZsb2F0U2l6ZShoaWdobGlnaHRCb3VuZGluZ1JlY3Quc2l6ZSkpOworICAgIHNldERE SGlnaGxpZ2h0KGRkSGlnaGxpZ2h0LmdldCgpKTsKIAogICAgIC8vIFNldCBkaXJlY3RseSBvbiB0 aGUgUGxhdGZvcm1DQUxheWVyIHNvIHRoYXQgd2hlbiB3ZSBsZWF2ZSB0aGUgJ2Zyb20nIHZhbHVl IGltcGxpY2l0CiAgICAgLy8gaW4gb3VyIGFuaW1hdGlvbnMsIHdlIGdldCB0aGUgcmlnaHQgaW5p dGlhbCB2YWx1ZSByZWdhcmRsZXNzIG9mIGZsdXNoIHRpbWluZy4KQEAgLTExMiw2ICsxMDgsMjMg QEAgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6SGlnaGxpZ2h0Ojp+SGlnaGxpZ2h0KCkKICAg ICAgICAgbV9jb250cm9sbGVyLT53aWxsRGVzdHJveUhpZ2hsaWdodCh0aGlzKTsKIH0KIAordm9p ZCBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpIaWdobGlnaHQ6OnNldERESGlnaGxpZ2h0KERE SGlnaGxpZ2h0UmVmIGhpZ2hsaWdodCkKK3sKKyAgICBpZiAoIW1fY29udHJvbGxlcikKKyAgICAg ICAgcmV0dXJuOworCisgICAgbV9kZEhpZ2hsaWdodCA9IGhpZ2hsaWdodDsKKworICAgIGlmICgh bV9kZEhpZ2hsaWdodCkKKyAgICAgICAgcmV0dXJuOworCisgICAgQ0dSZWN0IGhpZ2hsaWdodEJv dW5kaW5nUmVjdCA9IERESGlnaGxpZ2h0R2V0Qm91bmRpbmdSZWN0KG1fZGRIaWdobGlnaHQuZ2V0 KCkpOworICAgIG1fZ3JhcGhpY3NMYXllci0+c2V0UG9zaXRpb24oRmxvYXRQb2ludChoaWdobGln aHRCb3VuZGluZ1JlY3Qub3JpZ2luKSk7CisgICAgbV9ncmFwaGljc0xheWVyLT5zZXRTaXplKEZs b2F0U2l6ZShoaWdobGlnaHRCb3VuZGluZ1JlY3Quc2l6ZSkpOworCisgICAgbV9ncmFwaGljc0xh eWVyLT5zZXROZWVkc0Rpc3BsYXkoKTsKK30KKwogdm9pZCBTZXJ2aWNlc092ZXJsYXlDb250cm9s bGVyOjpIaWdobGlnaHQ6OmludmFsaWRhdGUoKQogewogICAgIGxheWVyKCktPnJlbW92ZUZyb21Q YXJlbnQoKTsKQEAgLTQ4NiwzNCArNDk5LDE0IEBAIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJv bGxlcjo6YnVpbGRQaG9uZU51bWJlckhpZ2hsaWdodHMoKQogICAgICAgICB9CiAgICAgfQogCi0g ICAgLy8gSWYgYW55IG9sZCBIaWdobGlnaHRzIGFyZSBlcXVpdmFsZW50IChieSBSYW5nZSkgdG8g YSBuZXcgSGlnaGxpZ2h0LCByZXVzZSB0aGUgb2xkCi0gICAgLy8gb25lIHNvIHRoYXQgYW55IG1l dGFkYXRhIGlzIHJldGFpbmVkLgotICAgIEhhc2hTZXQ8UmVmUHRyPEhpZ2hsaWdodD4+IHJldXNl ZFBvdGVudGlhbEhpZ2hsaWdodHM7Ci0KLSAgICBmb3IgKGF1dG8mIG9sZEhpZ2hsaWdodCA6IG1f cG90ZW50aWFsSGlnaGxpZ2h0cykgewotICAgICAgICBpZiAob2xkSGlnaGxpZ2h0LT50eXBlKCkg IT0gSGlnaGxpZ2h0OjpUeXBlOjpUZWxlcGhvbmVOdW1iZXIpCi0gICAgICAgICAgICBjb250aW51 ZTsKLQotICAgICAgICBmb3IgKGF1dG8mIG5ld0hpZ2hsaWdodCA6IG5ld1BvdGVudGlhbEhpZ2hs aWdodHMpIHsKLSAgICAgICAgICAgIGlmIChoaWdobGlnaHRzQXJlRXF1aXZhbGVudChvbGRIaWdo bGlnaHQuZ2V0KCksIG5ld0hpZ2hsaWdodC5nZXQoKSkpIHsKLSAgICAgICAgICAgICAgICByZXVz ZWRQb3RlbnRpYWxIaWdobGlnaHRzLmFkZChvbGRIaWdobGlnaHQpOwotICAgICAgICAgICAgICAg IG5ld1BvdGVudGlhbEhpZ2hsaWdodHMucmVtb3ZlKG5ld0hpZ2hsaWdodCk7Ci0gICAgICAgICAg ICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICByZW1v dmVBbGxQb3RlbnRpYWxIaWdobGlnaHRzT2ZUeXBlKEhpZ2hsaWdodDo6VHlwZTo6VGVsZXBob25l TnVtYmVyKTsKLQotICAgIG1fcG90ZW50aWFsSGlnaGxpZ2h0cy5hZGQobmV3UG90ZW50aWFsSGln aGxpZ2h0cy5iZWdpbigpLCBuZXdQb3RlbnRpYWxIaWdobGlnaHRzLmVuZCgpKTsKLSAgICBtX3Bv dGVudGlhbEhpZ2hsaWdodHMuYWRkKHJldXNlZFBvdGVudGlhbEhpZ2hsaWdodHMuYmVnaW4oKSwg cmV1c2VkUG90ZW50aWFsSGlnaGxpZ2h0cy5lbmQoKSk7CisgICAgcmVwbGFjZUhpZ2hsaWdodHNP ZlR5cGVQcmVzZXJ2aW5nRXF1aXZhbGVudEhpZ2hsaWdodHMobmV3UG90ZW50aWFsSGlnaGxpZ2h0 cywgSGlnaGxpZ2h0OjpUeXBlOjpUZWxlcGhvbmVOdW1iZXIpOwogCiAgICAgZGlkUmVidWlsZFBv dGVudGlhbEhpZ2hsaWdodHMoKTsKIH0KIAogdm9pZCBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVy OjpidWlsZFNlbGVjdGlvbkhpZ2hsaWdodCgpCiB7Ci0gICAgcmVtb3ZlQWxsUG90ZW50aWFsSGln aGxpZ2h0c09mVHlwZShIaWdobGlnaHQ6OlR5cGU6OlNlbGVjdGlvbik7CisgICAgSGFzaFNldDxS ZWZQdHI8SGlnaGxpZ2h0Pj4gbmV3UG90ZW50aWFsSGlnaGxpZ2h0czsKIAogICAgIFZlY3RvcjxD R1JlY3Q+IGNnUmVjdHM7CiAgICAgY2dSZWN0cy5yZXNlcnZlQ2FwYWNpdHkobV9jdXJyZW50U2Vs ZWN0aW9uUmVjdHMuc2l6ZSgpKTsKQEAgLTUzNCwxMyArNTI3LDQzIEBAIHZvaWQgU2VydmljZXNP dmVybGF5Q29udHJvbGxlcjo6YnVpbGRTZWxlY3Rpb25IaWdobGlnaHQoKQogICAgICAgICAgICAg Q0dSZWN0IHZpc2libGVSZWN0ID0gbV93ZWJQYWdlLmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnZp ZXcoKS0+dmlzaWJsZUNvbnRlbnRSZWN0KCk7CiAgICAgICAgICAgICBSZXRhaW5QdHI8RERIaWdo bGlnaHRSZWY+IGRkSGlnaGxpZ2h0ID0gYWRvcHRDRihEREhpZ2hsaWdodENyZWF0ZVdpdGhSZWN0 c0luVmlzaWJsZVJlY3RXaXRoU3R5bGVBbmREaXJlY3Rpb24obnVsbHB0ciwgY2dSZWN0cy5iZWdp bigpLCBjZ1JlY3RzLnNpemUoKSwgdmlzaWJsZVJlY3QsIERESGlnaGxpZ2h0Tm9PdXRsaW5lV2l0 aEFycm93LCBZRVMsIE5TV3JpdGluZ0RpcmVjdGlvbk5hdHVyYWwsIE5PLCBZRVMpKTsKICAgICAg ICAgICAgIAotICAgICAgICAgICAgbV9wb3RlbnRpYWxIaWdobGlnaHRzLmFkZChIaWdobGlnaHQ6 OmNyZWF0ZUZvclNlbGVjdGlvbigqdGhpcywgZGRIaWdobGlnaHQpKTsKKyAgICAgICAgICAgIG5l d1BvdGVudGlhbEhpZ2hsaWdodHMuYWRkKEhpZ2hsaWdodDo6Y3JlYXRlRm9yU2VsZWN0aW9uKCp0 aGlzLCBkZEhpZ2hsaWdodCwgc2VsZWN0aW9uUmFuZ2UpKTsKICAgICAgICAgfQogICAgIH0KIAor ICAgIHJlcGxhY2VIaWdobGlnaHRzT2ZUeXBlUHJlc2VydmluZ0VxdWl2YWxlbnRIaWdobGlnaHRz KG5ld1BvdGVudGlhbEhpZ2hsaWdodHMsIEhpZ2hsaWdodDo6VHlwZTo6U2VsZWN0aW9uKTsKKwog ICAgIGRpZFJlYnVpbGRQb3RlbnRpYWxIaWdobGlnaHRzKCk7CiB9CiAKK3ZvaWQgU2VydmljZXNP dmVybGF5Q29udHJvbGxlcjo6cmVwbGFjZUhpZ2hsaWdodHNPZlR5cGVQcmVzZXJ2aW5nRXF1aXZh bGVudEhpZ2hsaWdodHMoSGFzaFNldDxSZWZQdHI8SGlnaGxpZ2h0Pj4mIG5ld1BvdGVudGlhbEhp Z2hsaWdodHMsIEhpZ2hsaWdodDo6VHlwZSB0eXBlKQoreworICAgIC8vIElmIGFueSBvbGQgSGln aGxpZ2h0cyBhcmUgZXF1aXZhbGVudCAoYnkgUmFuZ2UpIHRvIGEgbmV3IEhpZ2hsaWdodCwgcmV1 c2UgdGhlIG9sZAorICAgIC8vIG9uZSBzbyB0aGF0IGFueSBtZXRhZGF0YSBpcyByZXRhaW5lZC4K KyAgICBIYXNoU2V0PFJlZlB0cjxIaWdobGlnaHQ+PiByZXVzZWRQb3RlbnRpYWxIaWdobGlnaHRz OworCisgICAgZm9yIChhdXRvJiBvbGRIaWdobGlnaHQgOiBtX3BvdGVudGlhbEhpZ2hsaWdodHMp IHsKKyAgICAgICAgaWYgKG9sZEhpZ2hsaWdodC0+dHlwZSgpICE9IHR5cGUpCisgICAgICAgICAg ICBjb250aW51ZTsKKworICAgICAgICBmb3IgKGF1dG8mIG5ld0hpZ2hsaWdodCA6IG5ld1BvdGVu dGlhbEhpZ2hsaWdodHMpIHsKKyAgICAgICAgICAgIGlmIChoaWdobGlnaHRzQXJlRXF1aXZhbGVu dChvbGRIaWdobGlnaHQuZ2V0KCksIG5ld0hpZ2hsaWdodC5nZXQoKSkpIHsKKyAgICAgICAgICAg ICAgICBvbGRIaWdobGlnaHQtPnNldERESGlnaGxpZ2h0KG5ld0hpZ2hsaWdodC0+ZGRIaWdobGln aHQoKSk7CisKKyAgICAgICAgICAgICAgICByZXVzZWRQb3RlbnRpYWxIaWdobGlnaHRzLmFkZChv bGRIaWdobGlnaHQpOworICAgICAgICAgICAgICAgIG5ld1BvdGVudGlhbEhpZ2hsaWdodHMucmVt b3ZlKG5ld0hpZ2hsaWdodCk7CisKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAg IH0KKyAgICAgICAgfQorICAgIH0KKworICAgIHJlbW92ZUFsbFBvdGVudGlhbEhpZ2hsaWdodHNP ZlR5cGUodHlwZSk7CisKKyAgICBtX3BvdGVudGlhbEhpZ2hsaWdodHMuYWRkKG5ld1BvdGVudGlh bEhpZ2hsaWdodHMuYmVnaW4oKSwgbmV3UG90ZW50aWFsSGlnaGxpZ2h0cy5lbmQoKSk7CisgICAg bV9wb3RlbnRpYWxIaWdobGlnaHRzLmFkZChyZXVzZWRQb3RlbnRpYWxIaWdobGlnaHRzLmJlZ2lu KCksIHJldXNlZFBvdGVudGlhbEhpZ2hsaWdodHMuZW5kKCkpOworfQorCiBib29sIFNlcnZpY2Vz T3ZlcmxheUNvbnRyb2xsZXI6Omhhc1JlbGV2YW50U2VsZWN0aW9uU2VydmljZXMoKQogewogICAg IHJldHVybiAobV9pc1RleHRPbmx5ICYmIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmhhc1NlbGVjdGlv blNlcnZpY2VzKCkpIHx8IFdlYlByb2Nlc3M6OnNoYXJlZCgpLmhhc1JpY2hDb250ZW50U2Vydmlj ZXMoKTsKQEAgLTU5MCw3ICs2MTMsNyBAQCBib29sIFNlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXI6 OmhpZ2hsaWdodHNBcmVFcXVpdmFsZW50KGNvbnN0IEhpZ2hsaWdodCogYSwgY29ucwogICAgIGlm ICghYSB8fCAhYikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKGEtPnR5cGUoKSA9 PSBIaWdobGlnaHQ6OlR5cGU6OlRlbGVwaG9uZU51bWJlciAmJiBiLT50eXBlKCkgPT0gSGlnaGxp Z2h0OjpUeXBlOjpUZWxlcGhvbmVOdW1iZXIgJiYgYXJlUmFuZ2VzRXF1YWwoYS0+cmFuZ2UoKSwg Yi0+cmFuZ2UoKSkpCisgICAgaWYgKGFyZVJhbmdlc0VxdWFsKGEtPnJhbmdlKCksIGItPnJhbmdl KCkpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxzZTsKQEAgLTc0MCw2 ICs3NjMsMTggQEAgYm9vbCBTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjptb3VzZUV2ZW50KFBh Z2VPdmVybGF5KiwgY29uc3QgV2ViTW91c2VFdmVudCYgZXYKICAgICByZXR1cm4gZmFsc2U7CiB9 CiAKK3ZvaWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6ZGlkU2Nyb2xsRnJhbWUoUGFnZU92 ZXJsYXkqLCBGcmFtZSogZnJhbWUpCit7CisgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQor ICAgICAgICByZXR1cm47CisKKyAgICBidWlsZFBob25lTnVtYmVySGlnaGxpZ2h0cygpOworICAg IGJ1aWxkU2VsZWN0aW9uSGlnaGxpZ2h0KCk7CisKKyAgICBib29sIG1vdXNlSXNPdmVyQWN0aXZl SGlnaGxpZ2h0QnV0dG9uOworICAgIGRldGVybWluZUFjdGl2ZUhpZ2hsaWdodChtb3VzZUlzT3Zl ckFjdGl2ZUhpZ2hsaWdodEJ1dHRvbik7Cit9CisKIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJv bGxlcjo6aGFuZGxlQ2xpY2soY29uc3QgSW50UG9pbnQmIGNsaWNrUG9pbnQsIEhpZ2hsaWdodCYg aGlnaGxpZ2h0KQogewogICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gbV93ZWJQYWdlLm1haW5G cmFtZVZpZXcoKTsK 236664 2014-08-15 12:05:39 -0700 2014-08-15 12:08:17 -0700 tiny followup fix.diff text/plain 1427 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBkNjliNWEwLi44NGM5ZTY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDgtMTUgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgU2VydmljZSBvdmVybGF5cyBzdGF5IGZpeGVkIHdoZW4gPGlmcmFtZT4gc2Nyb2xs cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1OTU5 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzk1NzcxNj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvU2Vy dmljZXNPdmVybGF5Q29udHJvbGxlci5tbToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZXNPdmVy bGF5Q29udHJvbGxlcjo6aGlnaGxpZ2h0c0FyZUVxdWl2YWxlbnQpOgorICAgICAgICBUaW55IGNv cnJlY3RuZXNzIGZpeDsgaGlnaGxpZ2h0cyBjYW4gb25seSBiZSBlcXVpdmFsZW50IGlmIHRoZWly CisgICAgICAgIHR5cGVzIGFyZSBlcXVpdmFsZW50IGFzIHdlbGwuCisKIDIwMTQtMDgtMTUgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIGRlLVBM QVRGT1JNKENPQ09BKSBhIGNvdXBsZSBvZiBtZXRob2RzIGluIHBsdWdpbiBjb2RlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2VzT3Zlcmxh eUNvbnRyb2xsZXIubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Nl cnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIubW0KaW5kZXggZTdkYzFmMy4uY2RiZmY1OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNlc092ZXJs YXlDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9t YWMvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5tbQpAQCAtNjEzLDcgKzYxMyw3IEBAIGJvb2wg U2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6aGlnaGxpZ2h0c0FyZUVxdWl2YWxlbnQoY29uc3Qg SGlnaGxpZ2h0KiBhLCBjb25zCiAgICAgaWYgKCFhIHx8ICFiKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBpZiAoYXJlUmFuZ2VzRXF1YWwoYS0+cmFuZ2UoKSwgYi0+cmFuZ2UoKSkpCisg ICAgaWYgKGEtPnR5cGUoKSA9PSBiLT50eXBlKCkgJiYgYXJlUmFuZ2VzRXF1YWwoYS0+cmFuZ2Uo KSwgYi0+cmFuZ2UoKSkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZhbHNl Owo=