147028 2015-07-16 19:19:34 -0700 iOS TextIndicators include text that is not supposed to be indicated 2015-07-17 11:26:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca commit-queue esprehn+autocc glenn kondapallykalyan sam simon.fraser oldest_to_newest 1110056 0 thorton 2015-07-16 19:19:34 -0700 iOS TextIndicators include text that is not supposed to be indicated 1110058 1 256949 thorton 2015-07-16 19:21:16 -0700 Created attachment 256949 Patch 1110122 2 256969 thorton 2015-07-17 05:25:55 -0700 Created attachment 256969 Patch 1110161 3 thorton 2015-07-17 11:26:22 -0700 http://trac.webkit.org/changeset/186956 256949 2015-07-16 19:21:16 -0700 2015-07-17 05:25:51 -0700 Patch bug-147028-20150716192006.patch text/plain 11470 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWE5ZGZjMDFkNmM1NzQw OTlkNWMwOGIyY2Q5ZWY0MGVhZjdhMTQxMS4uYjM0NmIxYTJkOTg0ODMzZDU1NGE1MmJiMzBhOGQ1 YzExZjY0Y2M4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQzIEBACiAyMDE1LTA3LTE2ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCisgICAgICAgIGlPUyBUZXh0SW5k aWNhdG9ycyBpbmNsdWRlIHRleHQgdGhhdCBpcyBub3Qgc3VwcG9zZWQgdG8gYmUgaW5kaWNhdGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMjgK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNjQzMDk0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhaW50IHRoZSBzZWxlY3Rpb24gYW5kIGJhY2tn cm91bmQsIGJ1dCBub3Qgb3RoZXIgZm9yZWdyb3VuZHMsIGZvciBpT1MgVGV4dEluZGljYXRvcnMu CisKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZVNlbGVjdGlvbjo6dXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQpOgorICAgICAgICBBZGQg YSBjb3JyZXNwb25kaW5nIGdldHRlci4KKworICAgICAgICAqIHBhZ2UvRnJhbWVTbmFwc2hvdHRp bmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c25hcHNob3RGcmFtZVJlY3QpOgorICAgICAgICAq IHBhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaDoKKyAgICAgICAgQWRkIGEgbmV3IHNuYXBzaG90IG9w dGlvbiB3aGVyZSB3ZSdsbCBwYWludCBiYWNrZ3JvdW5kcyBhbmQgdGhlIHNlbGVjdGVkCisgICAg ICAgIGZvcmVncm91bmQgYW5kIG5vdGhpbmcgZWxzZS4KKyAgICAgICAgUGFzcyB0aGUgbmV3IHNu YXBzaG90IG9wdGlvbiB0aHJvdWdoIGFzIGEgcGFpbnQgYmVoYXZpb3IuCisKKyAgICAgICAgKiBw YWdlL1RleHRJbmRpY2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dEluZGljYXRvcjo6 Y3JlYXRlV2l0aFJhbmdlKToKKyAgICAgICAgSW1wbGVtZW50IHRoZSBpbmNhbnRhdGlvbnMgbmVj ZXNzYXJ5IHRvIG1ha2UgYSB0ZW1wb3Jhcnkgc2VsZWN0aW9uCisgICAgICAgIGNoYW5nZSBub3Qg Z2V0IHNlbnQgdG8gdGhlIFVJIHByb2Nlc3MgYW5kIGFjdHVhbGx5IGhhdmUgV2ViQ29yZSBrbm93 IGFib3V0IGl0CisgICAgICAgIGFuZCBhY2N1cmF0ZWx5IHJlc3BvbmQgdG8gcXVlc3Rpb25zIGFi b3V0IGl0LgorCisgICAgICAgIChXZWJDb3JlOjpUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoU2Vs ZWN0aW9uSW5GcmFtZSk6CisgICAgICAgIFBhaW50IHNlbGVjdGlvbiBhbmQgYmFja2dyb3VuZHMg b24gaU9TLgorCisgICAgICAgICogcmVuZGVyaW5nL1BhaW50UGhhc2UuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OnBhaW50TGF5ZXJDb250ZW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6c2VsZWN0aW9uQ29sb3IpOgor ICAgICAgICBBZGQgYSBuZXcgcGFpbnQgYmVoYXZpb3IsIFNlbGVjdGlvbkFuZEJhY2tncm91bmRz T25seSwgd2hpY2ggYmVoYXZlcworICAgICAgICB0aGUgc2FtZSBhcyBzZWxlY3Rpb24gb25seSBl eGNlcHQgaXQgYWxsb3dzIGJhY2tncm91bmRzIHRvIHBhaW50LgorCisyMDE1LTA3LTE2ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCBzaHJpbmst d3JhcHBlZCBsaW5rIGhpZ2hsaWdodHMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NzAyMQogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjE2NDMwOTQ+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggODk4MmY0YTZlNzhhOWFkMzkwMTkwOTViM2FlNzM0NmNiMTJmMmQyMy4u Y2ZiMjM3ZjFhNjg4ODA0MmNkNzIxOWYxZWQ2MTAzNzE4MDVjYmFjMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDE2IEBACiAyMDE1LTA3LTE2ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgogCisgICAgICAgIGlPUyBUZXh0SW5kaWNhdG9ycyBpbmNsdWRlIHRleHQgdGhhdCBp cyBub3Qgc3VwcG9zZWQgdG8gYmUgaW5kaWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIx NjQzMDk0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQ bHVnaW5WaWV3OjpzaG91bGRDcmVhdGVUcmFuc2llbnRQYWludGluZ1NuYXBzaG90KToKKworMjAx NS0wNy0xNiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAg ICBBZGQgc2hyaW5rLXdyYXBwZWQgbGluayBoaWdobGlnaHRzCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMjEKICAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzIxNjQzMDk0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNl bGVjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oCmluZGV4 IDMxMGE3NGFhYjlkMmY1MWRmYTcxYmQxYWQ5NjYzNDgzN2I2MTI1YzAuLjFkODMxZjM2NGI1YWE4 ZDdhN2IwODI0MThjNGZmOTUxOTY4YmQ5YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRnJhbWVTZWxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1l U2VsZWN0aW9uLmgKQEAgLTIzNiw2ICsyMzYsNyBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBzZXRDYXJldENvbG9yKGNvbnN0IENvbG9yJik7CiAgICAgV0VCQ09SRV9FWFBPUlQg c3RhdGljIFZpc2libGVTZWxlY3Rpb24gd29yZFNlbGVjdGlvbkNvbnRhaW5pbmdDYXJldFNlbGVj dGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uJik7CiAgICAgdm9pZCBzZXRVcGRhdGVBcHBlYXJh bmNlRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV91cGRhdGVBcHBlYXJhbmNlRW5hYmxlZCA9IGVu YWJsZWQ7IH0KKyAgICBib29sIHVwZGF0ZUFwcGVhcmFuY2VFbmFibGVkKCkgY29uc3QgeyByZXR1 cm4gbV91cGRhdGVBcHBlYXJhbmNlRW5hYmxlZDsgfQogICAgIHZvaWQgc3VwcHJlc3NTY3JvbGxp bmcoKSB7ICsrbV9zY3JvbGxpbmdTdXBwcmVzc0NvdW50OyB9CiAgICAgdm9pZCByZXN0b3JlU2Ny b2xsaW5nKCkKICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25h cHNob3R0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3Bw CmluZGV4IDQ3NzNmZmI1OGM5YzRkYjU5YmJkNjUxZTFiMDQ1OTQ5NDA0YTcwYWUuLjBjMzA4ZGE4 MTUwYTZhNmZiYjdmZjI0OTExY2RhNDg0OTUxNTI0MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVTbmFwc2hvdHRpbmcuY3BwCkBAIC04Nyw2ICs4Nyw4IEBAIHN0ZDo6dW5pcXVlX3B0cjxJ bWFnZUJ1ZmZlcj4gc25hcHNob3RGcmFtZVJlY3QoRnJhbWUmIGZyYW1lLCBjb25zdCBJbnRSZWN0 JiBpbWFnCiAgICAgICAgIHBhaW50QmVoYXZpb3IgfD0gUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tU ZXh0OwogICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRpb25zUGFpbnRTZWxlY3Rpb25Pbmx5 KQogICAgICAgICBwYWludEJlaGF2aW9yIHw9IFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5Owor ICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRpb25zUGFpbnRTZWxlY3Rpb25BbmRCYWNrZ3Jv dW5kc09ubHkpCisgICAgICAgIHBhaW50QmVoYXZpb3IgfD0gUGFpbnRCZWhhdmlvclNlbGVjdGlv bkFuZEJhY2tncm91bmRzT25seTsKIAogICAgIC8vIE90aGVyIHBhaW50IGJlaGF2aW9ycyBhcmUg c2V0IGJ5IHBhaW50Q29udGVudHNGb3JTbmFwc2hvdC4KICAgICBmcmFtZS52aWV3KCktPnNldFBh aW50QmVoYXZpb3IocGFpbnRCZWhhdmlvcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0ZyYW1lU25hcHNob3R0aW5nLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNo b3R0aW5nLmgKaW5kZXggN2QzMjMwYzJkYzYyMjJiZTVmNGM4MjM3ZTgwNGJhZjM4MDcwOTkzZi4u NmYyZDE1ZTk1MzgyNTQ1Y2M3MjBiZTY4N2VjNjlmZDVjZGEwOGE5YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNuYXBzaG90dGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaApAQCAtNDUsNiArNDUsNyBAQCBlbnVtIHsKICAgICBT bmFwc2hvdE9wdGlvbnNQYWludFNlbGVjdGlvbk9ubHkgPSAxIDw8IDEsCiAgICAgU25hcHNob3RP cHRpb25zSW5WaWV3Q29vcmRpbmF0ZXMgPSAxIDw8IDIsCiAgICAgU25hcHNob3RPcHRpb25zRm9y Y2VCbGFja1RleHQgPSAxIDw8IDMsCisgICAgU25hcHNob3RPcHRpb25zUGFpbnRTZWxlY3Rpb25B bmRCYWNrZ3JvdW5kc09ubHkgPSAxIDw8IDQsCiB9OwogdHlwZWRlZiB1bnNpZ25lZCBTbmFwc2hv dE9wdGlvbnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCmluZGV4IDkzYmNm ZGY5YjQ3NGQyNjZjYzNlYjNkMjUwNzAzMDQzMmFjN2YyMWMuLmJjODYyNTZjYzcxM2MwNTI4Yjc1 MDhmNDFmYjQzNDlhMmEyMzRjYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4 dEluZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNw cApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIlRleHRJbmRpY2F0b3IuaCIKIAogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiRWRpdG9yLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIK ICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgogI2luY2x1ZGUgIkZyYW1lU25hcHNob3R0aW5n LmgiCkBAIC01NCw2ICs1NSwxMiBAQCBSZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRv cjo6Y3JlYXRlV2l0aFJhbmdlKGNvbnN0IFJhbmdlJiByYW5nZSwgVGV4dEluZAogICAgIGlmICgh ZnJhbWUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisgICAgYm9vbCBvbGRJZ25vcmVDb21w b3NpdGlvblNlbGVjdGlvbkNoYW5nZSA9IGZyYW1lLT5lZGl0b3IoKS5pZ25vcmVDb21wb3NpdGlv blNlbGVjdGlvbkNoYW5nZSgpOworICAgIGJvb2wgb2xkVXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQg PSBmcmFtZS0+c2VsZWN0aW9uKCkudXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQoKTsKKworICAgIGZy YW1lLT5lZGl0b3IoKS5zZXRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlvbkNoYW5nZSh0cnVlKTsK KyAgICBmcmFtZS0+c2VsZWN0aW9uKCkuc2V0VXBkYXRlQXBwZWFyYW5jZUVuYWJsZWQodHJ1ZSk7 CisKICAgICBWaXNpYmxlU2VsZWN0aW9uIG9sZFNlbGVjdGlvbiA9IGZyYW1lLT5zZWxlY3Rpb24o KS5zZWxlY3Rpb24oKTsKICAgICBmcmFtZS0+c2VsZWN0aW9uKCkuc2V0U2VsZWN0aW9uKHJhbmdl KTsKIApAQCAtNjMsNyArNzAsMTAgQEAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0 b3I6OmNyZWF0ZVdpdGhSYW5nZShjb25zdCBSYW5nZSYgcmFuZ2UsIFRleHRJbmQKIAogICAgIGlm IChpbmRpY2F0b3IpCiAgICAgICAgIGluZGljYXRvci0+c2V0V2FudHNNYXJnaW4oIWFyZVJhbmdl c0VxdWFsKCZyYW5nZSwgb2xkU2VsZWN0aW9uLnRvTm9ybWFsaXplZFJhbmdlKCkuZ2V0KCkpKTsK LSAgICAKKworICAgIGZyYW1lLT5lZGl0b3IoKS5zZXRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlv bkNoYW5nZShvbGRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlvbkNoYW5nZSk7CisgICAgZnJhbWUt PnNlbGVjdGlvbigpLnNldFVwZGF0ZUFwcGVhcmFuY2VFbmFibGVkKG9sZFVwZGF0ZUFwcGVhcmFu Y2VFbmFibGVkKTsKKwogICAgIHJldHVybiBpbmRpY2F0b3IucmVsZWFzZSgpOwogfQogCkBAIC0x MjAsNyArMTMwLDcgQEAgUmVmUHRyPFRleHRJbmRpY2F0b3I+IFRleHRJbmRpY2F0b3I6OmNyZWF0 ZVdpdGhTZWxlY3Rpb25JbkZyYW1lKEZyYW1lJiBmcmFtZSwgVGUKIAogICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgaGF2ZSBUZXh0SW5kaWNhdG9yIG9wdGlvbnMgaW5zdGVhZCBvZiB0aGlzIGJlaW5n IHBsYXRmb3JtLXNwZWNpZmljLgogI2lmIFBMQVRGT1JNKElPUykKLSAgICBTbmFwc2hvdE9wdGlv bnMgc25hcHNob3RPcHRpb25zID0gU25hcHNob3RPcHRpb25zTm9uZTsKKyAgICBTbmFwc2hvdE9w dGlvbnMgc25hcHNob3RPcHRpb25zID0gU25hcHNob3RPcHRpb25zUGFpbnRTZWxlY3Rpb25BbmRC YWNrZ3JvdW5kc09ubHk7CiAjZWxzZQogICAgIFNuYXBzaG90T3B0aW9ucyBzbmFwc2hvdE9wdGlv bnMgPSBTbmFwc2hvdE9wdGlvbnNGb3JjZUJsYWNrVGV4dCB8IFNuYXBzaG90T3B0aW9uc1BhaW50 U2VsZWN0aW9uT25seTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1BhaW50UGhhc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9QYWludFBoYXNlLmgK aW5kZXggYTQ0OGQ5MjJkOThmNzFjODdiOWQ2Mjk2MjMxZWE0ZWE3MDM5ZWY4NS4uZDQ2ZmM0ZWQ0 ZmQyNWY1Y2Q5ZWQ4NmJlNDBlMTE5MzNmMWE5ZDZmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1BhaW50UGhhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UGFpbnRQaGFzZS5oCkBAIC02Miw2ICs2Miw3IEBAIGVudW0gUGFpbnRCZWhhdmlvckZsYWdzIHsK ICAgICBQYWludEJlaGF2aW9yUmVuZGVyaW5nU1ZHTWFzayA9IDEgPDwgNCwKICAgICBQYWludEJl aGF2aW9yU2tpcFJvb3RCYWNrZ3JvdW5kID0gMSA8PCA1LAogICAgIFBhaW50QmVoYXZpb3JSb290 QmFja2dyb3VuZE9ubHkgPSAxIDw8IDYsCisgICAgUGFpbnRCZWhhdmlvclNlbGVjdGlvbkFuZEJh Y2tncm91bmRzT25seSA9IDEgPDwgNywKIH07CiAKIHR5cGVkZWYgdW5zaWduZWQgUGFpbnRCZWhh dmlvcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRleCAx MzJjZGRlMjY1ZmU2MjA4OWQyMzA5ZDk4N2Q3NjBmY2NhOGJmMTUzLi41MGY4YTNlNWM3MWU1YTI1 MzU2ZGFhNGRlOTRmMDJkMjMxYmIwMzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckVsZW1lbnQuY3BwCkBAIC0xNTc1LDcgKzE1NzUsNyBAQCBDb2xvciBSZW5kZXJFbGVtZW50 OjpzZWxlY3Rpb25Db2xvcihpbnQgY29sb3JQcm9wZXJ0eSkgY29uc3QKICAgICAvLyBJZiB0aGUg ZWxlbWVudCBpcyB1bnNlbGVjdGFibGUsIG9yIHdlIGFyZSBvbmx5IHBhaW50aW5nIHRoZSBzZWxl Y3Rpb24sCiAgICAgLy8gZG9uJ3Qgb3ZlcnJpZGUgdGhlIGZvcmVncm91bmQgY29sb3Igd2l0aCB0 aGUgc2VsZWN0aW9uIGZvcmVncm91bmQgY29sb3IuCiAgICAgaWYgKHN0eWxlKCkudXNlclNlbGVj dCgpID09IFNFTEVDVF9OT05FCi0gICAgICAgIHx8ICh2aWV3KCkuZnJhbWVWaWV3KCkucGFpbnRC ZWhhdmlvcigpICYgUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9ubHkpKQorICAgICAgICB8fCAodmll dygpLmZyYW1lVmlldygpLnBhaW50QmVoYXZpb3IoKSAmIChQYWludEJlaGF2aW9yU2VsZWN0aW9u T25seSB8IFBhaW50QmVoYXZpb3JTZWxlY3Rpb25BbmRCYWNrZ3JvdW5kc09ubHkpKSkKICAgICAg ICAgcmV0dXJuIENvbG9yKCk7CiAKICAgICBpZiAoUmVmUHRyPFJlbmRlclN0eWxlPiBwc2V1ZG9T dHlsZSA9IHNlbGVjdGlvblBzZXVkb1N0eWxlKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCmluZGV4IDJkZGJiMDFkYTc5OTgyMWQzYTUxMTlkODVjZWRmM2VhNTkx NGRlM2QuLjlkODIxNmQxNmM4ZTdlOGNkMzNiYWFhOWVkOWIwNTU3ODNkN2FjOTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNDI3NSw3ICs0Mjc1LDggQEAg dm9pZCBSZW5kZXJMYXllcjo6cGFpbnRMYXllckNvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgTGF5ZXJQYWludGkKICAgICBpZiAobG9jYWxQYWludGluZ0luZm8ub3Zlcmxh cFRlc3RSZXF1ZXN0cyAmJiBpc1NlbGZQYWludGluZ0xheWVyKQogICAgICAgICBwZXJmb3JtT3Zl cmxhcFRlc3RzKCpsb2NhbFBhaW50aW5nSW5mby5vdmVybGFwVGVzdFJlcXVlc3RzLCBsb2NhbFBh aW50aW5nSW5mby5yb290TGF5ZXIsIHRoaXMpOwogCi0gICAgYm9vbCBzZWxlY3Rpb25Pbmx5ICA9 IGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yU2VsZWN0aW9u T25seTsKKyAgICBib29sIHNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seSA9IGxvY2FsUGFpbnRp bmdJbmZvLnBhaW50QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yU2VsZWN0aW9uQW5kQmFja2dyb3Vu ZHNPbmx5OworICAgIGJvb2wgc2VsZWN0aW9uT25seSA9IGxvY2FsUGFpbnRpbmdJbmZvLnBhaW50 QmVoYXZpb3IgJiBQYWludEJlaGF2aW9yU2VsZWN0aW9uT25seTsKICAgICAKICAgICBQYWludEJl aGF2aW9yIHBhaW50QmVoYXZpb3IgPSBQYWludEJlaGF2aW9yTm9ybWFsOwogICAgIGlmIChsb2Nh bFBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdTa2lwUm9vdEJhY2tncm91bmQpCkBAIC00 MzE0LDcgKzQzMTUsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMoR3Jh cGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXllclBhaW50aQogICAgIGlmIChpc1BhaW50 aW5nQ29tcG9zaXRlZEZvcmVncm91bmQpIHsKICAgICAgICAgaWYgKHNob3VsZFBhaW50Q29udGVu dCkKICAgICAgICAgICAgIHBhaW50Rm9yZWdyb3VuZEZvckZyYWdtZW50cyhsYXllckZyYWdtZW50 cywgY29udGV4dCwgdHJhbnNwYXJlbmN5TGF5ZXJDb250ZXh0LCBwYWludGluZ0luZm8ucGFpbnRE aXJ0eVJlY3QsIGhhdmVUcmFuc3BhcmVuY3ksCi0gICAgICAgICAgICAgICAgbG9jYWxQYWludGlu Z0luZm8sIHBhaW50QmVoYXZpb3IsIHN1YnRyZWVQYWludFJvb3RGb3JSZW5kZXJlciwgc2VsZWN0 aW9uT25seSk7CisgICAgICAgICAgICAgICAgbG9jYWxQYWludGluZ0luZm8sIHBhaW50QmVoYXZp b3IsIHN1YnRyZWVQYWludFJvb3RGb3JSZW5kZXJlciwgc2VsZWN0aW9uT25seSB8fCBzZWxlY3Rp b25BbmRCYWNrZ3JvdW5kc09ubHkpOwogICAgIH0KIAogICAgIGlmIChzaG91bGRQYWludE91dGxp bmUpCkBAIC00MzQ2LDcgKzQzNDcsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyQ29u dGVudHMoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBMYXllclBhaW50aQogICAgIC8v IE1ha2Ugc3VyZSB0aGF0IHdlIG5vdyB1c2UgdGhlIG9yaWdpbmFsIHRyYW5zcGFyZW5jeSBjb250 ZXh0LgogICAgIEFTU0VSVCh0cmFuc3BhcmVuY3lMYXllckNvbnRleHQgPT0gY29udGV4dCk7CiAK LSAgICBpZiAoc2hvdWxkUGFpbnRDb250ZW50ICYmICFzZWxlY3Rpb25Pbmx5KSB7CisgICAgaWYg KHNob3VsZFBhaW50Q29udGVudCAmJiAhKHNlbGVjdGlvbk9ubHkgfHwgc2VsZWN0aW9uQW5kQmFj a2dyb3VuZHNPbmx5KSkgewogICAgICAgICBpZiAoc2hvdWxkUGFpbnRNYXNrKHBhaW50aW5nSW5m by5wYWludEJlaGF2aW9yLCBsb2NhbFBhaW50RmxhZ3MpKSB7CiAgICAgICAgICAgICAvLyBQYWlu dCB0aGUgbWFzayBmb3IgdGhlIGZyYWdtZW50cy4KICAgICAgICAgICAgIHBhaW50TWFza0ZvckZy YWdtZW50cyhsYXllckZyYWdtZW50cywgY29udGV4dCwgbG9jYWxQYWludGluZ0luZm8sIHN1YnRy ZWVQYWludFJvb3RGb3JSZW5kZXJlcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKaW5kZXggYTE0YTFhNDkwZGViZDY5ZTIwNjM3ZTkyODdi YTVjMmJlMTYzYzQwMy4uMjRkNDJmNDMxYmZmMmIxMjlmZDVmM2QxNWNlZTA5MTY1ODYzNzhmNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNw cApAQCAtMTgyNiw3ICsxODI2LDcgQEAgYm9vbCBQbHVnaW5WaWV3OjpzaG91bGRDcmVhdGVUcmFu c2llbnRQYWludGluZ1NuYXBzaG90KCkgY29uc3QKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgaWYgKEZyYW1lVmlldyogZnJhbWVWaWV3ID0gZnJhbWUoKS0+dmlldygpKSB7Ci0gICAgICAg IGlmIChmcmFtZVZpZXctPnBhaW50QmVoYXZpb3IoKSAmIChQYWludEJlaGF2aW9yU2VsZWN0aW9u T25seSB8IFBhaW50QmVoYXZpb3JGb3JjZUJsYWNrVGV4dCkpIHsKKyAgICAgICAgaWYgKGZyYW1l Vmlldy0+cGFpbnRCZWhhdmlvcigpICYgKFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5IHwgUGFp bnRCZWhhdmlvclNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seSB8IFBhaW50QmVoYXZpb3JGb3Jj ZUJsYWNrVGV4dCkpIHsKICAgICAgICAgICAgIC8vIFRoaXMgcGFpbnQgYmVoYXZpb3IgaXMgdXNl ZCB3aGVuIGRyYXdpbmcgdGhlIGZpbmQgaW5kaWNhdG9yIGFuZCB0aGVyZSdzIG5vIG5lZWQgdG8K ICAgICAgICAgICAgIC8vIHNuYXBzaG90IHBsdWctaW5zLCBiZWNhdXNlIHRoZXkgY2FuIG5ldmVy IGJlIHBhaW50ZWQgYXMgcGFydCBvZiB0aGUgZmluZCBpbmRpY2F0b3IuCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7Cg== 256969 2015-07-17 05:25:55 -0700 2015-07-17 07:26:39 -0700 Patch bug-147028-20150717052445.patch text/plain 10224 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2OTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUyYjFmMzE4ZDc4NmFi MWY4NjkxOGZjZjRmNTFkMzhjY2E0MDVmZi4uNDZmY2UwYzg0OTlhMTJkOTNlOGY1NjM0M2VjNWY0 MTIxOTE5OTI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE1LTA3LTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUyBUZXh0SW5k aWNhdG9ycyBpbmNsdWRlIHRleHQgdGhhdCBpcyBub3Qgc3VwcG9zZWQgdG8gYmUgaW5kaWNhdGVk CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMjgK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIxNjQzMDk0PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhaW50IHRoZSBzZWxlY3Rpb24gYW5kIGJhY2tn cm91bmQsIGJ1dCBub3Qgb3RoZXIgZm9yZWdyb3VuZHMsIGZvciBpT1MgVGV4dEluZGljYXRvcnMu CisKKyAgICAgICAgKiBwYWdlL0ZyYW1lU25hcHNob3R0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnNuYXBzaG90RnJhbWVSZWN0KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lU25hcHNob3R0aW5n Lmg6CisgICAgICAgIEFkZCBhIG5ldyBzbmFwc2hvdCBvcHRpb24gd2hlcmUgd2UnbGwgcGFpbnQg YmFja2dyb3VuZHMgYW5kIHRoZSBzZWxlY3RlZAorICAgICAgICBmb3JlZ3JvdW5kIGFuZCBub3Ro aW5nIGVsc2UuCisgICAgICAgIFBhc3MgdGhlIG5ldyBzbmFwc2hvdCBvcHRpb24gdGhyb3VnaCBh cyBhIHBhaW50IGJlaGF2aW9yLgorCisgICAgICAgICogcGFnZS9UZXh0SW5kaWNhdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlRleHRJbmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZSk6CisgICAg ICAgIEltcGxlbWVudCB0aGUgaW5jYW50YXRpb25zIG5lY2Vzc2FyeSB0byBtYWtlIGEgdGVtcG9y YXJ5IHNlbGVjdGlvbgorICAgICAgICBjaGFuZ2Ugbm90IGdldCBzZW50IHRvIHRoZSBVSSBwcm9j ZXNzIGFuZCBhY3R1YWxseSBoYXZlIFdlYkNvcmUga25vdyBhYm91dCBpdAorICAgICAgICBhbmQg YWNjdXJhdGVseSByZXNwb25kIHRvIHF1ZXN0aW9ucyBhYm91dCBpdC4KKworICAgICAgICAoV2Vi Q29yZTo6VGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUpOgorICAgICAg ICBQYWludCBzZWxlY3Rpb24gYW5kIGJhY2tncm91bmRzIG9uIGlPUy4KKworICAgICAgICAqIHJl bmRlcmluZy9QYWludFBoYXNlLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMpOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckVsZW1lbnQ6OnNlbGVjdGlvbkNvbG9yKToKKyAgICAgICAgQWRkIGEgbmV3IHBhaW50 IGJlaGF2aW9yLCBTZWxlY3Rpb25BbmRCYWNrZ3JvdW5kc09ubHksIHdoaWNoIGJlaGF2ZXMKKyAg ICAgICAgdGhlIHNhbWUgYXMgc2VsZWN0aW9uIG9ubHkgZXhjZXB0IGl0IGFsbG93cyBiYWNrZ3Jv dW5kcyB0byBwYWludC4KKwogMjAxNS0wNy0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQ2xlYW51cCBQYXN0ZWJvYXJkSGVscGVy CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggOTYyMTIyM2YxMWY5NGRjNGI0MDgzMDRjYjQzMTI2OTEzMzkxNmUzMC4u MjUzMDBlYmE2NTFmNWZjMGE5NjJkZTFhNmVkMTcwZjI4OWRkMWY4YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE0IEBACisyMDE1LTA3LTE3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBw bGUuY29tPgorCisgICAgICAgIGlPUyBUZXh0SW5kaWNhdG9ycyBpbmNsdWRlIHRleHQgdGhhdCBp cyBub3Qgc3VwcG9zZWQgdG8gYmUgaW5kaWNhdGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcwMjgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIx NjQzMDk0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpQ bHVnaW5WaWV3OjpzaG91bGRDcmVhdGVUcmFuc2llbnRQYWludGluZ1NuYXBzaG90KToKKwogMjAx NS0wNy0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS10gQ2xlYW51cCBQYXN0ZWJvYXJkSGVscGVyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVTbmFwc2hvdHRpbmcuY3BwCmluZGV4IDQ3NzNmZmI1OGM5YzRkYjU5YmJkNjUxZTFiMDQ1 OTQ5NDA0YTcwYWUuLjBjMzA4ZGE4MTUwYTZhNmZiYjdmZjI0OTExY2RhNDg0OTUxNTI0MWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuY3BwCkBAIC04Nyw2ICs4Nyw4 IEBAIHN0ZDo6dW5pcXVlX3B0cjxJbWFnZUJ1ZmZlcj4gc25hcHNob3RGcmFtZVJlY3QoRnJhbWUm IGZyYW1lLCBjb25zdCBJbnRSZWN0JiBpbWFnCiAgICAgICAgIHBhaW50QmVoYXZpb3IgfD0gUGFp bnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0OwogICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRp b25zUGFpbnRTZWxlY3Rpb25Pbmx5KQogICAgICAgICBwYWludEJlaGF2aW9yIHw9IFBhaW50QmVo YXZpb3JTZWxlY3Rpb25Pbmx5OworICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRpb25zUGFp bnRTZWxlY3Rpb25BbmRCYWNrZ3JvdW5kc09ubHkpCisgICAgICAgIHBhaW50QmVoYXZpb3IgfD0g UGFpbnRCZWhhdmlvclNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seTsKIAogICAgIC8vIE90aGVy IHBhaW50IGJlaGF2aW9ycyBhcmUgc2V0IGJ5IHBhaW50Q29udGVudHNGb3JTbmFwc2hvdC4KICAg ICBmcmFtZS52aWV3KCktPnNldFBhaW50QmVoYXZpb3IocGFpbnRCZWhhdmlvcik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmgKaW5kZXggN2QzMjMwYzJkYzYyMjJiZTVmNGM4 MjM3ZTgwNGJhZjM4MDcwOTkzZi4uNmYyZDE1ZTk1MzgyNTQ1Y2M3MjBiZTY4N2VjNjlmZDVjZGEw OGE5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNuYXBzaG90dGluZy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaApAQCAtNDUsNiAr NDUsNyBAQCBlbnVtIHsKICAgICBTbmFwc2hvdE9wdGlvbnNQYWludFNlbGVjdGlvbk9ubHkgPSAx IDw8IDEsCiAgICAgU25hcHNob3RPcHRpb25zSW5WaWV3Q29vcmRpbmF0ZXMgPSAxIDw8IDIsCiAg ICAgU25hcHNob3RPcHRpb25zRm9yY2VCbGFja1RleHQgPSAxIDw8IDMsCisgICAgU25hcHNob3RP cHRpb25zUGFpbnRTZWxlY3Rpb25BbmRCYWNrZ3JvdW5kc09ubHkgPSAxIDw8IDQsCiB9OwogdHlw ZWRlZiB1bnNpZ25lZCBTbmFwc2hvdE9wdGlvbnM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRp Y2F0b3IuY3BwCmluZGV4IDkzYmNmZGY5YjQ3NGQyNjZjYzNlYjNkMjUwNzAzMDQzMmFjN2YyMWMu Ljc0ZTY0NTM5OWZlNWI2NzY3MDFjOTkwYmJlODE3YjRiZTU5MWM4OGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9UZXh0SW5kaWNhdG9yLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIlRleHRJ bmRpY2F0b3IuaCIKIAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiRWRpdG9yLmgi CiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgogI2luY2x1 ZGUgIkZyYW1lU25hcHNob3R0aW5nLmgiCkBAIC01NCw2ICs1NSwxMSBAQCBSZWZQdHI8VGV4dElu ZGljYXRvcj4gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKGNvbnN0IFJhbmdlJiByYW5n ZSwgVGV4dEluZAogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisj aWYgUExBVEZPUk0oSU9TKQorICAgIGZyYW1lLT5lZGl0b3IoKS5zZXRJZ25vcmVDb21wb3NpdGlv blNlbGVjdGlvbkNoYW5nZSh0cnVlKTsKKyAgICBmcmFtZS0+c2VsZWN0aW9uKCkuc2V0VXBkYXRl QXBwZWFyYW5jZUVuYWJsZWQodHJ1ZSk7CisjZW5kaWYKKwogICAgIFZpc2libGVTZWxlY3Rpb24g b2xkU2VsZWN0aW9uID0gZnJhbWUtPnNlbGVjdGlvbigpLnNlbGVjdGlvbigpOwogICAgIGZyYW1l LT5zZWxlY3Rpb24oKS5zZXRTZWxlY3Rpb24ocmFuZ2UpOwogCkBAIC02Myw3ICs2OSwxMiBAQCBS ZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRvcjo6Y3JlYXRlV2l0aFJhbmdlKGNvbnN0 IFJhbmdlJiByYW5nZSwgVGV4dEluZAogCiAgICAgaWYgKGluZGljYXRvcikKICAgICAgICAgaW5k aWNhdG9yLT5zZXRXYW50c01hcmdpbighYXJlUmFuZ2VzRXF1YWwoJnJhbmdlLCBvbGRTZWxlY3Rp b24udG9Ob3JtYWxpemVkUmFuZ2UoKS5nZXQoKSkpOwotICAgIAorCisjaWYgUExBVEZPUk0oSU9T KQorICAgIGZyYW1lLT5lZGl0b3IoKS5zZXRJZ25vcmVDb21wb3NpdGlvblNlbGVjdGlvbkNoYW5n ZShmYWxzZSk7CisgICAgZnJhbWUtPnNlbGVjdGlvbigpLnNldFVwZGF0ZUFwcGVhcmFuY2VFbmFi bGVkKGZhbHNlKTsKKyNlbmRpZgorCiAgICAgcmV0dXJuIGluZGljYXRvci5yZWxlYXNlKCk7CiB9 CiAKQEAgLTEyMCw3ICsxMzEsNyBAQCBSZWZQdHI8VGV4dEluZGljYXRvcj4gVGV4dEluZGljYXRv cjo6Y3JlYXRlV2l0aFNlbGVjdGlvbkluRnJhbWUoRnJhbWUmIGZyYW1lLCBUZQogCiAgICAgLy8g RklYTUU6IFdlIHNob3VsZCBoYXZlIFRleHRJbmRpY2F0b3Igb3B0aW9ucyBpbnN0ZWFkIG9mIHRo aXMgYmVpbmcgcGxhdGZvcm0tc3BlY2lmaWMuCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIFNuYXBz aG90T3B0aW9ucyBzbmFwc2hvdE9wdGlvbnMgPSBTbmFwc2hvdE9wdGlvbnNOb25lOworICAgIFNu YXBzaG90T3B0aW9ucyBzbmFwc2hvdE9wdGlvbnMgPSBTbmFwc2hvdE9wdGlvbnNQYWludFNlbGVj dGlvbkFuZEJhY2tncm91bmRzT25seTsKICNlbHNlCiAgICAgU25hcHNob3RPcHRpb25zIHNuYXBz aG90T3B0aW9ucyA9IFNuYXBzaG90T3B0aW9uc0ZvcmNlQmxhY2tUZXh0IHwgU25hcHNob3RPcHRp b25zUGFpbnRTZWxlY3Rpb25Pbmx5OwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUGFpbnRQaGFzZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1BhaW50 UGhhc2UuaAppbmRleCBhNDQ4ZDkyMmQ5OGY3MWM4N2I5ZDYyOTYyMzFlYTRlYTcwMzllZjg1Li5k NDZmYzRlZDRmZDI1ZjVjZDllZDg2YmU0MGUxMTkzM2YxYTlkNmYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUGFpbnRQaGFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9QYWludFBoYXNlLmgKQEAgLTYyLDYgKzYyLDcgQEAgZW51bSBQYWludEJlaGF2aW9y RmxhZ3MgewogICAgIFBhaW50QmVoYXZpb3JSZW5kZXJpbmdTVkdNYXNrID0gMSA8PCA0LAogICAg IFBhaW50QmVoYXZpb3JTa2lwUm9vdEJhY2tncm91bmQgPSAxIDw8IDUsCiAgICAgUGFpbnRCZWhh dmlvclJvb3RCYWNrZ3JvdW5kT25seSA9IDEgPDwgNiwKKyAgICBQYWludEJlaGF2aW9yU2VsZWN0 aW9uQW5kQmFja2dyb3VuZHNPbmx5ID0gMSA8PCA3LAogfTsKIAogdHlwZWRlZiB1bnNpZ25lZCBQ YWludEJlaGF2aW9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3Bw CmluZGV4IDEzMmNkZGUyNjVmZTYyMDg5ZDIzMDlkOTg3ZDc2MGZjY2E4YmYxNTMuLjUwZjhhM2U1 YzcxZTVhMjUzNTZkYWE0ZGU5NGYwMmQyMzFiYjAzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTE1NzUsNyArMTU3NSw3IEBAIENvbG9yIFJlbmRl ckVsZW1lbnQ6OnNlbGVjdGlvbkNvbG9yKGludCBjb2xvclByb3BlcnR5KSBjb25zdAogICAgIC8v IElmIHRoZSBlbGVtZW50IGlzIHVuc2VsZWN0YWJsZSwgb3Igd2UgYXJlIG9ubHkgcGFpbnRpbmcg dGhlIHNlbGVjdGlvbiwKICAgICAvLyBkb24ndCBvdmVycmlkZSB0aGUgZm9yZWdyb3VuZCBjb2xv ciB3aXRoIHRoZSBzZWxlY3Rpb24gZm9yZWdyb3VuZCBjb2xvci4KICAgICBpZiAoc3R5bGUoKS51 c2VyU2VsZWN0KCkgPT0gU0VMRUNUX05PTkUKLSAgICAgICAgfHwgKHZpZXcoKS5mcmFtZVZpZXco KS5wYWludEJlaGF2aW9yKCkgJiBQYWludEJlaGF2aW9yU2VsZWN0aW9uT25seSkpCisgICAgICAg IHx8ICh2aWV3KCkuZnJhbWVWaWV3KCkucGFpbnRCZWhhdmlvcigpICYgKFBhaW50QmVoYXZpb3JT ZWxlY3Rpb25Pbmx5IHwgUGFpbnRCZWhhdmlvclNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seSkp KQogICAgICAgICByZXR1cm4gQ29sb3IoKTsKIAogICAgIGlmIChSZWZQdHI8UmVuZGVyU3R5bGU+ IHBzZXVkb1N0eWxlID0gc2VsZWN0aW9uUHNldWRvU3R5bGUoKSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMmRkYmIwMWRhNzk5ODIxZDNhNTExOWQ4NWNl ZGYzZWE1OTE0ZGUzZC4uOWQ4MjE2ZDE2YzhlN2U4Y2QzM2JhYWE5ZWQ5YjA1NTc4M2Q3YWM5NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00Mjc1LDcgKzQy NzUsOCBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVyQ29udGVudHMoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBjb25zdCBMYXllclBhaW50aQogICAgIGlmIChsb2NhbFBhaW50aW5nSW5m by5vdmVybGFwVGVzdFJlcXVlc3RzICYmIGlzU2VsZlBhaW50aW5nTGF5ZXIpCiAgICAgICAgIHBl cmZvcm1PdmVybGFwVGVzdHMoKmxvY2FsUGFpbnRpbmdJbmZvLm92ZXJsYXBUZXN0UmVxdWVzdHMs IGxvY2FsUGFpbnRpbmdJbmZvLnJvb3RMYXllciwgdGhpcyk7CiAKLSAgICBib29sIHNlbGVjdGlv bk9ubHkgID0gbG9jYWxQYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JT ZWxlY3Rpb25Pbmx5OworICAgIGJvb2wgc2VsZWN0aW9uQW5kQmFja2dyb3VuZHNPbmx5ID0gbG9j YWxQYWludGluZ0luZm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JTZWxlY3Rpb25BbmRC YWNrZ3JvdW5kc09ubHk7CisgICAgYm9vbCBzZWxlY3Rpb25Pbmx5ID0gbG9jYWxQYWludGluZ0lu Zm8ucGFpbnRCZWhhdmlvciAmIFBhaW50QmVoYXZpb3JTZWxlY3Rpb25Pbmx5OwogICAgIAogICAg IFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlvciA9IFBhaW50QmVoYXZpb3JOb3JtYWw7CiAgICAg aWYgKGxvY2FsUGFpbnRGbGFncyAmIFBhaW50TGF5ZXJQYWludGluZ1NraXBSb290QmFja2dyb3Vu ZCkKQEAgLTQzMTQsNyArNDMxNSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50TGF5ZXJDb250 ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRpCiAgICAgaWYg KGlzUGFpbnRpbmdDb21wb3NpdGVkRm9yZWdyb3VuZCkgewogICAgICAgICBpZiAoc2hvdWxkUGFp bnRDb250ZW50KQogICAgICAgICAgICAgcGFpbnRGb3JlZ3JvdW5kRm9yRnJhZ21lbnRzKGxheWVy RnJhZ21lbnRzLCBjb250ZXh0LCB0cmFuc3BhcmVuY3lMYXllckNvbnRleHQsIHBhaW50aW5nSW5m by5wYWludERpcnR5UmVjdCwgaGF2ZVRyYW5zcGFyZW5jeSwKLSAgICAgICAgICAgICAgICBsb2Nh bFBhaW50aW5nSW5mbywgcGFpbnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVy LCBzZWxlY3Rpb25Pbmx5KTsKKyAgICAgICAgICAgICAgICBsb2NhbFBhaW50aW5nSW5mbywgcGFp bnRCZWhhdmlvciwgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyLCBzZWxlY3Rpb25Pbmx5IHx8 IHNlbGVjdGlvbkFuZEJhY2tncm91bmRzT25seSk7CiAgICAgfQogCiAgICAgaWYgKHNob3VsZFBh aW50T3V0bGluZSkKQEAgLTQzNDYsNyArNDM0Nyw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhaW50 TGF5ZXJDb250ZW50cyhHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheWVyUGFpbnRp CiAgICAgLy8gTWFrZSBzdXJlIHRoYXQgd2Ugbm93IHVzZSB0aGUgb3JpZ2luYWwgdHJhbnNwYXJl bmN5IGNvbnRleHQuCiAgICAgQVNTRVJUKHRyYW5zcGFyZW5jeUxheWVyQ29udGV4dCA9PSBjb250 ZXh0KTsKIAotICAgIGlmIChzaG91bGRQYWludENvbnRlbnQgJiYgIXNlbGVjdGlvbk9ubHkpIHsK KyAgICBpZiAoc2hvdWxkUGFpbnRDb250ZW50ICYmICEoc2VsZWN0aW9uT25seSB8fCBzZWxlY3Rp b25BbmRCYWNrZ3JvdW5kc09ubHkpKSB7CiAgICAgICAgIGlmIChzaG91bGRQYWludE1hc2socGFp bnRpbmdJbmZvLnBhaW50QmVoYXZpb3IsIGxvY2FsUGFpbnRGbGFncykpIHsKICAgICAgICAgICAg IC8vIFBhaW50IHRoZSBtYXNrIGZvciB0aGUgZnJhZ21lbnRzLgogICAgICAgICAgICAgcGFpbnRN YXNrRm9yRnJhZ21lbnRzKGxheWVyRnJhZ21lbnRzLCBjb250ZXh0LCBsb2NhbFBhaW50aW5nSW5m bywgc3VidHJlZVBhaW50Um9vdEZvclJlbmRlcmVyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBhMTRhMWE0OTBkZWJkNjllMjA2 MzdlOTI4N2JhNWMyYmUxNjNjNDAzLi4yNGQ0MmY0MzFiZmYyYjEyOWZkNWYzZDE1Y2VlMDkxNjU4 NjM3OGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuY3BwCkBAIC0xODI2LDcgKzE4MjYsNyBAQCBib29sIFBsdWdpblZpZXc6OnNob3VsZENy ZWF0ZVRyYW5zaWVudFBhaW50aW5nU25hcHNob3QoKSBjb25zdAogICAgICAgICByZXR1cm4gZmFs c2U7CiAKICAgICBpZiAoRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZSgpLT52aWV3KCkpIHsK LSAgICAgICAgaWYgKGZyYW1lVmlldy0+cGFpbnRCZWhhdmlvcigpICYgKFBhaW50QmVoYXZpb3JT ZWxlY3Rpb25Pbmx5IHwgUGFpbnRCZWhhdmlvckZvcmNlQmxhY2tUZXh0KSkgeworICAgICAgICBp ZiAoZnJhbWVWaWV3LT5wYWludEJlaGF2aW9yKCkgJiAoUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9u bHkgfCBQYWludEJlaGF2aW9yU2VsZWN0aW9uQW5kQmFja2dyb3VuZHNPbmx5IHwgUGFpbnRCZWhh dmlvckZvcmNlQmxhY2tUZXh0KSkgewogICAgICAgICAgICAgLy8gVGhpcyBwYWludCBiZWhhdmlv ciBpcyB1c2VkIHdoZW4gZHJhd2luZyB0aGUgZmluZCBpbmRpY2F0b3IgYW5kIHRoZXJlJ3Mgbm8g bmVlZCB0bwogICAgICAgICAgICAgLy8gc25hcHNob3QgcGx1Zy1pbnMsIGJlY2F1c2UgdGhleSBj YW4gbmV2ZXIgYmUgcGFpbnRlZCBhcyBwYXJ0IG9mIHRoZSBmaW5kIGluZGljYXRvci4KICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsK