192762 2018-12-17 10:46:07 -0800 Reproducible ASSERTion failure when toggling layer borders with find-in-page up 2018-12-17 12:18:47 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue ryanhaddad simon.fraser thorton zalan oldest_to_newest 1488475 0 zalan 2018-12-17 10:46:07 -0800 <rdar://problem/46676873> 1488487 1 357452 zalan 2018-12-17 11:01:47 -0800 Created attachment 357452 Patch 1488499 2 357452 simon.fraser 2018-12-17 11:14:07 -0800 Comment on attachment 357452 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=357452&action=review > LayoutTests/editing/document-marker-null-check.html:6 > +div:before { > + content: "foobar"; Isn't this exactly what I said! 1488503 3 zalan 2018-12-17 11:16:26 -0800 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 357452 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=357452&action=review > > > LayoutTests/editing/document-marker-null-check.html:6 > > +div:before { > > + content: "foobar"; > > Isn't this exactly what I said! I don't remember you saying "foobar". 1488521 4 357452 commit-queue 2018-12-17 11:43:03 -0800 Comment on attachment 357452 Patch Clearing flags on attachment: 357452 Committed r239279: <https://trac.webkit.org/changeset/239279> 1488522 5 commit-queue 2018-12-17 11:43:05 -0800 All reviewed patches have been landed. Closing bug. 1488525 6 ryanhaddad 2018-12-17 11:56:49 -0800 As EWS predicted, this has broken the iOS build: In file included from /Volumes/Data/EWS/WebKit/WebKitBuild/Release-iphoneos/DerivedSources/WebCore/unified-sources/UnifiedSource11-mm.mm:7: ./page/ios/FrameIOS.mm:628:62: error: non-const lvalue reference to type 'WebCore::Node' cannot bind to a value of unrelated type 'WebCore::Node *' for (auto* marker : document()->markers().markersFor(node, DocumentMarker::DictationPhraseWithAlternatives)) { ^~~~ In file included from /Volumes/Data/EWS/WebKit/WebKitBuild/Release-iphoneos/DerivedSources/WebCore/unified-sources/UnifiedSource11-mm.mm:7: In file included from ./page/ios/FrameIOS.mm:34: /Volumes/Data/EWS/WebKit/Source/WebCore/dom/DocumentMarkerController.h:85:68: note: passing argument to parameter here WEBCORE_EXPORT Vector<RenderedDocumentMarker*> markersFor(Node&, OptionSet<DocumentMarker::MarkerType> = DocumentMarker::allMarkers()); ^ 1 error generated. 1488535 7 zalan 2018-12-17 12:18:47 -0800 (In reply to Ryan Haddad from comment #6) > As EWS predicted, this has broken the iOS build: > > In file included from > /Volumes/Data/EWS/WebKit/WebKitBuild/Release-iphoneos/DerivedSources/WebCore/ > unified-sources/UnifiedSource11-mm.mm:7: > ./page/ios/FrameIOS.mm:628:62: error: non-const lvalue reference to type > 'WebCore::Node' cannot bind to a value of unrelated type 'WebCore::Node *' > for (auto* marker : document()->markers().markersFor(node, > DocumentMarker::DictationPhraseWithAlternatives)) { > ^~~~ > In file included from > /Volumes/Data/EWS/WebKit/WebKitBuild/Release-iphoneos/DerivedSources/WebCore/ > unified-sources/UnifiedSource11-mm.mm:7: > In file included from ./page/ios/FrameIOS.mm:34: > /Volumes/Data/EWS/WebKit/Source/WebCore/dom/DocumentMarkerController.h:85:68: > note: passing argument to parameter here > WEBCORE_EXPORT Vector<RenderedDocumentMarker*> markersFor(Node&, > OptionSet<DocumentMarker::MarkerType> = DocumentMarker::allMarkers()); > ^ > 1 error generated. https://trac.webkit.org/changeset/239280 357452 2018-12-17 11:01:47 -0800 2018-12-17 11:43:03 -0800 Patch bug-192762-20181217110147.patch text/plain 13255 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MjMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVjODc0MWY1YzdmNjM4 YTkxYzg3N2QyNTc3MGFjZDdjY2M4ZDRkOS4uZDc0ODA2Y2Q4NWRiODAzMWQyODNhN2VkMTI4OTJm ZjhjYjI1ODUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE4LTEyLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVwcm9kdWNpYmxlIEFTU0VS VGlvbiBmYWlsdXJlIHdoZW4gdG9nZ2xpbmcgbGF5ZXIgYm9yZGVycyB3aXRoIGZpbmQtaW4tcGFn ZSB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTky NzYyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NjY3Njg3Mz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6 Om1hcmtlcnNGb3IoKSBzaG91bGQgdGFrZSBhIHJlZmVyZW5jZSBpbnN0ZWFkIG9mIGEgTm9kZSou CisKKyAgICAgICAgVGVzdDogZWRpdGluZy9kb2N1bWVudC1tYXJrZXItbnVsbC1jaGVjay5odG1s CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6aGFzTWFya2Vycyk6CisgICAgICAgICogZG9tL0Rv Y3VtZW50TWFya2VyQ29udHJvbGxlci5oOgorICAgICAgICAqIGVkaXRpbmcvQWx0ZXJuYXRpdmVU ZXh0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBbHRlcm5hdGl2ZVRleHRDb250 cm9sbGVyOjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKToKKyAgICAgICAgKiBlZGl0aW5nL0Vk aXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OnNlbGVjdGlvblN0YXJ0SGFzTWFy a2VyRm9yIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpjb2xsZWN0TWFya2VkVGV4dHNGb3JEb2N1 bWVudE1hcmtlcnMgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6cGFpbnQpOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6 OmRyYWdnZWRDb250ZW50UmFuZ2VzQmV0d2Vlbk9mZnNldHMgY29uc3QpOgorICAgICAgICAqIHJl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxp bmVMYXlvdXQ6OmNhblVzZUZvcldpdGhSZWFzb24pOgorICAgICAgICAqIHRlc3RpbmcvSW50ZXJu YWxzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6bWFya2VyQ291bnRGb3JOb2Rl KToKKwogMjAxOC0xMi0xNCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIGNsYW5nLXRpZHk6IEZpeCB1bm5lY2Vzc2FyeSBvYmplY3QgY29waWVzIGluIFdlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuY3BwCmluZGV4IDM5MTc3NjMyZDM3Y2Iw YTY0MTlkMjJmNjFjYzBkZjlmZDk2ZmQ4YzAuLmQ1NWM1NmYxMzY5MzI1OGI3MmRmY2JkYTU0NmJi YzdjNmY4OWEzMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtl ckNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNv bnRyb2xsZXIuY3BwCkBAIC01MjEsMTMgKzUyMSwxMyBAQCBEb2N1bWVudE1hcmtlciogRG9jdW1l bnRNYXJrZXJDb250cm9sbGVyOjptYXJrZXJDb250YWluaW5nUG9pbnQoY29uc3QgTGF5b3V0UG9p bgogICAgIHJldHVybiBudWxscHRyOwogfQogCi1WZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtl cio+IERvY3VtZW50TWFya2VyQ29udHJvbGxlcjo6bWFya2Vyc0ZvcihOb2RlKiBub2RlLCBPcHRp b25TZXQ8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+IG1hcmtlclR5cGVzKQorVmVjdG9yPFJl bmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6Om1hcmtlcnNG b3IoTm9kZSYgbm9kZSwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPiBtYXJr ZXJUeXBlcykKIHsKICAgICBpZiAoIXBvc3NpYmx5SGFzTWFya2VycyhtYXJrZXJUeXBlcykpCiAg ICAgICAgIHJldHVybiB7IH07CiAKICAgICBWZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtlcio+ IHJlc3VsdDsKLSAgICBNYXJrZXJMaXN0KiBsaXN0ID0gbV9tYXJrZXJzLmdldChub2RlKTsKKyAg ICBNYXJrZXJMaXN0KiBsaXN0ID0gbV9tYXJrZXJzLmdldCgmbm9kZSk7CiAgICAgaWYgKCFsaXN0 KQogICAgICAgICByZXR1cm4gcmVzdWx0OwogCkBAIC01NTEsNyArNTUxLDggQEAgVmVjdG9yPFJl bmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBEb2N1bWVudE1hcmtlckNvbnRyb2xsZXI6Om1hcmtlcnNJ blJhbmdlKFJhbmdlJgogCiAgICAgTm9kZSogcGFzdExhc3ROb2RlID0gcmFuZ2UucGFzdExhc3RO b2RlKCk7CiAgICAgZm9yIChOb2RlKiBub2RlID0gcmFuZ2UuZmlyc3ROb2RlKCk7IG5vZGUgIT0g cGFzdExhc3ROb2RlOyBub2RlID0gTm9kZVRyYXZlcnNhbDo6bmV4dCgqbm9kZSkpIHsKLSAgICAg ICAgZm9yIChhdXRvKiBtYXJrZXIgOiBtYXJrZXJzRm9yKG5vZGUpKSB7CisgICAgICAgIEFTU0VS VChub2RlKTsKKyAgICAgICAgZm9yIChhdXRvKiBtYXJrZXIgOiBtYXJrZXJzRm9yKCpub2RlKSkg ewogICAgICAgICAgICAgaWYgKCFtYXJrZXJUeXBlcy5jb250YWlucyhtYXJrZXItPnR5cGUoKSkp CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICBpZiAobm9kZSA9PSAmc3Rh cnRDb250YWluZXIgJiYgbWFya2VyLT5lbmRPZmZzZXQoKSA8PSByYW5nZS5zdGFydE9mZnNldCgp KQpAQCAtNzYzLDcgKzc2NCw4IEBAIGJvb2wgRG9jdW1lbnRNYXJrZXJDb250cm9sbGVyOjpoYXNN YXJrZXJzKFJhbmdlJiByYW5nZSwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyCiAKICAgICBOb2Rl KiBwYXN0TGFzdE5vZGUgPSByYW5nZS5wYXN0TGFzdE5vZGUoKTsKICAgICBmb3IgKE5vZGUqIG5v ZGUgPSByYW5nZS5maXJzdE5vZGUoKTsgbm9kZSAhPSBwYXN0TGFzdE5vZGU7IG5vZGUgPSBOb2Rl VHJhdmVyc2FsOjpuZXh0KCpub2RlKSkgewotICAgICAgICBmb3IgKGF1dG8qIG1hcmtlciA6IG1h cmtlcnNGb3Iobm9kZSkpIHsKKyAgICAgICAgQVNTRVJUKG5vZGUpOworICAgICAgICBmb3IgKGF1 dG8qIG1hcmtlciA6IG1hcmtlcnNGb3IoKm5vZGUpKSB7CiAgICAgICAgICAgICBpZiAoIW1hcmtl clR5cGVzLmNvbnRhaW5zKG1hcmtlci0+dHlwZSgpKSkKICAgICAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgICAgIGlmIChub2RlID09ICZzdGFydENvbnRhaW5lciAmJiBtYXJrZXItPmVu ZE9mZnNldCgpIDw9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihyYW5nZS5zdGFydE9mZnNldCgpKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIu aCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE1hcmtlckNvbnRyb2xsZXIuaAppbmRleCBm MjQxMDNmNDU1YmQ5ZjVkOWY5ZTRhYmE5NjAxZGI3ZGY4YTQ2OGI5Li5kZDdkNjRmMDg2NTk2YWM3 ZjBlZmUwMTRjMTU0MDI4YTJhNWE5NjA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnRNYXJrZXJDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50TWFya2VyQ29udHJvbGxlci5oCkBAIC04Miw3ICs4Miw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldE1hcmtlcnNBY3RpdmUoUmFuZ2UqLCBib29sKTsKICAgICB2b2lkIHNldE1hcmtlcnNBY3Rp dmUoTm9kZSosIHVuc2lnbmVkIHN0YXJ0T2Zmc2V0LCB1bnNpZ25lZCBlbmRPZmZzZXQsIGJvb2wp OwogCi0gICAgV0VCQ09SRV9FWFBPUlQgVmVjdG9yPFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBt YXJrZXJzRm9yKE5vZGUqLCBPcHRpb25TZXQ8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+ID0g RG9jdW1lbnRNYXJrZXI6OmFsbE1hcmtlcnMoKSk7CisgICAgV0VCQ09SRV9FWFBPUlQgVmVjdG9y PFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBtYXJrZXJzRm9yKE5vZGUmLCBPcHRpb25TZXQ8RG9j dW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+ID0gRG9jdW1lbnRNYXJrZXI6OmFsbE1hcmtlcnMoKSk7 CiAgICAgV0VCQ09SRV9FWFBPUlQgVmVjdG9yPFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBtYXJr ZXJzSW5SYW5nZShSYW5nZSYsIE9wdGlvblNldDxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4p OwogICAgIHZvaWQgY2xlYXJEZXNjcmlwdGlvbk9uTWFya2Vyc0ludGVyc2VjdGluZ1JhbmdlKFJh bmdlJiwgT3B0aW9uU2V0PERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPik7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwCmlu ZGV4IGU2NGY5NDc4YTI0OWIxYjVlMjI4OWZjODA5ZWUwMzg5NzgzNDI1NDEuLjU4MmJlMGRlNTkz MmM1Y2JlNDljNTFmMGM4MWI4ZGM5ODA3MTdkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9BbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcApAQCAtNDIwLDcgKzQyMCw4 IEBAIHZvaWQgQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlcjo6cmVzcG9uZFRvQ2hhbmdlZFNlbGVj dGlvbihjb25zdCBWaXNpYmxlU2VsZWN0aW9uCiAgICAgICAgIHJldHVybjsKIAogICAgIE5vZGUq IG5vZGUgPSBwb3NpdGlvbi5jb250YWluZXJOb2RlKCk7Ci0gICAgZm9yIChhdXRvKiBtYXJrZXIg OiBub2RlLT5kb2N1bWVudCgpLm1hcmtlcnMoKS5tYXJrZXJzRm9yKG5vZGUpKSB7CisgICAgQVNT RVJUKG5vZGUpOworICAgIGZvciAoYXV0byogbWFya2VyIDogbm9kZS0+ZG9jdW1lbnQoKS5tYXJr ZXJzKCkubWFya2Vyc0Zvcigqbm9kZSkpIHsKICAgICAgICAgQVNTRVJUKG1hcmtlcik7CiAgICAg ICAgIGlmIChyZXNwb25kVG9NYXJrZXJBdEVuZE9mV29yZCgqbWFya2VyLCBwb3NpdGlvbikpCiAg ICAgICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAppbmRleCA2OWMxNmE5 NGRkOWRiZDgzYTA5ZDBlNmRmMzNjYTgzZDhiMzJmOTU0Li5lNWFlNzEzMzZmYjFmYWRmMWY3ZTY5 ZThiZWNkZmMzYzk3ZDhiM2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Vk aXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCkBAIC0zNzY4 LDcgKzM3NjgsNyBAQCBib29sIEVkaXRvcjo6c2VsZWN0aW9uU3RhcnRIYXNNYXJrZXJGb3IoRG9j dW1lbnRNYXJrZXI6Ok1hcmtlclR5cGUgbWFya2VyVHlwZSwgaQogCiAgICAgdW5zaWduZWQgaW50 IHN0YXJ0T2Zmc2V0ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50Pihmcm9tKTsKICAgICB1bnNp Z25lZCBpbnQgZW5kT2Zmc2V0ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQgaW50Pihmcm9tICsgbGVu Z3RoKTsKLSAgICBWZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtlcio+IG1hcmtlcnMgPSBkb2N1 bWVudCgpLm1hcmtlcnMoKS5tYXJrZXJzRm9yKG5vZGUpOworICAgIFZlY3RvcjxSZW5kZXJlZERv Y3VtZW50TWFya2VyKj4gbWFya2VycyA9IGRvY3VtZW50KCkubWFya2VycygpLm1hcmtlcnNGb3Io Km5vZGUpOwogICAgIGZvciAoYXV0byogbWFya2VyIDogbWFya2VycykgewogICAgICAgICBpZiAo bWFya2VyLT5zdGFydE9mZnNldCgpIDw9IHN0YXJ0T2Zmc2V0ICYmIGVuZE9mZnNldCA8PSBtYXJr ZXItPmVuZE9mZnNldCgpICYmIG1hcmtlci0+dHlwZSgpID09IG1hcmtlclR5cGUpCiAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9J bmxpbmVUZXh0Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94 LmNwcAppbmRleCAxZDAxMDkwYjExZmJhOTU5ZjFkMDlhY2Y2M2MzNTU2MTZjMWMyZWYzLi40YzMz YzU5YmRjNTdiYjRhNDZhYjYzZDVjZTU4MTM2NjA1MjI2YTMyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCkBAIC04NjIsNyArODYyLDcgQEAgVmVjdG9yPE1h cmtlZFRleHQ+IElubGluZVRleHRCb3g6OmNvbGxlY3RNYXJrZWRUZXh0c0ZvckRvY3VtZW50TWFy a2VycyhUZXh0UGFpbnQKICAgICBpZiAoIXJlbmRlcmVyKCkudGV4dE5vZGUoKSkKICAgICAgICAg cmV0dXJuIHsgfTsKIAotICAgIFZlY3RvcjxSZW5kZXJlZERvY3VtZW50TWFya2VyKj4gbWFya2Vy cyA9IHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0ZvcihyZW5kZXJlcigp LnRleHROb2RlKCkpOworICAgIFZlY3RvcjxSZW5kZXJlZERvY3VtZW50TWFya2VyKj4gbWFya2Vy cyA9IHJlbmRlcmVyKCkuZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0ZvcigqcmVuZGVyZXIo KS50ZXh0Tm9kZSgpKTsKIAogICAgIGF1dG8gbWFya2VkVGV4dFR5cGVGb3JNYXJrZXJUeXBlID0g W10gKERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlIHR5cGUpIHsKICAgICAgICAgc3dpdGNoICh0 eXBlKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFj ZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAppbmRl eCBhMGYwODM5OGRiYmI1Yjg5ZTFhNzY2ZGI1YTgyMWRiMWE0Y2NmMjRiLi5kNThlZGZlYjAzYzY4 NTQ2YjhhZTNlZjZjNDAyMThiYTEyM2E1YTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTE2Miw3ICsxNjIsOCBAQCB2b2lkIFJlbmRlclJlcGxh Y2VkOjpwYWludChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50 T2Zmc2V0KQogICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc2F2ZWRHcmFwaGljc0NvbnRl eHQocGFpbnRJbmZvLmNvbnRleHQoKSwgZmFsc2UpOwogICAgIGlmIChlbGVtZW50KCkgJiYgZWxl bWVudCgpLT5wYXJlbnRPclNoYWRvd0hvc3RFbGVtZW50KCkpIHsKICAgICAgICAgYXV0byogcGFy ZW50Q29udGFpbmVyID0gZWxlbWVudCgpLT5wYXJlbnRPclNoYWRvd0hvc3RFbGVtZW50KCk7Ci0g ICAgICAgIGlmIChkcmFnZ2VkQ29udGVudENvbnRhaW5zUmVwbGFjZWRFbGVtZW50KGRvY3VtZW50 KCkubWFya2VycygpLm1hcmtlcnNGb3IocGFyZW50Q29udGFpbmVyLCBEb2N1bWVudE1hcmtlcjo6 RHJhZ2dlZENvbnRlbnQpLCAqZWxlbWVudCgpKSkgeworICAgICAgICBBU1NFUlQocGFyZW50Q29u dGFpbmVyKTsKKyAgICAgICAgaWYgKGRyYWdnZWRDb250ZW50Q29udGFpbnNSZXBsYWNlZEVsZW1l bnQoZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0ZvcigqcGFyZW50Q29udGFpbmVyLCBEb2N1 bWVudE1hcmtlcjo6RHJhZ2dlZENvbnRlbnQpLCAqZWxlbWVudCgpKSkgewogICAgICAgICAgICAg c2F2ZWRHcmFwaGljc0NvbnRleHQuc2F2ZSgpOwogICAgICAgICAgICAgcGFpbnRJbmZvLmNvbnRl eHQoKS5zZXRBbHBoYSgwLjI1KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwCmluZGV4IDQyMjU3ZjcyNWI1MDNjNjFlMDMxOTUwNDVlZWM5NDlhOTEzNTQz MGMuLmMxNWVlOTc4YmU1M2E4Y2EzMDQwMmI5ZDI0YTgzNmZmZDY3NTQ0YjkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTEwNjMsNyArMTA2Myw3IEBAIFZlY3Rv cjxzdGQ6OnBhaXI8dW5zaWduZWQsIHVuc2lnbmVkPj4gUmVuZGVyVGV4dDo6ZHJhZ2dlZENvbnRl bnRSYW5nZXNCZXR3ZWVuT2ZmCiAgICAgaWYgKCF0ZXh0Tm9kZSgpKQogICAgICAgICByZXR1cm4g eyB9OwogCi0gICAgYXV0byBtYXJrZXJzID0gZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0Zv cih0ZXh0Tm9kZSgpLCBEb2N1bWVudE1hcmtlcjo6RHJhZ2dlZENvbnRlbnQpOworICAgIGF1dG8g bWFya2VycyA9IGRvY3VtZW50KCkubWFya2VycygpLm1hcmtlcnNGb3IoKnRleHROb2RlKCksIERv Y3VtZW50TWFya2VyOjpEcmFnZ2VkQ29udGVudCk7CiAgICAgaWYgKG1hcmtlcnMuaXNFbXB0eSgp KQogICAgICAgICByZXR1cm4geyB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dC5jcHAKaW5kZXggMTEyYTdmYTgxOWJiMWVlZmE4NWQwZTA5OTUzY2Y2ZTUy YmY1ZGY0ZS4uNjE2ZjBhNjFiNzAzYTk4NDgzODAxNGVjNzNjMjlmMTVlZjI4NjZmYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtMzE1LDcg KzMxNSw3IEBAIEF2b2lkYW5jZVJlYXNvbkZsYWdzIGNhblVzZUZvcldpdGhSZWFzb24oY29uc3Qg UmVuZGVyQmxvY2tGbG93JiBmbG93LCBJbmNsdWRlUmVhCiAgICAgICAgICAgICBTRVRfUkVBU09O X0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dDaGlsZElzU2VsZWN0ZWQsIHJlYXNvbnMsIGluY2x1 ZGVSZWFzb25zKTsKICAgICAgICAgaWYgKGlzPFJlbmRlclRleHQ+KCpjaGlsZCkpIHsKICAgICAg ICAgICAgIGNvbnN0IGF1dG8mIHJlbmRlclRleHQgPSBkb3duY2FzdDxSZW5kZXJUZXh0PigqY2hp bGQpOwotICAgICAgICAgICAgaWYgKCFyZW5kZXJUZXh0LmRvY3VtZW50KCkubWFya2VycygpLm1h cmtlcnNGb3IocmVuZGVyVGV4dC50ZXh0Tm9kZSgpKS5pc0VtcHR5KCkpCisgICAgICAgICAgICBp ZiAocmVuZGVyVGV4dC50ZXh0Tm9kZSgpICYmICFyZW5kZXJUZXh0LmRvY3VtZW50KCkubWFya2Vy cygpLm1hcmtlcnNGb3IoKnJlbmRlclRleHQudGV4dE5vZGUoKSkuaXNFbXB0eSgpKQogICAgICAg ICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0luY2x1ZGVzRG9j dW1lbnRNYXJrZXJzLCByZWFzb25zLCBpbmNsdWRlUmVhc29ucyk7CiAgICAgICAgICAgICBjaGls ZCA9IGNoaWxkLT5uZXh0U2libGluZygpOwogICAgICAgICAgICAgY29udGludWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggYzMyMjcyMTRhZTgyYTM0NGVhNWM2M2FiYjEz NzQ5ZmYyYThhYTFjNS4uYzc1ZTI2YmM3YTNhMDk2NjBmMDg0YjRmYmE0ODA1YjYwOTMyMDQ1ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMTU0MSw3ICsxNTQxLDcgQEAg RXhjZXB0aW9uT3I8dW5zaWduZWQ+IEludGVybmFsczo6bWFya2VyQ291bnRGb3JOb2RlKE5vZGUm IG5vZGUsIGNvbnN0IFN0cmluZyYgbWEKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IFN5bnRh eEVycm9yIH07CiAKICAgICBub2RlLmRvY3VtZW50KCkuZnJhbWUoKS0+ZWRpdG9yKCkudXBkYXRl RWRpdG9yVUlOb3dJZlNjaGVkdWxlZCgpOwotICAgIHJldHVybiBub2RlLmRvY3VtZW50KCkubWFy a2VycygpLm1hcmtlcnNGb3IoJm5vZGUsIG1hcmtlclR5cGVzKS5zaXplKCk7CisgICAgcmV0dXJu IG5vZGUuZG9jdW1lbnQoKS5tYXJrZXJzKCkubWFya2Vyc0Zvcihub2RlLCBtYXJrZXJUeXBlcyku c2l6ZSgpOwogfQogCiBFeGNlcHRpb25PcjxSZW5kZXJlZERvY3VtZW50TWFya2VyKj4gSW50ZXJu YWxzOjptYXJrZXJBdChOb2RlJiBub2RlLCBjb25zdCBTdHJpbmcmIG1hcmtlclR5cGUsIHVuc2ln bmVkIGluZGV4KQpAQCAtMTU1NCw3ICsxNTU0LDcgQEAgRXhjZXB0aW9uT3I8UmVuZGVyZWREb2N1 bWVudE1hcmtlcio+IEludGVybmFsczo6bWFya2VyQXQoTm9kZSYgbm9kZSwgY29uc3QgU3RyaW4K IAogICAgIG5vZGUuZG9jdW1lbnQoKS5mcmFtZSgpLT5lZGl0b3IoKS51cGRhdGVFZGl0b3JVSU5v d0lmU2NoZWR1bGVkKCk7CiAKLSAgICBWZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtlcio+IG1h cmtlcnMgPSBub2RlLmRvY3VtZW50KCkubWFya2VycygpLm1hcmtlcnNGb3IoJm5vZGUsIG1hcmtl clR5cGVzKTsKKyAgICBWZWN0b3I8UmVuZGVyZWREb2N1bWVudE1hcmtlcio+IG1hcmtlcnMgPSBu b2RlLmRvY3VtZW50KCkubWFya2VycygpLm1hcmtlcnNGb3Iobm9kZSwgbWFya2VyVHlwZXMpOwog ICAgIGlmIChtYXJrZXJzLnNpemUoKSA8PSBpbmRleCkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAgICAgcmV0dXJuIG1hcmtlcnNbaW5kZXhdOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDg2NDJjYmZjYTMxN2FhMjA3Yjgy NWVjMWY3NTkxMjY0NWY4NTU5YTYuLmRiYzFlZDMyYWY1MmE1M2RhYWFkNWM0Njg1M2NjYzE5Zjkx YTQ4ZTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0xMi0xNyAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlcHJvZHVjaWJsZSBBU1NFUlRpb24gZmFpbHVy ZSB3aGVuIHRvZ2dsaW5nIGxheWVyIGJvcmRlcnMgd2l0aCBmaW5kLWluLXBhZ2UgdXAKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mjc2MgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDY2NzY4NzM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBlZGl0aW5nL2RvY3VtZW50LW1hcmtlci1udWxsLWNoZWNr LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZWRpdGluZy9kb2N1bWVudC1tYXJrZXIt bnVsbC1jaGVjay5odG1sOiBBZGRlZC4KKwogMjAxOC0xMi0xNCAgTWF0dCBCYWtlciAgPG1hdHRi YWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ29va2llcyB2aWV3IHNo b3VsZCB1c2UgbW9kZWwgb2JqZWN0cyBpbnN0ZWFkIG9mIHJhdyBwYXlsb2FkIGRhdGEKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2VkaXRpbmcvZG9jdW1lbnQtbWFya2VyLW51bGwtY2hlY2stZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kb2N1bWVudC1tYXJrZXItbnVsbC1jaGVj ay1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTY2NzY1ZTVkMjA3OTdjNDdiYTRmMWYzYjVhNjA3 ZDI3MTEzYjA1ZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2VkaXRpbmcvZG9jdW1l bnQtbWFya2VyLW51bGwtY2hlY2stZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1Bhc3MgaWYg bm8gY3Jhc2ggb3IgYXNzZXJ0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZWRpdGluZy9kb2N1 bWVudC1tYXJrZXItbnVsbC1jaGVjay5odG1sIGIvTGF5b3V0VGVzdHMvZWRpdGluZy9kb2N1bWVu dC1tYXJrZXItbnVsbC1jaGVjay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE4ZTBhY2U0YmZiYjMxMDM1OTRi YjEzZGEzOTc3YmE2OTJkNDE4ZWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9lZGl0 aW5nL2RvY3VtZW50LW1hcmtlci1udWxsLWNoZWNrLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPGh0 bWw+Cis8aGVhZD4KKzx0aXRsZT5UaGlzIHRlc3QgdGhhdCB3ZSBkb24ndCBjcmFzaCBvbiBhIG51 bGwgdGV4dCBub2RlIHdpdGggbWFya2VyIG9uIGl0LjwvdGl0bGU+Cis8c3R5bGU+CitkaXY6YmVm b3JlIHsKKwljb250ZW50OiAiZm9vYmFyIjsKKwlkaXNwbGF5OiB0YWJsZTsKK30KKzwvc3R5bGU+ Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXY+UGFzcyBpZiBubyBjcmFzaCBvciBhc3NlcnQuPC9kaXY+ Cis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgIHRlc3RSdW5uZXIuZHVtcEFz VGV4dCgpOworCitpZiAod2luZG93LmludGVybmFscykgeworCWludGVybmFscy5zZXR0aW5ncy5z ZXRTaW1wbGVMaW5lTGF5b3V0RW5hYmxlZChmYWxzZSk7CQorCXZhciBmaW5kT3B0aW9ucyA9IFsn Q2FzZUluc2Vuc2l0aXZlJywgJ0F0V29yZFN0YXJ0cycsICdUcmVhdE1lZGlhbENhcGl0YWxBc1dv cmRTdGFydCcsICdXcmFwQXJvdW5kJ107CisJaW50ZXJuYWxzLmNvdW50TWF0Y2hlc0ZvclRleHQo J2Fzc2VydCcsIGZpbmRPcHRpb25zLCAnbWFyaycpOworfQorCitkb2N1bWVudC5ib2R5Lm9mZnNl dEhlaWdodDsKK2lmICh3aW5kb3cuaW50ZXJuYWxzKQorCWludGVybmFscy5zZXR0aW5ncy5zZXRT aW1wbGVMaW5lTGF5b3V0RW5hYmxlZCh0cnVlKTsKK2RvY3VtZW50LmJvZHkub2Zmc2V0SGVpZ2h0 OworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==