208658 2020-03-05 12:26:53 -0800 Fix for several failures of LayoutTests in isolated tree mode. 2020-03-05 15:09:48 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white simon.fraser webkit-bug-importer oldest_to_newest 1626230 0 andresg_22 2020-03-05 12:26:53 -0800 Fix for several failures of LayoutTests in isolated tree mode. 1626234 1 392606 andresg_22 2020-03-05 12:32:44 -0800 Created attachment 392606 Patch 1626267 2 392615 andresg_22 2020-03-05 13:23:43 -0800 Created attachment 392615 Patch 1626297 3 commit-queue 2020-03-05 14:29:50 -0800 The commit-queue encountered the following flaky tests while processing attachment 392615: editing/spelling/spellcheck-input-search-crash.html bug 207995 (authors: arv@chromium.org, g.czajkowski@samsung.com, mark.lam@apple.com, and morrita@google.com) The commit-queue is continuing to process your patch. 1626300 4 commit-queue 2020-03-05 14:30:08 -0800 The commit-queue encountered the following flaky tests while processing attachment 392615: editing/spelling/spellcheck-paste-continuous-disabled.html bug 208016 (authors: g.czajkowski@samsung.com and mark.lam@apple.com) The commit-queue is continuing to process your patch. 1626307 5 392615 commit-queue 2020-03-05 14:50:36 -0800 Comment on attachment 392615 Patch Clearing flags on attachment: 392615 Committed r257948: <https://trac.webkit.org/changeset/257948> 1626308 6 commit-queue 2020-03-05 14:50:38 -0800 All reviewed patches have been landed. Closing bug. 1626310 7 webkit-bug-importer 2020-03-05 14:51:27 -0800 <rdar://problem/60101614> 1626318 8 392615 simon.fraser 2020-03-05 15:02:15 -0800 Comment on attachment 392615 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392615&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:830 > + ScrollView* scrollView() const override; Is this called off the main thread? 1626322 9 andresg_22 2020-03-05 15:09:48 -0800 (In reply to Simon Fraser (smfr) from comment #8) > Comment on attachment 392615 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=392615&action=review > > > Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h:830 > > + ScrollView* scrollView() const override; > > Is this called off the main thread? no, it is called in a lambda dispatched to the main thread with: return Accessibility::retrieveAutoreleasedValueFromMainThread<id>(...) The implementation in the IsolatedObject will assert if it is not on the main thread. 392606 2020-03-05 12:32:44 -0800 2020-03-05 13:23:40 -0800 Patch bug-208658-20200305153243.patch text/plain 7967 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IzYzY5YjAxOTY0MDg1 ZTAxNjUzM2YxNDNhNDZjZWY1ZWYzMTRlOC4uNjAzZDAyN2RkMTc2OTRlYTYyOTAzNjNkMjNjOWFl NDcyYzIzZTgxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTA1ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIHNl dmVyYWwgZmFpbHVyZXMgb2YgTGF5b3V0VGVzdHMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NjU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBFeHBvc2VzIHRo ZSBzY3JvbGxWaWV3IG1ldGhvZCB0aHJvdWdoIHRoZSBBWENvcmVPYmplY3QgaW50ZXJmYWNlIHNv CisgICAgICAgIHRoYXQgd3JhcHBlciBjb2RlIGNhbiB1c2UgaXQgZm9yIGJvdGggQVhPYmplY3Rz IGFuZCBJc29sYXRlZE9iamVjdHMuCisgICAgICAgIC0gRml4IGZvciBhIGNyYXNoL2Fzc2VydCB3 aGVyZSBJbnZhbGlkQVhJRCBjYW5ub3QgYmUgcGFzc2VkIGFzIGtleSB0bworICAgICAgICB0aGUg SGFzaE1hcCBtZXRob2RzLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50 ZXJmYWNlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmll dy5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6c2Nyb2xsVmlldyBj b25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdD aGFuZ2VzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXIgc2Nyb2xsVmlld1BhcmVudF0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNob3dDb250ZXh0TWVudV0pOgorCiAyMDIwLTAzLTA1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHBvcnQgTm93UGxh eWluZyBjb21tYW5kcyB0byBHUFVQcm9jZXNzIHdoZW4gbWVkaWEgcGxheWluZyBpbiBHUFVQcm9j ZXNzIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggZDVlYmQ2NDlmMWZkNTIyODkwZjA5NGMyMmJkNjU4ZjEy MmM4ZGI2ZC4uMGZmNGE3MmNjMTczZjk4M2YzMDdkNmY5ZWJmMzA1ZDUyYzAxMDdjNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgK QEAgLTQ2Niw2ICs0NjYsNyBAQCBwdWJsaWM6CiAgICAgRnJhbWUqIGZyYW1lKCkgY29uc3Qgb3Zl cnJpZGU7CiAgICAgRnJhbWUqIG1haW5GcmFtZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIERvY3Vt ZW50KiB0b3BEb2N1bWVudCgpIGNvbnN0IG92ZXJyaWRlOworICAgIFNjcm9sbFZpZXcqIHNjcm9s bFZpZXcoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBudWxscHRyOyB9CiAgICAgU2Nyb2xsVmll dyogc2Nyb2xsVmlld0FuY2VzdG9yKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIGxhbmd1 YWdlKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgLy8gMS1iYXNlZCwgdG8gbWF0Y2ggdGhlIGFyaWEt bGV2ZWwgc3BlYy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggNmIzZDAwYTIyNjAxMjFjMDQ3 NDA3NWQwMWQ1MTVkN2I5MjliYTg5Yy4uYmRiNDkxNDMwZTExYTc1NzI2OTAxMTllYjA1NmRkMzZm M2IyN2Q3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTg3NSw2ICs4NzUsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBGcmFtZSogZnJhbWUoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBG cmFtZSogbWFpbkZyYW1lKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgRG9jdW1lbnQqIHRvcERv Y3VtZW50KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgU2Nyb2xsVmlldyogc2Nyb2xsVmlldygp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXdBbmNlc3Rvcigp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFN0cmluZyBsYW5ndWFnZSgpIGNvbnN0ID0gMDsKICAg ICAvLyAxLWJhc2VkLCB0byBtYXRjaCB0aGUgYXJpYS1sZXZlbCBzcGVjLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oCmlu ZGV4IDg5MjhjZWY1NmI1NDE2MjI5YzI5ZjlhNWE5OWZlZDY1MzhiNzk1MTEuLjA5ZTk0N2Y2YmE3 NmE1ODNjNDAyN2YxZTBhZjk3NWQ0ZGZhNWQyMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmgKQEAgLTM3LDcgKzM3 LDcgQEAgY2xhc3MgQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcgZmluYWwgOiBwdWJsaWMgQWNjZXNz aWJpbGl0eU9iamVjdCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxBY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldz4gY3JlYXRlKFNjcm9sbFZpZXcqKTsKICAgICBBY2Nlc3NpYmlsaXR5Um9sZSByb2xl VmFsdWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6U2Nyb2xs QXJlYTsgfQotICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcoKSBjb25zdCB7IHJldHVybiBtX3Nj cm9sbFZpZXc7IH0KKyAgICBTY3JvbGxWaWV3KiBzY3JvbGxWaWV3KCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gbV9zY3JvbGxWaWV3OyB9CiAKICAgICB2aXJ0dWFsIH5BY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDU0MTA4ZTkxYTFl NDUyYWE5MDlmZGQzODRhZjNkMTViNzVlMjNhYTIuLmYzZDEzZTliNGZlMTg1MDhmOGUyMzU1NGQy ZTQ5YzBlYThjMmQ3ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC0xNjExLDYg KzE2MTEsMTMgQEAgRG9jdW1lbnQqIEFYSXNvbGF0ZWRPYmplY3Q6OnRvcERvY3VtZW50KCkgY29u c3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAorU2Nyb2xsVmlldyogQVhJc29sYXRlZE9iamVj dDo6c2Nyb2xsVmlldygpIGNvbnN0Cit7CisgICAgaWYgKGF1dG8qIG9iamVjdCA9IGFzc29jaWF0 ZWRBWE9iamVjdCgpKQorICAgICAgICByZXR1cm4gb2JqZWN0LT5zY3JvbGxWaWV3KCk7CisgICAg cmV0dXJuIG51bGxwdHI7Cit9CisKIFNjcm9sbFZpZXcqIEFYSXNvbGF0ZWRPYmplY3Q6OnNjcm9s bFZpZXdBbmNlc3RvcigpIGNvbnN0CiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmgKaW5kZXggY2M5OWIwNmMxMDhjZTNhYjJmODkxODg2ZjVmNDg1YjA5 YjIzN2QwMi4uYjljYjMxZmQ0NjU3MDExYjY3YjVjZmIwYWFlZjUxNjRmMGU5Y2Q1OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuaApAQCAtODI3LDYgKzgyNyw3IEBAIHByaXZhdGU6CiAgICAgRnJh bWUqIGZyYW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgRnJhbWUqIG1haW5GcmFtZSgpIGNvbnN0 IG92ZXJyaWRlOwogICAgIERvY3VtZW50KiB0b3BEb2N1bWVudCgpIGNvbnN0IG92ZXJyaWRlOwor ICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcoKSBjb25zdCBvdmVycmlkZTsKICAgICBTY3JvbGxW aWV3KiBzY3JvbGxWaWV3QW5jZXN0b3IoKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIGNoaWxk cmVuQ2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIHZvaWQgdGV4dENoYW5nZWQoKSBvdmVycmlkZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAxNGUwNzhkNTViMTFhODRlNjRlZGIzZjViZDRl OWNkZGQzZmUxNTMwLi40ZmJkYTM1NTZhNDczYTk3YzU4YTgzNGRmNTIzZjAzODUwZjE2YTI0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0yMzYsNiArMjM2LDggQEAgdm9pZCBBWElzb2xh dGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygpCiAKICAgICBmb3IgKGNvbnN0IGF1dG8mIGl0 ZW0gOiBtX3BlbmRpbmdBcHBlbmRzKSB7CiAgICAgICAgIEFYSUQgYXhJRCA9IGl0ZW0ubV9pc29s YXRlZE9iamVjdC0+b2JqZWN0SUQoKTsKKyAgICAgICAgaWYgKGF4SUQgPT0gSW52YWxpZEFYSUQp CisgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAobV9yZWFkZXJUaHJlYWROb2Rl TWFwLmdldChheElEKSAhPSAmaXRlbS5tX2lzb2xhdGVkT2JqZWN0LmdldCgpKSB7CiAgICAgICAg ICAgICAvLyBUaGUgbmV3IElzb2xhdGVkT2JqZWN0IGlzIGEgcmVwbGFjZW1lbnQgZm9yIGFuIGV4 aXN0aW5nIG9iamVjdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRl eCBkY2FlNDg4YmZjYmFkY2QzZmVhOTc1NTgyNDZiYTBmOWI3ZWY4NjAyLi5lMzViNTg0MTdjOTg0 MTU2ZDQ3NjdkZjcwMDFmNjVlMzhlOTY1MzBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlck1hYy5tbQpAQCAtMjI3MSwxNSArMjI3MSwxNiBAQCBBTExPV19ERVBSRUNBVEVEX0RF Q0xBUkFUSU9OU19FTkQKIC0gKGlkKXNjcm9sbFZpZXdQYXJlbnQKIHsKICAgICByZXR1cm4gQWNj ZXNzaWJpbGl0eTo6cmV0cmlldmVBdXRvcmVsZWFzZWRWYWx1ZUZyb21NYWluVGhyZWFkPGlkPihb cHJvdGVjdGVkU2VsZiA9IFJldGFpblB0cjxXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcj4o c2VsZildICgpIC0+IFJldGFpblB0cjxpZD4gewotICAgICAgICBpZiAoIWlzPEFjY2Vzc2liaWxp dHlTY3JvbGxWaWV3Pihwcm90ZWN0ZWRTZWxmLmdldCgpLmF4QmFja2luZ09iamVjdCkpCisgICAg ICAgIGF1dG8qIGJhY2tpbmdPYmplY3QgPSBwcm90ZWN0ZWRTZWxmLmdldCgpLmF4QmFja2luZ09i amVjdDsKKyAgICAgICAgaWYgKCFiYWNraW5nT2JqZWN0IHx8ICFiYWNraW5nT2JqZWN0LT5pc1Nj cm9sbFZpZXcoKSkKICAgICAgICAgICAgIHJldHVybiBuaWw7CiAKICAgICAgICAgLy8gSWYgdGhp cyBzY3JvbGwgdmlldyBwcm92aWRlcyBpdCdzIHBhcmVudCBvYmplY3QgKGJlY2F1c2UgaXQncyBh IHN1Yi1mcmFtZSksIHRoZW4KICAgICAgICAgLy8gd2Ugc2hvdWxkIG5vdCBmaW5kIHRoZSByZW1v dGVBY2Nlc3NpYmlsaXR5UGFyZW50LgotICAgICAgICBpZiAocHJvdGVjdGVkU2VsZi5nZXQoKS5h eEJhY2tpbmdPYmplY3QtPnBhcmVudE9iamVjdCgpKQorICAgICAgICBpZiAoYmFja2luZ09iamVj dC0+cGFyZW50T2JqZWN0KCkpCiAgICAgICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgICAgIFNj cm9sbFZpZXcqIHNjcm9sbCA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3PigqcHJv dGVjdGVkU2VsZi5nZXQoKS5heEJhY2tpbmdPYmplY3QpLnNjcm9sbFZpZXcoKTsKKyAgICAgICAg YXV0byogc2Nyb2xsID0gYmFja2luZ09iamVjdC0+c2Nyb2xsVmlldygpOwogICAgICAgICBpZiAo IXNjcm9sbCkKICAgICAgICAgICAgIHJldHVybiBuaWw7CiAKQEAgLTM0MjEsOCArMzQyMiw4IEBA IEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIGlmIChmcmFtZVZpZXcpIHsK ICAgICAgICAgLy8gRmluZCB0aGUgYXBwcm9wcmlhdGUgc2Nyb2xsIHZpZXcgdG8gdXNlIHRvIGNv bnZlcnQgdGhlIGNvbnRlbnRzIHRvIHRoZSB3aW5kb3cuCiAgICAgICAgIGZvciAoYXV0byogcGFy ZW50ID0gc2VsZi5heEJhY2tpbmdPYmplY3QtPnBhcmVudE9iamVjdCgpOyBwYXJlbnQ7IHBhcmVu dCA9IHBhcmVudC0+cGFyZW50T2JqZWN0KCkpIHsKLSAgICAgICAgICAgIGlmIChpczxBY2Nlc3Np YmlsaXR5U2Nyb2xsVmlldz4oKnBhcmVudCkpIHsKLSAgICAgICAgICAgICAgICBpZiAoYXV0byBz Y3JvbGxWaWV3ID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc+KCpwYXJlbnQpLnNj cm9sbFZpZXcoKSkgeworICAgICAgICAgICAgaWYgKHBhcmVudC0+aXNTY3JvbGxWaWV3KCkpIHsK KyAgICAgICAgICAgICAgICBpZiAoYXV0byogc2Nyb2xsVmlldyA9IHBhcmVudC0+c2Nyb2xsVmll dygpKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmICghZnJhbWVWaWV3LT5wbGF0Zm9ybVdpZGdl dCgpKQogICAgICAgICAgICAgICAgICAgICAgICAgcmVjdCA9IHNjcm9sbFZpZXctPmNvbnRlbnRz VG9Sb290VmlldyhyZWN0KTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQo= 392615 2020-03-05 13:23:43 -0800 2020-03-05 14:50:36 -0800 Patch bug-208658-20200305162342.patch text/plain 8353 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3OTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IzYzY5YjAxOTY0MDg1 ZTAxNjUzM2YxNDNhNDZjZWY1ZWYzMTRlOC4uNWE1NDVlMDY3ZWFjNTQ2MmNjZTAyOTllNWRhYTkw YmQ0OGQ0ZmNiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTAzLTA1ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIHNl dmVyYWwgZmFpbHVyZXMgb2YgTGF5b3V0VGVzdHMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NjU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgLSBFeHBvc2VzIHRo ZSBzY3JvbGxWaWV3IG1ldGhvZCB0aHJvdWdoIHRoZSBBWENvcmVPYmplY3QgaW50ZXJmYWNlIHNv CisgICAgICAgIHRoYXQgd3JhcHBlciBjb2RlIGNhbiB1c2UgaXQgZm9yIGJvdGggQVhPYmplY3Rz IGFuZCBJc29sYXRlZE9iamVjdHMuCisgICAgICAgIC0gRml4IGZvciBhIGNyYXNoL2Fzc2VydCB3 aGVyZSBJbnZhbGlkQVhJRCBjYW5ub3QgYmUgcGFzc2VkIGFzIGtleSB0bworICAgICAgICB0aGUg SGFzaE1hcCBtZXRob2RzLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50 ZXJmYWNlLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmll dy5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZE9iamVjdDo6c2Nyb2xsVmlldyBj b25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9i amVjdC5oOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdD aGFuZ2VzKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXIgc2Nyb2xsVmlld1BhcmVudF0pOgorICAgICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBfYWNjZXNzaWJpbGl0eVNob3dDb250ZXh0TWVudV0pOgorCiAyMDIwLTAzLTA1ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHBvcnQgTm93UGxh eWluZyBjb21tYW5kcyB0byBHUFVQcm9jZXNzIHdoZW4gbWVkaWEgcGxheWluZyBpbiBHUFVQcm9j ZXNzIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggZDVlYmQ2NDlmMWZkNTIyODkwZjA5NGMyMmJkNjU4ZjEy MmM4ZGI2ZC4uMGZmNGE3MmNjMTczZjk4M2YzMDdkNmY5ZWJmMzA1ZDUyYzAxMDdjNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgK QEAgLTQ2Niw2ICs0NjYsNyBAQCBwdWJsaWM6CiAgICAgRnJhbWUqIGZyYW1lKCkgY29uc3Qgb3Zl cnJpZGU7CiAgICAgRnJhbWUqIG1haW5GcmFtZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIERvY3Vt ZW50KiB0b3BEb2N1bWVudCgpIGNvbnN0IG92ZXJyaWRlOworICAgIFNjcm9sbFZpZXcqIHNjcm9s bFZpZXcoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBudWxscHRyOyB9CiAgICAgU2Nyb2xsVmll dyogc2Nyb2xsVmlld0FuY2VzdG9yKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgU3RyaW5nIGxhbmd1 YWdlKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgLy8gMS1iYXNlZCwgdG8gbWF0Y2ggdGhlIGFyaWEt bGV2ZWwgc3BlYy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKaW5kZXggNmIzZDAwYTIyNjAxMjFjMDQ3 NDA3NWQwMWQ1MTVkN2I5MjliYTg5Yy4uYmRiNDkxNDMwZTExYTc1NzI2OTAxMTllYjA1NmRkMzZm M2IyN2Q3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5T2JqZWN0SW50ZXJmYWNlLmgKQEAgLTg3NSw2ICs4NzUsNyBAQCBwdWJs aWM6CiAgICAgdmlydHVhbCBGcmFtZSogZnJhbWUoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBG cmFtZSogbWFpbkZyYW1lKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgRG9jdW1lbnQqIHRvcERv Y3VtZW50KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgU2Nyb2xsVmlldyogc2Nyb2xsVmlldygp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXdBbmNlc3Rvcigp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFN0cmluZyBsYW5ndWFnZSgpIGNvbnN0ID0gMDsKICAg ICAvLyAxLWJhc2VkLCB0byBtYXRjaCB0aGUgYXJpYS1sZXZlbCBzcGVjLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5oCmlu ZGV4IDg5MjhjZWY1NmI1NDE2MjI5YzI5ZjlhNWE5OWZlZDY1MzhiNzk1MTEuLjA5ZTk0N2Y2YmE3 NmE1ODNjNDAyN2YxZTBhZjk3NWQ0ZGZhNWQyMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmgKQEAgLTM3LDcgKzM3 LDcgQEAgY2xhc3MgQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcgZmluYWwgOiBwdWJsaWMgQWNjZXNz aWJpbGl0eU9iamVjdCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxBY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldz4gY3JlYXRlKFNjcm9sbFZpZXcqKTsKICAgICBBY2Nlc3NpYmlsaXR5Um9sZSByb2xl VmFsdWUoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBBY2Nlc3NpYmlsaXR5Um9sZTo6U2Nyb2xs QXJlYTsgfQotICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcoKSBjb25zdCB7IHJldHVybiBtX3Nj cm9sbFZpZXc7IH0KKyAgICBTY3JvbGxWaWV3KiBzY3JvbGxWaWV3KCkgY29uc3Qgb3ZlcnJpZGUg eyByZXR1cm4gbV9zY3JvbGxWaWV3OyB9CiAKICAgICB2aXJ0dWFsIH5BY2Nlc3NpYmlsaXR5U2Ny b2xsVmlldygpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDU0MTA4ZTkxYTFl NDUyYWE5MDlmZGQzODRhZjNkMTViNzVlMjNhYTIuLmYzZDEzZTliNGZlMTg1MDhmOGUyMzU1NGQy ZTQ5YzBlYThjMmQ3ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC0xNjExLDYg KzE2MTEsMTMgQEAgRG9jdW1lbnQqIEFYSXNvbGF0ZWRPYmplY3Q6OnRvcERvY3VtZW50KCkgY29u c3QKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAorU2Nyb2xsVmlldyogQVhJc29sYXRlZE9iamVj dDo6c2Nyb2xsVmlldygpIGNvbnN0Cit7CisgICAgaWYgKGF1dG8qIG9iamVjdCA9IGFzc29jaWF0 ZWRBWE9iamVjdCgpKQorICAgICAgICByZXR1cm4gb2JqZWN0LT5zY3JvbGxWaWV3KCk7CisgICAg cmV0dXJuIG51bGxwdHI7Cit9CisKIFNjcm9sbFZpZXcqIEFYSXNvbGF0ZWRPYmplY3Q6OnNjcm9s bFZpZXdBbmNlc3RvcigpIGNvbnN0CiB7CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmgKaW5kZXggY2M5OWIwNmMxMDhjZTNhYjJmODkxODg2ZjVmNDg1YjA5 YjIzN2QwMi4uYjljYjMxZmQ0NjU3MDExYjY3YjVjZmIwYWFlZjUxNjRmMGU5Y2Q1OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRPYmplY3QuaApAQCAtODI3LDYgKzgyNyw3IEBAIHByaXZhdGU6CiAgICAgRnJh bWUqIGZyYW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgRnJhbWUqIG1haW5GcmFtZSgpIGNvbnN0 IG92ZXJyaWRlOwogICAgIERvY3VtZW50KiB0b3BEb2N1bWVudCgpIGNvbnN0IG92ZXJyaWRlOwor ICAgIFNjcm9sbFZpZXcqIHNjcm9sbFZpZXcoKSBjb25zdCBvdmVycmlkZTsKICAgICBTY3JvbGxW aWV3KiBzY3JvbGxWaWV3QW5jZXN0b3IoKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIGNoaWxk cmVuQ2hhbmdlZCgpIG92ZXJyaWRlOwogICAgIHZvaWQgdGV4dENoYW5nZWQoKSBvdmVycmlkZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAxNGUwNzhkNTViMTFhODRlNjRlZGIzZjViZDRl OWNkZGQzZmUxNTMwLi5iZGRhZTI5YzQ2NjFjNzY0MDg3MjE3NzViZTZjZjY0MjhmZWY2ODhmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC0yMjgsNiArMjI4LDkgQEAgdm9pZCBBWElzb2xh dGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygpCiAgICAgbV9mb2N1c2VkTm9kZUlEID0gbV9w ZW5kaW5nRm9jdXNlZE5vZGVJRDsKIAogICAgIGZvciAoY29uc3QgYXV0byYgYXhJRCA6IG1fcGVu ZGluZ1JlbW92YWxzKSB7CisgICAgICAgIGlmIChheElEID09IEludmFsaWRBWElEKQorICAgICAg ICAgICAgY29udGludWU7CisKICAgICAgICAgaWYgKGF1dG8gb2JqZWN0ID0gbm9kZUZvcklEKGF4 SUQpKQogICAgICAgICAgICAgb2JqZWN0LT5kZXRhY2goQWNjZXNzaWJpbGl0eURldGFjaG1lbnRU eXBlOjpFbGVtZW50RGVzdHJveWVkKTsKICAgICAgICAgbV9yZWFkZXJUaHJlYWROb2RlTWFwLnJl bW92ZShheElEKTsKQEAgLTIzNiw2ICsyMzksOCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBs eVBlbmRpbmdDaGFuZ2VzKCkKIAogICAgIGZvciAoY29uc3QgYXV0byYgaXRlbSA6IG1fcGVuZGlu Z0FwcGVuZHMpIHsKICAgICAgICAgQVhJRCBheElEID0gaXRlbS5tX2lzb2xhdGVkT2JqZWN0LT5v YmplY3RJRCgpOworICAgICAgICBpZiAoYXhJRCA9PSBJbnZhbGlkQVhJRCkKKyAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChtX3JlYWRlclRocmVhZE5vZGVNYXAuZ2V0KGF4SUQp ICE9ICZpdGVtLm1faXNvbGF0ZWRPYmplY3QuZ2V0KCkpIHsKICAgICAgICAgICAgIC8vIFRoZSBu ZXcgSXNvbGF0ZWRPYmplY3QgaXMgYSByZXBsYWNlbWVudCBmb3IgYW4gZXhpc3Rpbmcgb2JqZWN0 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCmluZGV4IGRjYWU0ODhiZmNi YWRjZDNmZWE5NzU1ODI0NmJhMGY5YjdlZjg2MDIuLmUzNWI1ODQxN2M5ODQxNTZkNDc2N2RmNzAw MWY2NWUzOGU5NjUzMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1t CkBAIC0yMjcxLDE1ICsyMjcxLDE2IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VO RAogLSAoaWQpc2Nyb2xsVmlld1BhcmVudAogewogICAgIHJldHVybiBBY2Nlc3NpYmlsaXR5Ojpy ZXRyaWV2ZUF1dG9yZWxlYXNlZFZhbHVlRnJvbU1haW5UaHJlYWQ8aWQ+KFtwcm90ZWN0ZWRTZWxm ID0gUmV0YWluUHRyPFdlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyPihzZWxmKV0gKCkgLT4g UmV0YWluUHRyPGlkPiB7Ci0gICAgICAgIGlmICghaXM8QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc+ KHByb3RlY3RlZFNlbGYuZ2V0KCkuYXhCYWNraW5nT2JqZWN0KSkKKyAgICAgICAgYXV0byogYmFj a2luZ09iamVjdCA9IHByb3RlY3RlZFNlbGYuZ2V0KCkuYXhCYWNraW5nT2JqZWN0OworICAgICAg ICBpZiAoIWJhY2tpbmdPYmplY3QgfHwgIWJhY2tpbmdPYmplY3QtPmlzU2Nyb2xsVmlldygpKQog ICAgICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgICAgICAvLyBJZiB0aGlzIHNjcm9sbCB2aWV3 IHByb3ZpZGVzIGl0J3MgcGFyZW50IG9iamVjdCAoYmVjYXVzZSBpdCdzIGEgc3ViLWZyYW1lKSwg dGhlbgogICAgICAgICAvLyB3ZSBzaG91bGQgbm90IGZpbmQgdGhlIHJlbW90ZUFjY2Vzc2liaWxp dHlQYXJlbnQuCi0gICAgICAgIGlmIChwcm90ZWN0ZWRTZWxmLmdldCgpLmF4QmFja2luZ09iamVj dC0+cGFyZW50T2JqZWN0KCkpCisgICAgICAgIGlmIChiYWNraW5nT2JqZWN0LT5wYXJlbnRPYmpl Y3QoKSkKICAgICAgICAgICAgIHJldHVybiBuaWw7CiAKLSAgICAgICAgU2Nyb2xsVmlldyogc2Ny b2xsID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eVNjcm9sbFZpZXc+KCpwcm90ZWN0ZWRTZWxmLmdl dCgpLmF4QmFja2luZ09iamVjdCkuc2Nyb2xsVmlldygpOworICAgICAgICBhdXRvKiBzY3JvbGwg PSBiYWNraW5nT2JqZWN0LT5zY3JvbGxWaWV3KCk7CiAgICAgICAgIGlmICghc2Nyb2xsKQogICAg ICAgICAgICAgcmV0dXJuIG5pbDsKIApAQCAtMzQyMSw4ICszNDIyLDggQEAgQUxMT1dfREVQUkVD QVRFRF9ERUNMQVJBVElPTlNfRU5ECiAgICAgaWYgKGZyYW1lVmlldykgewogICAgICAgICAvLyBG aW5kIHRoZSBhcHByb3ByaWF0ZSBzY3JvbGwgdmlldyB0byB1c2UgdG8gY29udmVydCB0aGUgY29u dGVudHMgdG8gdGhlIHdpbmRvdy4KICAgICAgICAgZm9yIChhdXRvKiBwYXJlbnQgPSBzZWxmLmF4 QmFja2luZ09iamVjdC0+cGFyZW50T2JqZWN0KCk7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5w YXJlbnRPYmplY3QoKSkgewotICAgICAgICAgICAgaWYgKGlzPEFjY2Vzc2liaWxpdHlTY3JvbGxW aWV3PigqcGFyZW50KSkgewotICAgICAgICAgICAgICAgIGlmIChhdXRvIHNjcm9sbFZpZXcgPSBk b3duY2FzdDxBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldz4oKnBhcmVudCkuc2Nyb2xsVmlldygpKSB7 CisgICAgICAgICAgICBpZiAocGFyZW50LT5pc1Njcm9sbFZpZXcoKSkgeworICAgICAgICAgICAg ICAgIGlmIChhdXRvKiBzY3JvbGxWaWV3ID0gcGFyZW50LT5zY3JvbGxWaWV3KCkpIHsKICAgICAg ICAgICAgICAgICAgICAgaWYgKCFmcmFtZVZpZXctPnBsYXRmb3JtV2lkZ2V0KCkpCiAgICAgICAg ICAgICAgICAgICAgICAgICByZWN0ID0gc2Nyb2xsVmlldy0+Y29udGVudHNUb1Jvb3RWaWV3KHJl Y3QpOwogICAgICAgICAgICAgICAgICAgICBlbHNlCg==