235844 2022-01-28 16:57:36 -0800 Collapsed ranges return zero rects in DocumentContext 2022-01-31 15:13:14 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1835190 0 megan_gardner 2022-01-28 16:57:36 -0800 Collapsed ranges return zero rects in DocumentContext 1835192 1 450291 megan_gardner 2022-01-28 17:03:01 -0800 Created attachment 450291 Patch 1835605 2 450291 thorton 2022-01-31 11:20:47 -0800 Comment on attachment 450291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450291&action=review > Source/WebKit/ChangeLog:12 > + This results in an understandable zero rect for the absolute bounding rects for that character, > + which is not really representative of what the bounding rect is. For these situations, we should Some reference back to the change you made that broke this would be good. ("Before revision X, we did A; afterwards, we did B, but that's a problem because C" instead of this form that only captures C). You and I know the context right now, but it's going to be quickly lost if not recorded here. > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:4576 > + absoluteBoundingBox = VisiblePosition(makeDeprecatedLegacyPosition(iterator.range().start)).absoluteCaretBounds(); is it really right to be adding new `makeDeprecatedLegacyPosition`? 1835719 3 450461 megan_gardner 2022-01-31 14:14:46 -0800 Created attachment 450461 Patch for landing 1835740 4 ews-feeder 2022-01-31 15:12:53 -0800 Committed r288849 (246610@main): <https://commits.webkit.org/246610@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450461. 1835741 5 webkit-bug-importer 2022-01-31 15:13:14 -0800 <rdar://problem/88297028> 450291 2022-01-28 17:03:01 -0800 2022-01-31 14:14:44 -0800 Patch bug-235844-20220128170300.patch text/plain 5550 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk4NGY5ZWEyNmFiZDE4MWZk MTRhM2I1YWU5MTMzMmZmYzU5MmM3YmIuLjYzYmY4NWVmNjA0YTUzNWJmMmI1N2U3OGYyZDM1NTg3 YjI3YTg4OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjItMDEtMjggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb2xsYXBzZWQgcmFu Z2VzIHJldHVybiB6ZXJvIHJlY3RzIGluIERvY3VtZW50Q29udGV4dAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1ODQ0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogRG9jdW1lbnRFZGl0aW5nQ29u dGV4dC5SZWN0c1JlcXVlc3RJbkNvbnRlbnRFZGl0YWJsZVdpdGhEaXZCcmVha3MKKworICAgICAg ICBJbiBjZXJ0YWluIHNpdHVhdGlvbnMsIHRleHRJdGVyYXRvciB3aWxsIGhhdmUgYSBjb2xsYXBz ZWQgcmFuZ2UgZm9yIGEgYmxhbmsgbGluZSBjaGFyYWN0ZXIuCisgICAgICAgIFRoaXMgcmVzdWx0 cyBpbiBhbiB1bmRlcnN0YW5kYWJsZSB6ZXJvIHJlY3QgZm9yIHRoZSBhYnNvbHV0ZSBib3VuZGlu ZyByZWN0cyBmb3IgdGhhdCBjaGFyYWN0ZXIsCisgICAgICAgIHdoaWNoIGlzIG5vdCByZWFsbHkg cmVwcmVzZW50YXRpdmUgb2Ygd2hhdCB0aGUgYm91bmRpbmcgcmVjdCBpcy4gRm9yIHRoZXNlIHNp dHVhdGlvbnMsIHdlIHNob3VsZAorICAgICAgICBpbnN0ZWFkIHVzZSB0aGUgY2FyZXQgYm91bmRp bmcgcmVjdC4gVGhpcyBnaXZlcyB1cyBhIG1vcmUgYWNjdXJhdGUgYm91bmRpbmcgcmVjdCBmb3Ig c2l0dWF0aW9ucyBsaWtlCisgICAgICAgIHRoaXMgdGhhdCByZXN1bHQgaW4gY29sbGFwc2VkIHJh bmdlcy4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVxdWVzdERvY3VtZW50RWRpdGluZ0NvbnRleHQp OgorCiAyMDIyLTAxLTI3ICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAog ICAgICAgICBJbnRyb2R1Y2UgV2ViRm91bmRUZXh0UmFuZ2UgYW5kIFdlYkZvdW5kVGV4dFJhbmdl Q29udHJvbGxlciB0byBzdXBwb3J0IHJlc3RvcmFibGUgZmluZCByZXN1bHRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCmluZGV4IDM4 MDVmNTdjYTUyMjQ4ODVmNzE2ZmUyMGE5NzUxZGQxYmQyNzcwNzMuLjgzMjE1NDhiMjQyNzY0ODlm NjkzZTU5ZTYyOTIyMzU2YTA4ZDEyNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC00NTcxLDcgKzQ1NzEsMTEgQEAgdm9p ZCBXZWJQYWdlOjpyZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4dChEb2N1bWVudEVkaXRpbmdD b250ZXh0UmVxdWVzdCByZXF1ZXMKICAgICAgICAgY29uc3QgaW50IHN0cmlkZSA9IDE7CiAgICAg ICAgIHdoaWxlICghaXRlcmF0b3IuYXRFbmQoKSkgewogICAgICAgICAgICAgaWYgKCFpdGVyYXRv ci50ZXh0KCkuaXNFbXB0eSgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBhYnNvbHV0ZUJvdW5k aW5nQm94ID0gdW5pb25SZWN0SWdub3JpbmdaZXJvUmVjdHMoUmVuZGVyT2JqZWN0OjphYnNvbHV0 ZVRleHRSZWN0cyhpdGVyYXRvci5yYW5nZSgpLCBSZW5kZXJPYmplY3Q6OkJvdW5kaW5nUmVjdEJl aGF2aW9yOjpJZ25vcmVFbXB0eVRleHRTZWxlY3Rpb25zKSk7CisgICAgICAgICAgICAgICAgSW50 UmVjdCBhYnNvbHV0ZUJvdW5kaW5nQm94OworICAgICAgICAgICAgICAgIGlmIChpdGVyYXRvci5y YW5nZSgpLmNvbGxhcHNlZCgpKQorICAgICAgICAgICAgICAgICAgICBhYnNvbHV0ZUJvdW5kaW5n Qm94ID0gVmlzaWJsZVBvc2l0aW9uKG1ha2VEZXByZWNhdGVkTGVnYWN5UG9zaXRpb24oaXRlcmF0 b3IucmFuZ2UoKS5zdGFydCkpLmFic29sdXRlQ2FyZXRCb3VuZHMoKTsKKyAgICAgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGFic29sdXRlQm91bmRpbmdCb3ggPSB1bmlvblJl Y3RJZ25vcmluZ1plcm9SZWN0cyhSZW5kZXJPYmplY3Q6OmFic29sdXRlVGV4dFJlY3RzKGl0ZXJh dG9yLnJhbmdlKCksIFJlbmRlck9iamVjdDo6Qm91bmRpbmdSZWN0QmVoYXZpb3I6Oklnbm9yZUVt cHR5VGV4dFNlbGVjdGlvbnMpKTsKICAgICAgICAgICAgICAgICByZWN0cy5hcHBlbmQoeyBpdGVy YXRvci5yYW5nZSgpLnN0YXJ0LmRvY3VtZW50KCkudmlldygpLT5jb250ZW50c1RvUm9vdFZpZXco YWJzb2x1dGVCb3VuZGluZ0JveCksIHsgb2Zmc2V0U29GYXIrKywgc3RyaWRlIH0gfSk7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICBpdGVyYXRvci5hZHZhbmNlKHN0cmlkZSk7CmRpZmYgLS1n aXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTdjNzRkZWUyNjBm MDg2MGQ5MDhmNjBiNzQxZmI2MmQ2Mjc5YWQ2OC4uNWU4ZWFmOWJkOGUxZWJkMjI2MGE2NjI2ZmI5 NmYyNDk0ZWVhY2Y2MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIyLTAxLTI4ICBNZWdhbiBHYXJkbmVyICA8bWVn YW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgQ29sbGFwc2VkIHJhbmdlcyByZXR1cm4g emVybyByZWN0cyBpbiBEb2N1bWVudENvbnRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTg0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9E b2N1bWVudEVkaXRpbmdDb250ZXh0Lm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMjItMDEtMjcg IENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtX UEVdW2ExMXldIEFkZCBvcHRpb24gdG8gYnVpbGQgd2l0aCBBVFNQSQpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb2N1bWVudEVkaXRpbmdDb250ZXh0 Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb2N1bWVudEVkaXRp bmdDb250ZXh0Lm1tCmluZGV4IDI4YmNjMjQyYjE2ZGNmMjc2ODMwNzMxNzZjN2FkOGViN2UzZjhl MjcuLjYwYzI4NGQ3MWU0ZDQ1MmQyMjZjYWUwODM0MDYzM2Y4NmVlYmI4YmMgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRG9jdW1lbnRFZGl0aW5nQ29u dGV4dC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RvY3Vt ZW50RWRpdGluZ0NvbnRleHQubW0KQEAgLTUwMCw2ICs1MDAsMzIgQEAgVEVTVChEb2N1bWVudEVk aXRpbmdDb250ZXh0LCBSZWN0c1JlcXVlc3RJbkNvbnRlbnRFZGl0YWJsZSkKICAgICB9CiB9CiAK K1RFU1QoRG9jdW1lbnRFZGl0aW5nQ29udGV4dCwgUmVjdHNSZXF1ZXN0SW5Db250ZW50RWRpdGFi bGVXaXRoRGl2QnJlYWtzKQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tX ZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApXSk7 CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6YXBwbHlBaGVtU3R5 bGUoQCI8ZGl2IGlkPSd0ZXh0JyBjb250ZW50ZWRpdGFibGU+VGVzdDxkaXY+PGJyPjwvZGl2Pjxk aXY+PGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjwvZGl2PiIpXTsKKyAgICBbd2ViVmlldyBzdHJp bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4dGVu dCh0ZXh0Lmxhc3RDaGlsZCwgdGV4dC5sYXN0Q2hpbGQubGVuZ3RoLCB0ZXh0Lmxhc3RDaGlsZCwg dGV4dC5sYXN0Q2hpbGQubGVuZ3RoKSJdOyAvLyBXaWxsIGZvY3VzIDxwPi4KKworICAgIE5TQXJy YXk8X1dLVGV4dElucHV0Q29udGV4dCAqPiAqdGV4dElucHV0Q29udGV4dHMgPSBbd2ViVmlldyBz eW5jaHJvbm91c2x5UmVxdWVzdFRleHRJbnB1dENvbnRleHRzSW5SZWN0Olt3ZWJWaWV3IGZyYW1l XV07CisgICAgRVhQRUNUX0VRKDFVTCwgdGV4dElucHV0Q29udGV4dHMuY291bnQpOworCisgICAg YXV0byByZXF1ZXN0ID0gcmV0YWluUHRyKG1ha2VSZXF1ZXN0KFVJV0tEb2N1bWVudFJlcXVlc3RU ZXh0IHwgVUlXS0RvY3VtZW50UmVxdWVzdFJlY3RzIHwgVUlXS0RvY3VtZW50UmVxdWVzdFNwYXRp YWxBbmRDdXJyZW50U2VsZWN0aW9uLCBVSVRleHRHcmFudWxhcml0eUNoYXJhY3RlciwgMjAwLCBb d2ViVmlldyBmcmFtZV0sIHRleHRJbnB1dENvbnRleHRzWzBdKSk7CisgICAgYXV0byBjb250ZXh0 ID0gcmV0YWluUHRyKFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlSZXF1ZXN0RG9jdW1lbnRDb250ZXh0 OnJlcXVlc3QuZ2V0KCldKTsKKyAgICBhdXRvICp0ZXh0UmVjdHMgPSBbY29udGV4dCB0ZXh0UmVj dHNdOworICAgIEVYUEVDVF9FUSg3VSwgdGV4dFJlY3RzLmNvdW50KTsKKyAgICBpZiAodGV4dFJl Y3RzLmNvdW50ID49IDcpIHsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoMCwgMCwgMjUs IDI1KSwgdGV4dFJlY3RzWzBdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVj dE1ha2UoMjUsIDAsIDI1LCAyNSksIHRleHRSZWN0c1sxXS5DR1JlY3RWYWx1ZSk7CisgICAgICAg IEVYUEVDVF9FUShDR1JlY3RNYWtlKDUwLCAwLCAyNSwgMjUpLCB0ZXh0UmVjdHNbMl0uQ0dSZWN0 VmFsdWUpOworICAgICAgICBFWFBFQ1RfRVEoQ0dSZWN0TWFrZSg3NSwgMCwgMjUsIDI1KSwgdGV4 dFJlY3RzWzNdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoOTks IDAsIDIsIDI1KSwgdGV4dFJlY3RzWzRdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VR KENHUmVjdE1ha2UoMCwgMjUsIDAsIDI1KSwgdGV4dFJlY3RzWzVdLkNHUmVjdFZhbHVlKTsKKyAg ICAgICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoMCwgNTAsIDAsIDI1KSwgdGV4dFJlY3RzWzZdLkNH UmVjdFZhbHVlKTsKKyAgICB9Cit9CisKKwogVEVTVChEb2N1bWVudEVkaXRpbmdDb250ZXh0LCBT cGF0aWFsUmVxdWVzdF9SZWN0RW5jb21wYXNzaW5nSW5wdXQpCiB7CiAgICAgYXV0byB3ZWJWaWV3 ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVj dCgwLCAwLCA5ODAsIDYwMCldKTsK 450461 2022-01-31 14:14:46 -0800 2022-01-31 15:12:55 -0800 Patch for landing bug-235844-20220131141446.patch text/plain 5775 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk4NGY5ZWEyNmFiZDE4MWZk MTRhM2I1YWU5MTMzMmZmYzU5MmM3YmIuLjE1OTE0Y2U0MjU3NmMzYjI0NDkwYjk4Y2FkNGUzNGUy YzBmNjdkNzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDEtMjggIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBDb2xsYXBzZWQgcmFu Z2VzIHJldHVybiB6ZXJvIHJlY3RzIGluIERvY3VtZW50Q29udGV4dAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM1ODQ0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBUZXN0OiBEb2N1bWVudEVkaXRpbmdDb250ZXh0 LlJlY3RzUmVxdWVzdEluQ29udGVudEVkaXRhYmxlV2l0aERpdkJyZWFrcworCisgICAgICAgIFdo ZW4gZ2V0dGluZyB0aGUgRG9jdW1lbnRDb250ZXh0IGZvciBhIGxpbmUsIGZvbGxvd2VkIGJ5IGEg YmxhbmsgbGluZSwgdGhlIGJsYW5rIGxpbmsgd2lsbCAKKyAgICAgICAgYmUgcmVwcmVzZW50ZWQg YnkgYSBjb2xsYXBzZWQgcmFuZ2UuIFRoaXMgaXMgYSByZXN1bHQgb2YgdGhlIGVtaXRDaGFyYWN0 ZXIgY2FsbCBmcm9tIHJlcHJlc2VudE5vZGVPZmZzZXRaZXJvLgorICAgICAgICBUaGlzIHBvc3Np Ymx5IGEgYnVnLCBidXQgcmF0aGVyIHRoYW4gdHJ5IGFuZCBmaXggdGhpcyBpc3N1ZSB3aXRoaW4g VGV4dEl0ZXJhdG9yIGl0c2VsZiwgd2UgYXJlCisgICAgICAgIG1pdGlnYXRpbmcgdGhpcyBpc3N1 ZSBieSBpbnN0ZWFkIG9mIHVzaW5nIHRoZSBjb2xsYXBzZWQgcmFuZ2UgYW5kIHRoZSByZXN1bHRp bmcgbm9uLWV4aXN0ZW50IGNoYXJhY3RlciByZWN0LAorICAgICAgICB1c2luZyB0aGUgY2FyZXQg Ym91bmRpbmcgcmVjdC4gVGhpcyBnaXZlcyB1cyBhIG1vcmUgYWNjdXJhdGUgYm91bmRpbmcgcmVj dCBmb3Igc2l0dWF0aW9ucyBsaWtlCisgICAgICAgIHRoaXMgdGhhdCByZXN1bHQgaW4gY29sbGFw c2VkIHJhbmdlcy4gQW5kIHRoaXMgd291bGQgY292ZXIgYWxsIG90aGVyIHNpdHVhdGlvbnMgdGhh dCBtaWdodCByZXN1bHQgaW4KKyAgICAgICAgYSBjb2xsYXBzZWQgcmFuZ2UgZnJvbSBUZXh0SXRl cmF0b3IuIAorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1t OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXF1ZXN0RG9jdW1lbnRFZGl0aW5nQ29udGV4 dCk6CisKIDIwMjItMDEtMjcgIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgog CiAgICAgICAgIEludHJvZHVjZSBXZWJGb3VuZFRleHRSYW5nZSBhbmQgV2ViRm91bmRUZXh0UmFu Z2VDb250cm9sbGVyIHRvIHN1cHBvcnQgcmVzdG9yYWJsZSBmaW5kIHJlc3VsdHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXgg MzgwNWY1N2NhNTIyNDg4NWY3MTZmZTIwYTk3NTFkZDFiZDI3NzA3My4uMWVkYjVhNDVlYzE4MDA1 OTE4MDI5NDEwNTFhY2YxZTUyODQ1MGM2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTQ1NzEsNyArNDU3MSwxMSBAQCB2 b2lkIFdlYlBhZ2U6OnJlcXVlc3REb2N1bWVudEVkaXRpbmdDb250ZXh0KERvY3VtZW50RWRpdGlu Z0NvbnRleHRSZXF1ZXN0IHJlcXVlcwogICAgICAgICBjb25zdCBpbnQgc3RyaWRlID0gMTsKICAg ICAgICAgd2hpbGUgKCFpdGVyYXRvci5hdEVuZCgpKSB7CiAgICAgICAgICAgICBpZiAoIWl0ZXJh dG9yLnRleHQoKS5pc0VtcHR5KCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvIGFic29sdXRlQm91 bmRpbmdCb3ggPSB1bmlvblJlY3RJZ25vcmluZ1plcm9SZWN0cyhSZW5kZXJPYmplY3Q6OmFic29s dXRlVGV4dFJlY3RzKGl0ZXJhdG9yLnJhbmdlKCksIFJlbmRlck9iamVjdDo6Qm91bmRpbmdSZWN0 QmVoYXZpb3I6Oklnbm9yZUVtcHR5VGV4dFNlbGVjdGlvbnMpKTsKKyAgICAgICAgICAgICAgICBJ bnRSZWN0IGFic29sdXRlQm91bmRpbmdCb3g7CisgICAgICAgICAgICAgICAgaWYgKGl0ZXJhdG9y LnJhbmdlKCkuY29sbGFwc2VkKCkpCisgICAgICAgICAgICAgICAgICAgIGFic29sdXRlQm91bmRp bmdCb3ggPSBWaXNpYmxlUG9zaXRpb24obWFrZUNvbnRhaW5lck9mZnNldFBvc2l0aW9uKGl0ZXJh dG9yLnJhbmdlKCkuc3RhcnQpKS5hYnNvbHV0ZUNhcmV0Qm91bmRzKCk7CisgICAgICAgICAgICAg ICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBhYnNvbHV0ZUJvdW5kaW5nQm94ID0gdW5pb25S ZWN0SWdub3JpbmdaZXJvUmVjdHMoUmVuZGVyT2JqZWN0OjphYnNvbHV0ZVRleHRSZWN0cyhpdGVy YXRvci5yYW5nZSgpLCBSZW5kZXJPYmplY3Q6OkJvdW5kaW5nUmVjdEJlaGF2aW9yOjpJZ25vcmVF bXB0eVRleHRTZWxlY3Rpb25zKSk7CiAgICAgICAgICAgICAgICAgcmVjdHMuYXBwZW5kKHsgaXRl cmF0b3IucmFuZ2UoKS5zdGFydC5kb2N1bWVudCgpLnZpZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3 KGFic29sdXRlQm91bmRpbmdCb3gpLCB7IG9mZnNldFNvRmFyKyssIHN0cmlkZSB9IH0pOwogICAg ICAgICAgICAgfQogICAgICAgICAgICAgaXRlcmF0b3IuYWR2YW5jZShzdHJpZGUpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGE3Yzc0ZGVlMjYw ZjA4NjBkOTA4ZjYwYjc0MWZiNjJkNjI3OWFkNjguLmUxYjJlYzU0MGViZThkYTgwMWE1Y2U2MWM1 Yjc2YWM4YzMyMTkwNWYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wMS0yOCAgTWVnYW4gR2FyZG5lciAgPG1l Z2FuX2dhcmRuZXJAYXBwbGUuY29tPgorCisgICAgICAgIENvbGxhcHNlZCByYW5nZXMgcmV0dXJu IHplcm8gcmVjdHMgaW4gRG9jdW1lbnRDb250ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU4NDQKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb2N1 bWVudEVkaXRpbmdDb250ZXh0Lm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMjItMDEtMjcgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVd W2ExMXldIEFkZCBvcHRpb24gdG8gYnVpbGQgd2l0aCBBVFNQSQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb2N1bWVudEVkaXRpbmdDb250ZXh0Lm1t IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Eb2N1bWVudEVkaXRpbmdD b250ZXh0Lm1tCmluZGV4IDI4YmNjMjQyYjE2ZGNmMjc2ODMwNzMxNzZjN2FkOGViN2UzZjhlMjcu LjYwYzI4NGQ3MWU0ZDQ1MmQyMjZjYWUwODM0MDYzM2Y4NmVlYmI4YmMgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvRG9jdW1lbnRFZGl0aW5nQ29udGV4 dC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0RvY3VtZW50 RWRpdGluZ0NvbnRleHQubW0KQEAgLTUwMCw2ICs1MDAsMzIgQEAgVEVTVChEb2N1bWVudEVkaXRp bmdDb250ZXh0LCBSZWN0c1JlcXVlc3RJbkNvbnRlbnRFZGl0YWJsZSkKICAgICB9CiB9CiAKK1RF U1QoRG9jdW1lbnRFZGl0aW5nQ29udGV4dCwgUmVjdHNSZXF1ZXN0SW5Db250ZW50RWRpdGFibGVX aXRoRGl2QnJlYWtzKQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJW aWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApXSk7CisK KyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6YXBwbHlBaGVtU3R5bGUo QCI8ZGl2IGlkPSd0ZXh0JyBjb250ZW50ZWRpdGFibGU+VGVzdDxkaXY+PGJyPjwvZGl2PjxkaXY+ PGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjwvZGl2PiIpXTsKKyAgICBbd2ViVmlldyBzdHJpbmdC eUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZ2V0U2VsZWN0aW9uKCkuc2V0QmFzZUFuZEV4dGVudCh0 ZXh0Lmxhc3RDaGlsZCwgdGV4dC5sYXN0Q2hpbGQubGVuZ3RoLCB0ZXh0Lmxhc3RDaGlsZCwgdGV4 dC5sYXN0Q2hpbGQubGVuZ3RoKSJdOyAvLyBXaWxsIGZvY3VzIDxwPi4KKworICAgIE5TQXJyYXk8 X1dLVGV4dElucHV0Q29udGV4dCAqPiAqdGV4dElucHV0Q29udGV4dHMgPSBbd2ViVmlldyBzeW5j aHJvbm91c2x5UmVxdWVzdFRleHRJbnB1dENvbnRleHRzSW5SZWN0Olt3ZWJWaWV3IGZyYW1lXV07 CisgICAgRVhQRUNUX0VRKDFVTCwgdGV4dElucHV0Q29udGV4dHMuY291bnQpOworCisgICAgYXV0 byByZXF1ZXN0ID0gcmV0YWluUHRyKG1ha2VSZXF1ZXN0KFVJV0tEb2N1bWVudFJlcXVlc3RUZXh0 IHwgVUlXS0RvY3VtZW50UmVxdWVzdFJlY3RzIHwgVUlXS0RvY3VtZW50UmVxdWVzdFNwYXRpYWxB bmRDdXJyZW50U2VsZWN0aW9uLCBVSVRleHRHcmFudWxhcml0eUNoYXJhY3RlciwgMjAwLCBbd2Vi VmlldyBmcmFtZV0sIHRleHRJbnB1dENvbnRleHRzWzBdKSk7CisgICAgYXV0byBjb250ZXh0ID0g cmV0YWluUHRyKFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlSZXF1ZXN0RG9jdW1lbnRDb250ZXh0OnJl cXVlc3QuZ2V0KCldKTsKKyAgICBhdXRvICp0ZXh0UmVjdHMgPSBbY29udGV4dCB0ZXh0UmVjdHNd OworICAgIEVYUEVDVF9FUSg3VSwgdGV4dFJlY3RzLmNvdW50KTsKKyAgICBpZiAodGV4dFJlY3Rz LmNvdW50ID49IDcpIHsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoMCwgMCwgMjUsIDI1 KSwgdGV4dFJlY3RzWzBdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVjdE1h a2UoMjUsIDAsIDI1LCAyNSksIHRleHRSZWN0c1sxXS5DR1JlY3RWYWx1ZSk7CisgICAgICAgIEVY UEVDVF9FUShDR1JlY3RNYWtlKDUwLCAwLCAyNSwgMjUpLCB0ZXh0UmVjdHNbMl0uQ0dSZWN0VmFs dWUpOworICAgICAgICBFWFBFQ1RfRVEoQ0dSZWN0TWFrZSg3NSwgMCwgMjUsIDI1KSwgdGV4dFJl Y3RzWzNdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoOTksIDAs IDIsIDI1KSwgdGV4dFJlY3RzWzRdLkNHUmVjdFZhbHVlKTsKKyAgICAgICAgRVhQRUNUX0VRKENH UmVjdE1ha2UoMCwgMjUsIDAsIDI1KSwgdGV4dFJlY3RzWzVdLkNHUmVjdFZhbHVlKTsKKyAgICAg ICAgRVhQRUNUX0VRKENHUmVjdE1ha2UoMCwgNTAsIDAsIDI1KSwgdGV4dFJlY3RzWzZdLkNHUmVj dFZhbHVlKTsKKyAgICB9Cit9CisKKwogVEVTVChEb2N1bWVudEVkaXRpbmdDb250ZXh0LCBTcGF0 aWFsUmVxdWVzdF9SZWN0RW5jb21wYXNzaW5nSW5wdXQpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCA5ODAsIDYwMCldKTsK