209336 2020-03-20 07:26:43 -0700 Fix for retrieving focus in isolated tree mode. 2020-03-20 11:51:20 -0700 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 dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1632072 0 andresg_22 2020-03-20 07:26:43 -0700 Fix for retrieving focus in isolated tree mode. 1632078 1 394082 andresg_22 2020-03-20 07:44:15 -0700 Created attachment 394082 Patch 1632159 2 394082 cfleizach 2020-03-20 10:27:05 -0700 Comment on attachment 394082 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394082&action=review > Source/WebCore/ChangeLog:8 > + Focused object request can come on the secondary thread before the request > requests > Source/WebCore/ChangeLog:10 > + needs to generated the isolated tree if it doesn't exist, similar to generated > generate 1632163 3 394100 andresg_22 2020-03-20 10:32:58 -0700 Created attachment 394100 Patch 1632164 4 andresg_22 2020-03-20 10:34:47 -0700 (In reply to chris fleizach from comment #2) > Comment on attachment 394082 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394082&action=review > > > Source/WebCore/ChangeLog:8 > > + Focused object request can come on the secondary thread before the > > request > requests Fixed. > > > Source/WebCore/ChangeLog:10 > > + needs to generated the isolated tree if it doesn't exist, similar to > > generated > generate Fixed. Thanks. 1632191 5 ews-feeder 2020-03-20 11:50:06 -0700 Committed r258776: <https://trac.webkit.org/changeset/258776> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394100. 1632192 6 webkit-bug-importer 2020-03-20 11:51:20 -0700 <rdar://problem/60696983> 394082 2020-03-20 07:44:15 -0700 2020-03-20 10:32:56 -0700 Patch bug-209336-20200320104414.patch text/plain 6704 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ4NTQyODM4YTJiZDY0 N2UxZTUyNjQ5ZjUyNjhiZGMzYjMzNzllNy4uNWY5NDNhMmE5NDc3NTBmNzJjZmU5NmE3YThkY2Ew ZGNlZTgyYTIwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTIwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIHJl dHJpZXZpbmcgZm9jdXMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MzM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9jdXNlZCBvYmplY3QgcmVxdWVzdCBjYW4g Y29tZSBvbiB0aGUgc2Vjb25kYXJ5IHRocmVhZCBiZWZvcmUgdGhlCisgICAgICAgIGlzb2xhdGVk IHRyZWUgaGFzIGJlZW4gZ2VuZXJhdGVkLiBUaHVzLCBBWE9iamVjdENhY2hlOjppc29sYXRlZFRy ZWVGb2N1c2VkT2JqZWN0CisgICAgICAgIG5lZWRzIHRvIGdlbmVyYXRlZCB0aGUgaXNvbGF0ZWQg dHJlZSBpZiBpdCBkb2Vzbid0IGV4aXN0LCBzaW1pbGFyIHRvCisgICAgICAgIGlzb2xhdGVkVHJl ZVJvb3RPYmplY3QuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlRm9jdXNlZE9i amVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpmb2N1c2VkVUlFbGVtZW50 Rm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZUlz b2xhdGVkVHJlZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjppc29s YXRlZFRyZWVSb290T2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmZvY3VzZWRVSUVs ZW1lbnQgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmg6CisgICAgICAgIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgd2Fzbid0IGJlaW5n IGluaXRpYWxpemVkLCB3aGljaCB3YXMgY2F1c2luZworICAgICAgICByYW5kb20gY3Jhc2hlcyB3 aGVuIGFjY2Vzc2luZyB0aGUgSGFzaE1hcCBvZiBpc29sYXRlZCBvYmplY3RzIGZvciBhCisgICAg ICAgIHNwdXJpb3VzIEFYSUQuCisKIDIwMjAtMDMtMTkgIEFuZHJlcyBHb256YWxleiAgPGFuZHJl c2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBjYWNoaW5nIG9mIGlzT25TY3JlZW4g c2luY2UgaXQgaXMgbm90IHVzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcAppbmRleCBjNjg4NTc5YzdiOGNmNDcyNzM5ZWY0NDFkOTY4NjY4ZmIw OTg1Yzk4Li42NjcxMzMwYzZjYTVkM2MyYjcwMGU3Njc1ODEzMmViMTBjYzg0MjVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTM4Miwx OSArMzgyLDkgQEAgQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0KERv Y3VtZW50JiBkb2N1bWVudCkKIH0KIAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVE X1RSRUUpCi1BWENvcmVPYmplY3QqIEFYT2JqZWN0Q2FjaGU6Omlzb2xhdGVkVHJlZUZvY3VzZWRP YmplY3QoRG9jdW1lbnQmIGRvY3VtZW50KQorQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpp c29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCkKIHsKLSAgICBhdXRvIHBhZ2VJRCA9IGRvY3VtZW50 LnBhZ2VJRCgpOwotICAgIGlmICghcGFnZUlEKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQot ICAgIGF1dG8gdHJlZSA9IEFYSXNvbGF0ZWRUcmVlOjp0cmVlRm9yUGFnZUlEKCpwYWdlSUQpOwot ICAgIGlmICghdHJlZSkgewotICAgICAgICB0cmVlID0gZ2VuZXJhdGVJc29sYXRlZFRyZWUoKnBh Z2VJRCwgZG9jdW1lbnQpOwotICAgICAgICBpbml0aWFsaXplU2Vjb25kYXJ5QVhUaHJlYWQoKTsK LSAgICB9Ci0KLSAgICBpZiAodHJlZSkKKyAgICBpZiAoYXV0byB0cmVlID0gZ2V0T3JDcmVhdGVJ c29sYXRlZFRyZWUoKSkKICAgICAgICAgcmV0dXJuIHRyZWUtPmZvY3VzZWRVSUVsZW1lbnQoKS5n ZXQoKTsKIAogICAgIC8vIFNob3VsZCBub3QgZ2V0IGhlcmUsIGNvdWxkbid0IGNyZWF0ZSB0aGUg SXNvbGF0ZWRUcmVlLgpAQCAtNDIxLDYgKzQxMSwxMSBAQCBBWENvcmVPYmplY3QqIEFYT2JqZWN0 Q2FjaGU6OmZvY3VzZWRVSUVsZW1lbnRGb3JQYWdlKGNvbnN0IFBhZ2UqIHBhZ2UpCiAgICAgaWYg KCFnQWNjZXNzaWJpbGl0eUVuYWJsZWQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisjaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKyAgICBpZiAoaXNJc29sYXRlZFRy ZWVFbmFibGVkKCkpCisgICAgICAgIHJldHVybiBpc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCk7 CisjZW5kaWYKKwogICAgIC8vIGdldCB0aGUgZm9jdXNlZCBub2RlIGluIHRoZSBwYWdlCiAgICAg RG9jdW1lbnQqIGZvY3VzZWREb2N1bWVudCA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3Vz ZWRPck1haW5GcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgaWYgKCFmb2N1c2VkRG9jdW1lbnQpCkBA IC00MjgsMTEgKzQyMyw2IEBAIEFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6Zm9jdXNlZFVJ RWxlbWVudEZvclBhZ2UoY29uc3QgUGFnZSogcGFnZSkKIAogICAgIGZvY3VzZWREb2N1bWVudC0+ dXBkYXRlU3R5bGVJZk5lZWRlZCgpOwogCi0jaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFU RURfVFJFRSkKLSAgICBpZiAoaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAgIHJldHVy biBpc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCpmb2N1c2VkRG9jdW1lbnQpOwotI2VuZGlmCi0K ICAgICByZXR1cm4gZm9jdXNlZE9iamVjdCgqZm9jdXNlZERvY3VtZW50KTsKIH0KIApAQCAtNzUz LDcgKzc0Myw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aW5pdGlhbGl6ZVNlY29uZGFyeUFYVGhy ZWFkKCkKICAgICAgICAgX0FYVUlFbGVtZW50VXNlU2Vjb25kYXJ5QVhUaHJlYWQodHJ1ZSk7CiB9 CiAKLUFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgp CitSZWZQdHI8QVhJc29sYXRlZFRyZWU+IEFYT2JqZWN0Q2FjaGU6OmdldE9yQ3JlYXRlSXNvbGF0 ZWRUcmVlKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGFnZUlEKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKQEAgLTc2Niw3ICs3NTYsMTIgQEAgQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpp c29sYXRlZFRyZWVSb290T2JqZWN0KCkKICAgICAgICAgQVhPYmplY3RDYWNoZTo6aW5pdGlhbGl6 ZVNlY29uZGFyeUFYVGhyZWFkKCk7CiAgICAgfQogCi0gICAgaWYgKHRyZWUpCisgICAgcmV0dXJu IHRyZWU7Cit9CisKK0FYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlUm9v dE9iamVjdCgpCit7CisgICAgaWYgKGF1dG8gdHJlZSA9IGdldE9yQ3JlYXRlSXNvbGF0ZWRUcmVl KCkpCiAgICAgICAgIHJldHVybiB0cmVlLT5yb290Tm9kZSgpLmdldCgpOwogCiAgICAgLy8gU2hv dWxkIG5vdCBnZXQgaGVyZSwgY291bGRuJ3QgY3JlYXRlIHRoZSBJc29sYXRlZFRyZWUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCmluZGV4IDcwNmRhMDg3 NWU1OTk5OGYyNzJhNGE4YjgyOTkzMDVkNzYyNDY1NzMuLjk3ZjA3NzBhYTY4MDdhOWMzNDUxMzRh ZDI2ZTlmMGNkZTM3ZTBmNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5oCkBAIC0xNDMsNyArMTQzLDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IEFY T2JqZWN0Q2FjaGUoRG9jdW1lbnQmKTsKICAgICB+QVhPYmplY3RDYWNoZSgpOwogCi0gICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIEFYQ29yZU9iamVjdCogZm9jdXNlZFVJRWxlbWVudEZvclBhZ2Uo Y29uc3QgUGFnZSopOworICAgIFdFQkNPUkVfRVhQT1JUIEFYQ29yZU9iamVjdCogZm9jdXNlZFVJ RWxlbWVudEZvclBhZ2UoY29uc3QgUGFnZSopOwogCiAgICAgLy8gUmV0dXJucyB0aGUgcm9vdCBv YmplY3QgZm9yIHRoZSBlbnRpcmUgZG9jdW1lbnQuCiAgICAgV0VCQ09SRV9FWFBPUlQgQVhDb3Jl T2JqZWN0KiByb290T2JqZWN0KCk7CkBAIC0zNTYsOCArMzU2LDkgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBzdGF0aWMgYm9vbCBjbGllbnRTdXBwb3J0c0lzb2xhdGVkVHJlZSgpOwogICAgIEFY Q29yZU9iamVjdCogaXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgpOwotICAgIHN0YXRpYyBBWENvcmVP YmplY3QqIGlzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoRG9jdW1lbnQmKTsKKyAgICBBWENvcmVP YmplY3QqIGlzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoKTsKICAgICB2b2lkIHNldElzb2xhdGVk VHJlZUZvY3VzZWRPYmplY3QoTm9kZSopOworICAgIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gZ2V0 T3JDcmVhdGVJc29sYXRlZFRyZWUoKSBjb25zdDsKICAgICBzdGF0aWMgUmVmPEFYSXNvbGF0ZWRU cmVlPiBnZW5lcmF0ZUlzb2xhdGVkVHJlZShQYWdlSWRlbnRpZmllciwgRG9jdW1lbnQmKTsKICAg ICB2b2lkIHVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3QqLCBBWE5vdGlmaWNhdGlvbik7 CiAgICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNlY29uZGFyeUFYVGhyZWFkKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDRkNGYxZWY1ODUyNGY0ZGQ2ODdlYWVjYTFiNjU0Yjgw YmFiNTg2ZDMuLmE0ZDMxZDVmYzg0ZTgzODNhZWZkOTUzNDJmZTRiYzU3YTI3MzAwNmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC01ODQsOSArNTg0LDcgQEAgdm9pZCBBWElzb2xh dGVkT2JqZWN0OjptYXRoUG9zdHNjcmlwdHMoQWNjZXNzaWJpbGl0eU1hdGhNdWx0aXNjcmlwdFBh aXJzJiBwYWlycykKIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojpmb2N1c2VkVUlF bGVtZW50KCkgY29uc3QKIHsKLSAgICBpZiAoYXV0byBmb2N1c2VkRWxlbWVudCA9IHRyZWUoKS0+ Zm9jdXNlZFVJRWxlbWVudCgpKQotICAgICAgICByZXR1cm4gZm9jdXNlZEVsZW1lbnQuZ2V0KCk7 Ci0gICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHRyZWUoKS0+Zm9jdXNlZFVJRWxlbWVu dCgpLmdldCgpOwogfQogICAgIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0OjpwYXJl bnRPYmplY3RVbmlnbm9yZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggMTExZWU3 ZDg4NDM2MjA1ODI3OWM2YzllMGRjNWNhYmU3YjdiODAyOC4uMTRkOTFiNDBjNDdjMWRjNGMwNDdh YmQzMzJhYzEwYWMxYzdiOTk4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCkBAIC0xMDIsNyArMTAy LDcgQEAgcHJpdmF0ZToKICAgICAvLyBXcml0dGVuIHRvIGJ5IG1haW4gdGhyZWFkIHVuZGVyIGxv Y2ssIGFjY2Vzc2VkIGFuZCBhcHBsaWVkIGJ5IEFYIHRocmVhZC4KICAgICBWZWN0b3I8Tm9kZUNo YW5nZT4gbV9wZW5kaW5nQXBwZW5kczsKICAgICBWZWN0b3I8QVhJRD4gbV9wZW5kaW5nUmVtb3Zh bHM7Ci0gICAgQVhJRCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlEOworICAgIEFYSUQgbV9wZW5kaW5n Rm9jdXNlZE5vZGVJRCB7IEludmFsaWRBWElEIH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7 CiAKICAgICBBWElzb2xhdGVkVHJlZUlEIG1fdHJlZUlEOwo= 394100 2020-03-20 10:32:58 -0700 2020-03-20 11:50:06 -0700 Patch bug-209336-20200320133257.patch text/plain 6704 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGQ4NTQyODM4YTJiZDY0 N2UxZTUyNjQ5ZjUyNjhiZGMzYjMzNzllNy4uMzEwMjU2YjI5ZDUzMWNhYzNkMzgxMmRmMWFiNDFi OTg2ZjEzOGNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAzLTIwICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggZm9yIHJl dHJpZXZpbmcgZm9jdXMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5MzM2CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9jdXNlZCBvYmplY3QgcmVxdWVzdHMgY2Fu IGNvbWUgb24gdGhlIHNlY29uZGFyeSB0aHJlYWQgYmVmb3JlIHRoZQorICAgICAgICBpc29sYXRl ZCB0cmVlIGhhcyBiZWVuIGdlbmVyYXRlZC4gVGh1cywgQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRU cmVlRm9jdXNlZE9iamVjdAorICAgICAgICBuZWVkcyB0byBnZW5lcmF0ZSB0aGUgaXNvbGF0ZWQg dHJlZSBpZiBpdCBkb2Vzbid0IGV4aXN0LCBzaW1pbGFyIHRvCisgICAgICAgIGlzb2xhdGVkVHJl ZVJvb3RPYmplY3QuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlRm9jdXNlZE9i amVjdCk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpmb2N1c2VkVUlFbGVtZW50 Rm9yUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZUlz b2xhdGVkVHJlZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjppc29s YXRlZFRyZWVSb290T2JqZWN0KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmZvY3VzZWRVSUVs ZW1lbnQgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmg6CisgICAgICAgIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgd2Fzbid0IGJlaW5n IGluaXRpYWxpemVkLCB3aGljaCB3YXMgY2F1c2luZworICAgICAgICByYW5kb20gY3Jhc2hlcyB3 aGVuIGFjY2Vzc2luZyB0aGUgSGFzaE1hcCBvZiBpc29sYXRlZCBvYmplY3RzIGZvciBhCisgICAg ICAgIHNwdXJpb3VzIEFYSUQuCisKIDIwMjAtMDMtMTkgIEFuZHJlcyBHb256YWxleiAgPGFuZHJl c2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBjYWNoaW5nIG9mIGlzT25TY3JlZW4g c2luY2UgaXQgaXMgbm90IHVzZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcAppbmRleCBjNjg4NTc5YzdiOGNmNDcyNzM5ZWY0NDFkOTY4NjY4ZmIw OTg1Yzk4Li42NjcxMzMwYzZjYTVkM2MyYjcwMGU3Njc1ODEzMmViMTBjYzg0MjVhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTM4Miwx OSArMzgyLDkgQEAgQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkT2JqZWN0KERv Y3VtZW50JiBkb2N1bWVudCkKIH0KIAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVE X1RSRUUpCi1BWENvcmVPYmplY3QqIEFYT2JqZWN0Q2FjaGU6Omlzb2xhdGVkVHJlZUZvY3VzZWRP YmplY3QoRG9jdW1lbnQmIGRvY3VtZW50KQorQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpp c29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCkKIHsKLSAgICBhdXRvIHBhZ2VJRCA9IGRvY3VtZW50 LnBhZ2VJRCgpOwotICAgIGlmICghcGFnZUlEKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQot ICAgIGF1dG8gdHJlZSA9IEFYSXNvbGF0ZWRUcmVlOjp0cmVlRm9yUGFnZUlEKCpwYWdlSUQpOwot ICAgIGlmICghdHJlZSkgewotICAgICAgICB0cmVlID0gZ2VuZXJhdGVJc29sYXRlZFRyZWUoKnBh Z2VJRCwgZG9jdW1lbnQpOwotICAgICAgICBpbml0aWFsaXplU2Vjb25kYXJ5QVhUaHJlYWQoKTsK LSAgICB9Ci0KLSAgICBpZiAodHJlZSkKKyAgICBpZiAoYXV0byB0cmVlID0gZ2V0T3JDcmVhdGVJ c29sYXRlZFRyZWUoKSkKICAgICAgICAgcmV0dXJuIHRyZWUtPmZvY3VzZWRVSUVsZW1lbnQoKS5n ZXQoKTsKIAogICAgIC8vIFNob3VsZCBub3QgZ2V0IGhlcmUsIGNvdWxkbid0IGNyZWF0ZSB0aGUg SXNvbGF0ZWRUcmVlLgpAQCAtNDIxLDYgKzQxMSwxMSBAQCBBWENvcmVPYmplY3QqIEFYT2JqZWN0 Q2FjaGU6OmZvY3VzZWRVSUVsZW1lbnRGb3JQYWdlKGNvbnN0IFBhZ2UqIHBhZ2UpCiAgICAgaWYg KCFnQWNjZXNzaWJpbGl0eUVuYWJsZWQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCisjaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKyAgICBpZiAoaXNJc29sYXRlZFRy ZWVFbmFibGVkKCkpCisgICAgICAgIHJldHVybiBpc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCk7 CisjZW5kaWYKKwogICAgIC8vIGdldCB0aGUgZm9jdXNlZCBub2RlIGluIHRoZSBwYWdlCiAgICAg RG9jdW1lbnQqIGZvY3VzZWREb2N1bWVudCA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3Vz ZWRPck1haW5GcmFtZSgpLmRvY3VtZW50KCk7CiAgICAgaWYgKCFmb2N1c2VkRG9jdW1lbnQpCkBA IC00MjgsMTEgKzQyMyw2IEBAIEFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6Zm9jdXNlZFVJ RWxlbWVudEZvclBhZ2UoY29uc3QgUGFnZSogcGFnZSkKIAogICAgIGZvY3VzZWREb2N1bWVudC0+ dXBkYXRlU3R5bGVJZk5lZWRlZCgpOwogCi0jaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFU RURfVFJFRSkKLSAgICBpZiAoaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAgIHJldHVy biBpc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KCpmb2N1c2VkRG9jdW1lbnQpOwotI2VuZGlmCi0K ICAgICByZXR1cm4gZm9jdXNlZE9iamVjdCgqZm9jdXNlZERvY3VtZW50KTsKIH0KIApAQCAtNzUz LDcgKzc0Myw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aW5pdGlhbGl6ZVNlY29uZGFyeUFYVGhy ZWFkKCkKICAgICAgICAgX0FYVUlFbGVtZW50VXNlU2Vjb25kYXJ5QVhUaHJlYWQodHJ1ZSk7CiB9 CiAKLUFYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgp CitSZWZQdHI8QVhJc29sYXRlZFRyZWU+IEFYT2JqZWN0Q2FjaGU6OmdldE9yQ3JlYXRlSXNvbGF0 ZWRUcmVlKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcGFnZUlEKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKQEAgLTc2Niw3ICs3NTYsMTIgQEAgQVhDb3JlT2JqZWN0KiBBWE9iamVjdENhY2hlOjpp c29sYXRlZFRyZWVSb290T2JqZWN0KCkKICAgICAgICAgQVhPYmplY3RDYWNoZTo6aW5pdGlhbGl6 ZVNlY29uZGFyeUFYVGhyZWFkKCk7CiAgICAgfQogCi0gICAgaWYgKHRyZWUpCisgICAgcmV0dXJu IHRyZWU7Cit9CisKK0FYQ29yZU9iamVjdCogQVhPYmplY3RDYWNoZTo6aXNvbGF0ZWRUcmVlUm9v dE9iamVjdCgpCit7CisgICAgaWYgKGF1dG8gdHJlZSA9IGdldE9yQ3JlYXRlSXNvbGF0ZWRUcmVl KCkpCiAgICAgICAgIHJldHVybiB0cmVlLT5yb290Tm9kZSgpLmdldCgpOwogCiAgICAgLy8gU2hv dWxkIG5vdCBnZXQgaGVyZSwgY291bGRuJ3QgY3JlYXRlIHRoZSBJc29sYXRlZFRyZWUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCmluZGV4IDcwNmRhMDg3 NWU1OTk5OGYyNzJhNGE4YjgyOTkzMDVkNzYyNDY1NzMuLjk3ZjA3NzBhYTY4MDdhOWMzNDUxMzRh ZDI2ZTlmMGNkZTM3ZTBmNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5oCkBAIC0xNDMsNyArMTQzLDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IEFY T2JqZWN0Q2FjaGUoRG9jdW1lbnQmKTsKICAgICB+QVhPYmplY3RDYWNoZSgpOwogCi0gICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIEFYQ29yZU9iamVjdCogZm9jdXNlZFVJRWxlbWVudEZvclBhZ2Uo Y29uc3QgUGFnZSopOworICAgIFdFQkNPUkVfRVhQT1JUIEFYQ29yZU9iamVjdCogZm9jdXNlZFVJ RWxlbWVudEZvclBhZ2UoY29uc3QgUGFnZSopOwogCiAgICAgLy8gUmV0dXJucyB0aGUgcm9vdCBv YmplY3QgZm9yIHRoZSBlbnRpcmUgZG9jdW1lbnQuCiAgICAgV0VCQ09SRV9FWFBPUlQgQVhDb3Jl T2JqZWN0KiByb290T2JqZWN0KCk7CkBAIC0zNTYsOCArMzU2LDkgQEAgcHVibGljOgogcHJpdmF0 ZToKICAgICBzdGF0aWMgYm9vbCBjbGllbnRTdXBwb3J0c0lzb2xhdGVkVHJlZSgpOwogICAgIEFY Q29yZU9iamVjdCogaXNvbGF0ZWRUcmVlUm9vdE9iamVjdCgpOwotICAgIHN0YXRpYyBBWENvcmVP YmplY3QqIGlzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoRG9jdW1lbnQmKTsKKyAgICBBWENvcmVP YmplY3QqIGlzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3QoKTsKICAgICB2b2lkIHNldElzb2xhdGVk VHJlZUZvY3VzZWRPYmplY3QoTm9kZSopOworICAgIFJlZlB0cjxBWElzb2xhdGVkVHJlZT4gZ2V0 T3JDcmVhdGVJc29sYXRlZFRyZWUoKSBjb25zdDsKICAgICBzdGF0aWMgUmVmPEFYSXNvbGF0ZWRU cmVlPiBnZW5lcmF0ZUlzb2xhdGVkVHJlZShQYWdlSWRlbnRpZmllciwgRG9jdW1lbnQmKTsKICAg ICB2b2lkIHVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3QqLCBBWE5vdGlmaWNhdGlvbik7 CiAgICAgc3RhdGljIHZvaWQgaW5pdGlhbGl6ZVNlY29uZGFyeUFYVGhyZWFkKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk T2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDRkNGYxZWY1ODUyNGY0ZGQ2ODdlYWVjYTFiNjU0Yjgw YmFiNTg2ZDMuLmE0ZDMxZDVmYzg0ZTgzODNhZWZkOTUzNDJmZTRiYzU3YTI3MzAwNmIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC01ODQsOSArNTg0LDcgQEAgdm9pZCBBWElzb2xh dGVkT2JqZWN0OjptYXRoUG9zdHNjcmlwdHMoQWNjZXNzaWJpbGl0eU1hdGhNdWx0aXNjcmlwdFBh aXJzJiBwYWlycykKIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0Ojpmb2N1c2VkVUlF bGVtZW50KCkgY29uc3QKIHsKLSAgICBpZiAoYXV0byBmb2N1c2VkRWxlbWVudCA9IHRyZWUoKS0+ Zm9jdXNlZFVJRWxlbWVudCgpKQotICAgICAgICByZXR1cm4gZm9jdXNlZEVsZW1lbnQuZ2V0KCk7 Ci0gICAgcmV0dXJuIG51bGxwdHI7CisgICAgcmV0dXJuIHRyZWUoKS0+Zm9jdXNlZFVJRWxlbWVu dCgpLmdldCgpOwogfQogICAgIAogQVhDb3JlT2JqZWN0KiBBWElzb2xhdGVkT2JqZWN0OjpwYXJl bnRPYmplY3RVbmlnbm9yZWQoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggMTExZWU3 ZDg4NDM2MjA1ODI3OWM2YzllMGRjNWNhYmU3YjdiODAyOC4uMTRkOTFiNDBjNDdjMWRjNGMwNDdh YmQzMzJhYzEwYWMxYzdiOTk4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCkBAIC0xMDIsNyArMTAy LDcgQEAgcHJpdmF0ZToKICAgICAvLyBXcml0dGVuIHRvIGJ5IG1haW4gdGhyZWFkIHVuZGVyIGxv Y2ssIGFjY2Vzc2VkIGFuZCBhcHBsaWVkIGJ5IEFYIHRocmVhZC4KICAgICBWZWN0b3I8Tm9kZUNo YW5nZT4gbV9wZW5kaW5nQXBwZW5kczsKICAgICBWZWN0b3I8QVhJRD4gbV9wZW5kaW5nUmVtb3Zh bHM7Ci0gICAgQVhJRCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlEOworICAgIEFYSUQgbV9wZW5kaW5n Rm9jdXNlZE5vZGVJRCB7IEludmFsaWRBWElEIH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7 CiAKICAgICBBWElzb2xhdGVkVHJlZUlEIG1fdHJlZUlEOwo=