155779 2016-03-22 17:55:56 -0700 Invoking a link preview on a complex link (e.g. an image) results in an empty TextIndicator 2016-03-22 22:46:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton bdakin enrica simon.fraser oldest_to_newest 1177242 0 thorton 2016-03-22 17:55:56 -0700 Invoking a link preview on a complex link (e.g. an image) results in an empty TextIndicator 1177243 1 274718 thorton 2016-03-22 17:56:14 -0700 Created attachment 274718 Patch 1177244 2 thorton 2016-03-22 17:57:24 -0700 I am separately going to try to revive the (somewhat questionable) TextIndicator testing patch from 6 months ago so we can have tests for this thing, but for now there is no mechanism for TextIndicator testing. 1177281 3 thorton 2016-03-22 22:46:21 -0700 http://trac.webkit.org/changeset/198578 274718 2016-03-22 17:56:14 -0700 2016-03-22 18:26:12 -0700 Patch bug-155779-20160322175615.patch text/plain 10712 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTk4NDk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmUzNGJiYTFhYmZlNWJj NTQyOWU3YWQ1MTIzMGE5YTljNDI2NjgyNy4uNDU2MjFiOGUzMjBkOWExZTZiZWVhYzFjMTZiODc5 NTQxZmM2ZThiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE2LTAzLTIyICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEludm9raW5nIGEg bGluayBwcmV2aWV3IG9uIGEgY29tcGxleCBsaW5rIChlLmcuIGFuIGltYWdlKSByZXN1bHRzIGlu IGFuIGVtcHR5IFRleHRJbmRpY2F0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE1NTc3OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjI0MDg3OTM+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYWdl L0ZyYW1lU25hcHNob3R0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNuYXBzaG90RnJhbWVS ZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnNuYXBzaG90RnJhbWVSZWN0V2l0aENsaXApOgorICAg ICAgICAqIHBhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaDoKKyAgICAgICAgKiBwYWdlL1RleHRJbmRp Y2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dGFrZVNuYXBzaG90KToKKyAgICAgICAgKFdl YkNvcmU6OnRha2VTbmFwc2hvdHMpOgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbGl6ZUluZGlj YXRvcik6CisgICAgICAgIFdoZW4gc25hcHNob3R0aW5nLCBjbGlwIHRvIHRoZSBpbmRpY2F0ZWQg cmFuZ2UncyByZWN0cy4gVGhpcyBpcyBpbXBvcnRhbnQKKyAgICAgICAgdG8gYXZvaWQgcGFpbnRp bmcgaW50byB0aGUgbWFyZ2lucyBpbiB0aGUgbm9uLXNlbGVjdGlvbi1vbmx5IHBhaW50aW5nIGNh c2UuCisgICAgICAgIFRoaXMgZGlkbid0IGNvbWUgdXAgd2l0aCBub3JtYWwgc2VsZWN0aW9uLW9u bHkgcGFpbnRpbmcgYmVjYXVzZSB0aGUgdGV4dAorICAgICAgICBkaWRuJ3QgaW50ZXJzZWN0IHRo ZSBtYXJnaW4sIGFuZCB0aGUgYmFja2dyb3VuZCBkb2Vzbid0IHBhaW50LgorCiAyMDE2LTAzLTIx ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFZlcnkg Zmxhc2h5IHNjcm9sbGluZyBvbiBodHRwOi8vcXVlbGxpc2gudHVtYmxyLmNvbSBwYWdlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKaW5kZXggOWU4YmQ0N2Q4YmI1Y2FjMjgyNWQ3ODA4NDkxNmFmNGYzNjUwNTI0Yy4uM2JkZWEx NzZlYmJlOTMyMWIyYzQ0YjkzYTA3MzA1ZjkwNzc1ZDM4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDE2LTAzLTIyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29t PgorCisgICAgICAgIEludm9raW5nIGEgbGluayBwcmV2aWV3IG9uIGEgY29tcGxleCBsaW5rIChl LmcuIGFuIGltYWdlKSByZXN1bHRzIGluIGFuIGVtcHR5IFRleHRJbmRpY2F0b3IKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NTc3OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjI0MDg3OTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpY3Rpb25hcnlQb3B1cEluZm9Gb3JSYW5nZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBlcmZvcm1JbW1lZGlhdGVBY3Rpb25IaXRUZXN0 QXRMb2NhdGlvbik6CisgICAgICAgIFVzZSB0aGUgVGV4dEluZGljYXRvciBtb2RlIHdoZXJlIHdl IGdpdmUgdXAgb24gc2VsZWN0aW9uLW9ubHkgc25hcHNob3R0aW5nCisgICAgICAgIGFuZCBqdXN0 IHBhaW50IGFsbCBjb250ZW50IG9uIE1hYywgc2ltaWxhciB0byB3aGF0IHdlIGRvIGZvciAzRCBU b3VjaCBpbmRpY2F0b3JzLgorCiAyMDE2LTAzLTE4ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBh cHBsZS5jb20+CiAKICAgICAgICAgRW5hYmxlIHByZXZpZXcgb2YgaW1hZ2VzIGFzIGF0dGFjaG1l bnRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNuYXBzaG90dGluZy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNob3R0aW5nLmNwcAppbmRleCA0NzE0 ZGM2NjYyNDIxN2FlMjVmNzZiOGRlNWVkZWVjYzYzYzE1MzFjLi4zZDM0Y2Q5MjkxZmU4MWNlZmYz MzU3YTA0YWFlNGU3Y2MxYWM0MDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lU25hcHNob3R0aW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNo b3R0aW5nLmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIkZyYW1lU25hcHNob3R0aW5n LmgiCiAKICNpbmNsdWRlICJEb2N1bWVudC5oIgorI2luY2x1ZGUgIkZsb2F0UmVjdC5oIgogI2lu Y2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKICNpbmNsdWRlICJG cmFtZVZpZXcuaCIKQEAgLTY4LDYgKzY5LDEyIEBAIHN0cnVjdCBTY29wZWRGcmFtZVBhaW50aW5n U3RhdGUgewogCiBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VCdWZmZXI+IHNuYXBzaG90RnJhbWVSZWN0 KEZyYW1lJiBmcmFtZSwgY29uc3QgSW50UmVjdCYgaW1hZ2VSZWN0LCBTbmFwc2hvdE9wdGlvbnMg b3B0aW9ucykKIHsKKyAgICBWZWN0b3I8RmxvYXRSZWN0PiBjbGlwUmVjdHM7CisgICAgcmV0dXJu IHNuYXBzaG90RnJhbWVSZWN0V2l0aENsaXAoZnJhbWUsIGltYWdlUmVjdCwgY2xpcFJlY3RzLCBv cHRpb25zKTsKK30KKworc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBzbmFwc2hvdEZyYW1l UmVjdFdpdGhDbGlwKEZyYW1lJiBmcmFtZSwgY29uc3QgSW50UmVjdCYgaW1hZ2VSZWN0LCBWZWN0 b3I8RmxvYXRSZWN0PiYgY2xpcFJlY3RzLCBTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucykKK3sKICAg ICBpZiAoIWZyYW1lLnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKQEAgLTEwNCw2 ICsxMTEsMTMgQEAgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBzbmFwc2hvdEZyYW1lUmVj dChGcmFtZSYgZnJhbWUsIGNvbnN0IEludFJlY3QmIGltYWcKICAgICAgICAgcmV0dXJuIG51bGxw dHI7CiAgICAgYnVmZmVyLT5jb250ZXh0KCkudHJhbnNsYXRlKC1pbWFnZVJlY3QueCgpLCAtaW1h Z2VSZWN0LnkoKSk7CiAKKyAgICBpZiAoIWNsaXBSZWN0cy5pc0VtcHR5KCkpIHsKKyAgICAgICAg UGF0aCBjbGlwUGF0aDsKKyAgICAgICAgZm9yIChhdXRvJiByZWN0IDogY2xpcFJlY3RzKQorICAg ICAgICAgICAgY2xpcFBhdGguYWRkUmVjdChyZWN0KTsKKyAgICAgICAgYnVmZmVyLT5jb250ZXh0 KCkuY2xpcFBhdGgoY2xpcFBhdGgpOworICAgIH0KKwogICAgIGZyYW1lLnZpZXcoKS0+cGFpbnRD b250ZW50c0ZvclNuYXBzaG90KGJ1ZmZlci0+Y29udGV4dCgpLCBpbWFnZVJlY3QsIHNob3VsZElu Y2x1ZGVTZWxlY3Rpb24sIGNvb3JkaW5hdGVTcGFjZSk7CiAgICAgcmV0dXJuIGJ1ZmZlcjsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVTbmFwc2hvdHRpbmcuaAppbmRleCA2ZjJkMTVlOTUzODI1 NDVjYzcyMGJlNjg3ZWM2OWZkNWNkYTA4YTlhLi5jNjUyZDI5MzZmNDNkMjE5ZTI4MDZmYTk1ZmU2 MjI3OTg5MGFlYzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lU25hcHNo b3R0aW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVNuYXBzaG90dGluZy5oCkBA IC0zMSw5ICszMSwxMSBAQAogI2RlZmluZSBGcmFtZVNuYXBzaG90dGluZ19oCiAKICNpbmNsdWRl IDxtZW1vcnk+CisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKK2NsYXNzIEZsb2F0UmVjdDsKIGNsYXNzIEZyYW1lOwogY2xhc3MgSW50UmVjdDsKIGNsYXNz IEltYWdlQnVmZmVyOwpAQCAtNTAsNiArNTIsNyBAQCBlbnVtIHsKIHR5cGVkZWYgdW5zaWduZWQg U25hcHNob3RPcHRpb25zOwogCiBXRUJDT1JFX0VYUE9SVCBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VC dWZmZXI+IHNuYXBzaG90RnJhbWVSZWN0KEZyYW1lJiwgY29uc3QgSW50UmVjdCYsIFNuYXBzaG90 T3B0aW9ucyA9IFNuYXBzaG90T3B0aW9uc05vbmUpOworc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVm ZmVyPiBzbmFwc2hvdEZyYW1lUmVjdFdpdGhDbGlwKEZyYW1lJiwgY29uc3QgSW50UmVjdCYsIFZl Y3RvcjxGbG9hdFJlY3Q+JiBjbGlwUmVjdHMsIFNuYXBzaG90T3B0aW9ucyA9IFNuYXBzaG90T3B0 aW9uc05vbmUpOwogc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBzbmFwc2hvdE5vZGUoRnJh bWUmLCBOb2RlJik7CiBXRUJDT1JFX0VYUE9SVCBzdGQ6OnVuaXF1ZV9wdHI8SW1hZ2VCdWZmZXI+ IHNuYXBzaG90U2VsZWN0aW9uKEZyYW1lJiwgU25hcHNob3RPcHRpb25zID0gU25hcHNob3RPcHRp b25zTm9uZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGljYXRv ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJbmRpY2F0b3IuY3BwCmluZGV4IGZkMGMw YmE3MzM5NWNkNjMzMTM0OGY3OWUwMTc5NmJjODdkMGExMzAuLjE3Njg0YzU3NDg4MzI4OTY3NjBm NDZlZTlkMWNmMWI4MDhjMzA2MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4 dEluZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNw cApAQCAtMTQ5LDI2ICsxNDksMjYgQEAgc3RhdGljIFNuYXBzaG90T3B0aW9ucyBzbmFwc2hvdE9w dGlvbnNGb3JUZXh0SW5kaWNhdG9yT3B0aW9ucyhUZXh0SW5kaWNhdG9yT3B0aW8KICAgICByZXR1 cm4gc25hcHNob3RPcHRpb25zOwogfQogCi1zdGF0aWMgUmVmUHRyPEltYWdlPiB0YWtlU25hcHNo b3QoRnJhbWUmIGZyYW1lLCBJbnRSZWN0IHJlY3QsIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zLCBm bG9hdCYgc2NhbGVGYWN0b3IpCitzdGF0aWMgUmVmUHRyPEltYWdlPiB0YWtlU25hcHNob3QoRnJh bWUmIGZyYW1lLCBJbnRSZWN0IHJlY3QsIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zLCBmbG9hdCYg c2NhbGVGYWN0b3IsIFZlY3RvcjxGbG9hdFJlY3Q+JiBjbGlwUmVjdHNJbkRvY3VtZW50Q29vcmRp bmF0ZXMpCiB7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPEltYWdlQnVmZmVyPiBidWZmZXIgPSBzbmFw c2hvdEZyYW1lUmVjdChmcmFtZSwgcmVjdCwgb3B0aW9ucyk7CisgICAgc3RkOjp1bmlxdWVfcHRy PEltYWdlQnVmZmVyPiBidWZmZXIgPSBzbmFwc2hvdEZyYW1lUmVjdFdpdGhDbGlwKGZyYW1lLCBy ZWN0LCBjbGlwUmVjdHNJbkRvY3VtZW50Q29vcmRpbmF0ZXMsIG9wdGlvbnMpOwogICAgIGlmICgh YnVmZmVyKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICBzY2FsZUZhY3RvciA9IGJ1ZmZl ci0+cmVzb2x1dGlvblNjYWxlKCk7CiAgICAgcmV0dXJuIEltYWdlQnVmZmVyOjpzaW5rSW50b0lt YWdlKFdURk1vdmUoYnVmZmVyKSwgVW5zY2FsZWQpOwogfQogCi1zdGF0aWMgYm9vbCB0YWtlU25h cHNob3RzKFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhLCBGcmFtZSYgZnJhbWUsIEludFJlY3Qgc25h cHNob3RSZWN0KQorc3RhdGljIGJvb2wgdGFrZVNuYXBzaG90cyhUZXh0SW5kaWNhdG9yRGF0YSYg ZGF0YSwgRnJhbWUmIGZyYW1lLCBJbnRSZWN0IHNuYXBzaG90UmVjdCwgVmVjdG9yPEZsb2F0UmVj dD4mIGNsaXBSZWN0c0luRG9jdW1lbnRDb29yZGluYXRlcykKIHsKICAgICBTbmFwc2hvdE9wdGlv bnMgc25hcHNob3RPcHRpb25zID0gc25hcHNob3RPcHRpb25zRm9yVGV4dEluZGljYXRvck9wdGlv bnMoZGF0YS5vcHRpb25zKTsKIAotICAgIGRhdGEuY29udGVudEltYWdlID0gdGFrZVNuYXBzaG90 KGZyYW1lLCBzbmFwc2hvdFJlY3QsIHNuYXBzaG90T3B0aW9ucywgZGF0YS5jb250ZW50SW1hZ2VT Y2FsZUZhY3Rvcik7CisgICAgZGF0YS5jb250ZW50SW1hZ2UgPSB0YWtlU25hcHNob3QoZnJhbWUs IHNuYXBzaG90UmVjdCwgc25hcHNob3RPcHRpb25zLCBkYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFj dG9yLCBjbGlwUmVjdHNJbkRvY3VtZW50Q29vcmRpbmF0ZXMpOwogICAgIGlmICghZGF0YS5jb250 ZW50SW1hZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChkYXRhLm9wdGlvbnMg JiBUZXh0SW5kaWNhdG9yT3B0aW9uSW5jbHVkZVNuYXBzaG90V2l0aFNlbGVjdGlvbkhpZ2hsaWdo dCkgewogICAgICAgICBmbG9hdCBzbmFwc2hvdFNjYWxlRmFjdG9yOwotICAgICAgICBkYXRhLmNv bnRlbnRJbWFnZVdpdGhIaWdobGlnaHQgPSB0YWtlU25hcHNob3QoZnJhbWUsIHNuYXBzaG90UmVj dCwgU25hcHNob3RPcHRpb25zTm9uZSwgc25hcHNob3RTY2FsZUZhY3Rvcik7CisgICAgICAgIGRh dGEuY29udGVudEltYWdlV2l0aEhpZ2hsaWdodCA9IHRha2VTbmFwc2hvdChmcmFtZSwgc25hcHNo b3RSZWN0LCBTbmFwc2hvdE9wdGlvbnNOb25lLCBzbmFwc2hvdFNjYWxlRmFjdG9yLCBjbGlwUmVj dHNJbkRvY3VtZW50Q29vcmRpbmF0ZXMpOwogICAgICAgICBBU1NFUlQoIWRhdGEuY29udGVudElt YWdlV2l0aEhpZ2hsaWdodCB8fCBkYXRhLmNvbnRlbnRJbWFnZVNjYWxlRmFjdG9yID09IHNuYXBz aG90U2NhbGVGYWN0b3IpOwogICAgIH0KICAgICAKQEAgLTIzOCw3ICsyMzgsNyBAQCBzdGF0aWMg Ym9vbCBpbml0aWFsaXplSW5kaWNhdG9yKFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhLCBGcmFtZSYg ZnJhbWUsIGNvbnN0IFJhbgogICAgIGRhdGEudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29y ZGluYXRlcyA9IHRleHRCb3VuZGluZ1JlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXM7CiAgICAgZGF0 YS50ZXh0UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzID0gdGV4dFJlY3RzSW5Cb3VuZGlu Z1JlY3RDb29yZGluYXRlczsKIAotICAgIHJldHVybiB0YWtlU25hcHNob3RzKGRhdGEsIGZyYW1l LCBlbmNsb3NpbmdJbnRSZWN0KHRleHRCb3VuZGluZ1JlY3RJbkRvY3VtZW50Q29vcmRpbmF0ZXMp KTsKKyAgICByZXR1cm4gdGFrZVNuYXBzaG90cyhkYXRhLCBmcmFtZSwgZW5jbG9zaW5nSW50UmVj dCh0ZXh0Qm91bmRpbmdSZWN0SW5Eb2N1bWVudENvb3JkaW5hdGVzKSwgdGV4dFJlY3RzKTsKIH0K IAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCmluZGV4IGJmMTc1MWI5MzdiYTEwM2EwNGUz Nzk3OWU1OTc1YzRkYTQ3ODk0OWYuLmY0YjIzMzY5ZGJmNjQ1NjgyMjM4OGYzMGRjY2IyMmUxY2I0 M2RiNWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMv V2ViUGFnZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dlYlBhZ2VNYWMubW0KQEAgLTQ0Myw3ICs0NDMsNyBAQCBEaWN0aW9uYXJ5UG9wdXBJbmZvIFdl YlBhZ2U6OmRpY3Rpb25hcnlQb3B1cEluZm9Gb3JSYW5nZShGcmFtZSogZnJhbWUsIFJhbmdlJiBy YQogICAgICAgICBbc2NhbGVkTlNBdHRyaWJ1dGVkU3RyaW5nIGFkZEF0dHJpYnV0ZXM6c2NhbGVk QXR0cmlidXRlcy5nZXQoKSByYW5nZTpyYW5nZV07CiAgICAgfV07CiAKLSAgICBUZXh0SW5kaWNh dG9yT3B0aW9ucyBpbmRpY2F0b3JPcHRpb25zID0gVGV4dEluZGljYXRvck9wdGlvbkRlZmF1bHQ7 CisgICAgVGV4dEluZGljYXRvck9wdGlvbnMgaW5kaWNhdG9yT3B0aW9ucyA9IFRleHRJbmRpY2F0 b3JPcHRpb25Vc2VCb3VuZGluZ1JlY3RBbmRQYWludEFsbENvbnRlbnRGb3JDb21wbGV4UmFuZ2Vz OwogICAgIGlmIChwcmVzZW50YXRpb25UcmFuc2l0aW9uID09IFRleHRJbmRpY2F0b3JQcmVzZW50 YXRpb25UcmFuc2l0aW9uOjpCb3VuY2VBbmRDcm9zc2ZhZGUpCiAgICAgICAgIGluZGljYXRvck9w dGlvbnMgfD0gVGV4dEluZGljYXRvck9wdGlvbkluY2x1ZGVTbmFwc2hvdFdpdGhTZWxlY3Rpb25I aWdobGlnaHQ7CiAKQEAgLTk2OSw3ICs5NjksNyBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZvcm1JbW1l ZGlhdGVBY3Rpb25IaXRUZXN0QXRMb2NhdGlvbihXZWJDb3JlOjpGbG9hdFBvaW50IGxvY2F0aQog ICAgIEVsZW1lbnQgKlVSTEVsZW1lbnQgPSBoaXRUZXN0UmVzdWx0LlVSTEVsZW1lbnQoKTsKICAg ICBpZiAoIWFic29sdXRlTGlua1VSTC5pc0VtcHR5KCkgJiYgVVJMRWxlbWVudCkgewogICAgICAg ICBSZWZQdHI8UmFuZ2U+IGxpbmtSYW5nZSA9IHJhbmdlT2ZDb250ZW50cygqVVJMRWxlbWVudCk7 Ci0gICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5saW5rVGV4dEluZGljYXRvciA9IFRleHRJ bmRpY2F0b3I6OmNyZWF0ZVdpdGhSYW5nZSgqbGlua1JhbmdlLCBUZXh0SW5kaWNhdG9yT3B0aW9u RGVmYXVsdCwgVGV4dEluZGljYXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7Cisg ICAgICAgIGltbWVkaWF0ZUFjdGlvblJlc3VsdC5saW5rVGV4dEluZGljYXRvciA9IFRleHRJbmRp Y2F0b3I6OmNyZWF0ZVdpdGhSYW5nZSgqbGlua1JhbmdlLCBUZXh0SW5kaWNhdG9yT3B0aW9uVXNl Qm91bmRpbmdSZWN0QW5kUGFpbnRBbGxDb250ZW50Rm9yQ29tcGxleFJhbmdlcywgVGV4dEluZGlj YXRvclByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7CiAgICAgfQogCiAgICAgTlNEaWN0 aW9uYXJ5ICpvcHRpb25zID0gbmlsOwpAQCAtMTAwNSw3ICsxMDA1LDcgQEAgdm9pZCBXZWJQYWdl OjpwZXJmb3JtSW1tZWRpYXRlQWN0aW9uSGl0VGVzdEF0TG9jYXRpb24oV2ViQ29yZTo6RmxvYXRQ b2ludCBsb2NhdGkKICAgICAgICAgICAgIGRldGVjdGVkRGF0YUJvdW5kaW5nQm94LnVuaXRlKGZy YW1lVmlldy0+Y29udGVudHNUb1dpbmRvdyhxdWFkLmVuY2xvc2luZ0JvdW5kaW5nQm94KCkpKTsK IAogICAgICAgICBpbW1lZGlhdGVBY3Rpb25SZXN1bHQuZGV0ZWN0ZWREYXRhQm91bmRpbmdCb3gg PSBkZXRlY3RlZERhdGFCb3VuZGluZ0JveDsKLSAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0 LmRldGVjdGVkRGF0YVRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFu Z2UoKm1haW5SZXN1bHRSYW5nZSwgVGV4dEluZGljYXRvck9wdGlvbkRlZmF1bHQsIFRleHRJbmRp Y2F0b3JQcmVzZW50YXRpb25UcmFuc2l0aW9uOjpGYWRlSW4pOworICAgICAgICBpbW1lZGlhdGVB Y3Rpb25SZXN1bHQuZGV0ZWN0ZWREYXRhVGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNy ZWF0ZVdpdGhSYW5nZSgqbWFpblJlc3VsdFJhbmdlLCBUZXh0SW5kaWNhdG9yT3B0aW9uVXNlQm91 bmRpbmdSZWN0QW5kUGFpbnRBbGxDb250ZW50Rm9yQ29tcGxleFJhbmdlcywgVGV4dEluZGljYXRv clByZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7CiAgICAgICAgIGltbWVkaWF0ZUFjdGlv blJlc3VsdC5kZXRlY3RlZERhdGFPcmlnaW5hdGluZ1BhZ2VPdmVybGF5ID0gb3ZlcmxheS0+cGFn ZU92ZXJsYXlJRCgpOwogCiAgICAgICAgIGJyZWFrOwpAQCAtMTAxOCw3ICsxMDE4LDcgQEAgdm9p ZCBXZWJQYWdlOjpwZXJmb3JtSW1tZWRpYXRlQWN0aW9uSGl0VGVzdEF0TG9jYXRpb24oV2ViQ29y ZTo6RmxvYXRQb2ludCBsb2NhdGkKICAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVj dGVkRGF0YUFjdGlvbkNvbnRleHQgPSBEYXRhRGV0ZWN0aW9uOjpkZXRlY3RJdGVtQXJvdW5kSGl0 VGVzdFJlc3VsdChoaXRUZXN0UmVzdWx0LCBkZXRlY3RlZERhdGFCb3VuZGluZ0JveCwgZGV0ZWN0 ZWREYXRhUmFuZ2UpOwogICAgICAgICBpZiAoaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVk RGF0YUFjdGlvbkNvbnRleHQgJiYgZGV0ZWN0ZWREYXRhUmFuZ2UpIHsKICAgICAgICAgICAgIGlt bWVkaWF0ZUFjdGlvblJlc3VsdC5kZXRlY3RlZERhdGFCb3VuZGluZ0JveCA9IGRldGVjdGVkRGF0 YUJvdW5kaW5nQm94OwotICAgICAgICAgICAgaW1tZWRpYXRlQWN0aW9uUmVzdWx0LmRldGVjdGVk RGF0YVRleHRJbmRpY2F0b3IgPSBUZXh0SW5kaWNhdG9yOjpjcmVhdGVXaXRoUmFuZ2UoKmRldGVj dGVkRGF0YVJhbmdlLCBUZXh0SW5kaWNhdG9yT3B0aW9uRGVmYXVsdCwgVGV4dEluZGljYXRvclBy ZXNlbnRhdGlvblRyYW5zaXRpb246OkZhZGVJbik7CisgICAgICAgICAgICBpbW1lZGlhdGVBY3Rp b25SZXN1bHQuZGV0ZWN0ZWREYXRhVGV4dEluZGljYXRvciA9IFRleHRJbmRpY2F0b3I6OmNyZWF0 ZVdpdGhSYW5nZSgqZGV0ZWN0ZWREYXRhUmFuZ2UsIFRleHRJbmRpY2F0b3JPcHRpb25Vc2VCb3Vu ZGluZ1JlY3RBbmRQYWludEFsbENvbnRlbnRGb3JDb21wbGV4UmFuZ2VzLCBUZXh0SW5kaWNhdG9y UHJlc2VudGF0aW9uVHJhbnNpdGlvbjo6RmFkZUluKTsKICAgICAgICAgfQogICAgIH0KIAo=