138329 2014-11-03 15:40:58 -0800 Clarify RenderListMarker ownership model. 2014-11-03 18:35:49 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1045876 0 kling 2014-11-03 15:40:58 -0800 A RenderListMarker is either in-tree and owned by the tree, or out-of-tree and owned by a RenderListItem. This patch changes RenderListItem::m_marker to be a raw pointer, and removes the special handling of list markers in RenderElement child teardown. We also remove the willBeDestroyed() hook. It was used to clear out the m_marker pointer, but this is now done in the regular ~RenderListItem() destructor with an assertion for marker sanity. m_marker is automatically nulled out by a didDestroyListMarker() callback on RenderListItem. 1045877 1 240878 kling 2014-11-03 15:43:00 -0800 Created attachment 240878 Patch 1045880 2 240878 koivisto 2014-11-03 15:47:50 -0800 Comment on attachment 240878 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=240878&action=review > Source/WebCore/rendering/RenderListItem.h:89 > - RenderPtr<RenderListMarker> m_marker; > + RenderListMarker* m_marker; Weak pointers would be cool. 1045940 3 240878 commit-queue 2014-11-03 18:35:45 -0800 Comment on attachment 240878 Patch Clearing flags on attachment: 240878 Committed r175505: <http://trac.webkit.org/changeset/175505> 1045941 4 commit-queue 2014-11-03 18:35:49 -0800 All reviewed patches have been landed. Closing bug. 240878 2014-11-03 15:43:00 -0800 2014-11-03 18:35:45 -0800 Patch bug-138329.diff text/plain 8916 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NjVkZTkyLi5hYWJlYTU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNTAg QEAKIDIwMTQtMTEtMDMgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29tPgogCisgICAg ICAgIENsYXJpZnkgUmVuZGVyTGlzdE1hcmtlciBvd25lcnNoaXAgbW9kZWwuCisgICAgICAgIDxo dHRwczovL3dlYmtpdC5vcmcvYi8xMzgzMjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQSBSZW5kZXJMaXN0TWFya2VyIGlzIGVpdGhlciBpbi10cmVl IGFuZCBvd25lZCBieSB0aGUgdHJlZSwgb3Igb3V0LW9mLXRyZWUKKyAgICAgICAgYW5kIG93bmVk IGJ5IGEgUmVuZGVyTGlzdEl0ZW0uCisKKyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIFJlbmRl ckxpc3RJdGVtOjptX21hcmtlciB0byBiZSBhIHJhdyBwb2ludGVyLCBhbmQgcmVtb3ZlcworICAg ICAgICB0aGUgc3BlY2lhbCBoYW5kbGluZyBvZiBsaXN0IG1hcmtlcnMgaW4gUmVuZGVyRWxlbWVu dCBjaGlsZCB0ZWFyZG93bi4KKworICAgICAgICBXZSBhbHNvIHJlbW92ZSB0aGUgd2lsbEJlRGVz dHJveWVkKCkgaG9vay4gSXQgd2FzIHVzZWQgdG8gY2xlYXIgb3V0IHRoZQorICAgICAgICBtX21h cmtlciBwb2ludGVyLCBidXQgdGhpcyBpcyBub3cgZG9uZSBpbiB0aGUgcmVndWxhciB+UmVuZGVy TGlzdEl0ZW0oKQorICAgICAgICBkZXN0cnVjdG9yIHdpdGggYW4gYXNzZXJ0aW9uIGZvciBtYXJr ZXIgc2FuaXR5LiBtX21hcmtlciBpcyBhdXRvbWF0aWNhbGx5CisgICAgICAgIG51bGxlZCBvdXQg YnkgYSBkaWREZXN0cm95TGlzdE1hcmtlcigpIGNhbGxiYWNrIG9uIFJlbmRlckxpc3RJdGVtLgor CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRWxlbWVudDo6ZGVzdHJveUxlZnRvdmVyQ2hpbGRyZW4pOgorCisgICAgICAgICAg ICBSZW1vdmVkIHNwZWNpYWwgaGFuZGxpbmcgb2YgbGlzdCBtYXJrZXIgcmVuZGVyZXJzIHdoZW4g ZGVsZXRpbmcgYQorICAgICAgICAgICAgUmVuZGVyRWxlbWVudCdzIGNoaWxkcmVuLgorCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxpc3RJdGVtOjpSZW5kZXJMaXN0SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM aXN0SXRlbTo6flJlbmRlckxpc3RJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxpc3RJ dGVtOjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6 aW5zZXJ0T3JNb3ZlTWFya2VyUmVuZGVyZXJJZk5lZWRlZCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJMaXN0SXRlbTo6cG9zaXRpb25MaXN0TWFya2VyKToKKworICAgICAgICAgICAgTWFkZSBt X21hcmtlciBhIHJhdyBwb2ludGVyIGluc3RlYWQgb2YgYSBSZW5kZXJQdHIgc2luY2UgdGhlIG93 bmVyc2hpcAorICAgICAgICAgICAgcmVhbGx5IHN3aXRjaGVzIGJldHdlZW4gd2VhayBhbmQgc3Ry b25nIHJlZmVyZW5jZS4KKworICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEl0ZW06OndpbGxC ZURlc3Ryb3llZCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdE1hcmtlcjo6flJlbmRlckxpc3RNYXJrZXIpOgor CisgICAgICAgICAgICBBZGRlZCBhIHJlZ3VsYXIgZGVzdHJ1Y3RvciB0byByZXBsYWNlIHRoZSB3 aWxsQmVEZXN0cm95ZWQoKSBob29rLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RJ dGVtLmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaXN0SXRlbTo6ZGlkRGVzdHJveUxpc3RN YXJrZXIpOgorCisgICAgICAgICAgICBBZGRlZC4gQ2FsbGVkIGJ5IH5SZW5kZXJMaXN0TWFya2Vy IHRvIG51bGwgb3V0IFJlbmRlckxpc3RJdGVtOjptX21hcmtlci4KKworMjAxNC0xMS0wMyAgQW5k cmVhcyBLbGluZyAgPGFrbGluZ0BhcHBsZS5jb20+CisKICAgICAgICAgUmVuZGVyQ291bnRlciBz aG91bGRuJ3QgbmVlZCBhIHByZS1kZXN0cnVjdG9yIGhvb2suCiAgICAgICAgIDxodHRwczovL3dl YmtpdC5vcmcvYi8xMzgzMTY+CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVt ZW50LmNwcAppbmRleCBmMWEyODcwLi5jM2Q0OGU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC01MjEsOCArNTIxLDggQEAgUmVuZGVyT2JqZWN0KiBS ZW5kZXJFbGVtZW50OjpyZW1vdmVDaGlsZChSZW5kZXJPYmplY3QmIG9sZENoaWxkKQogdm9pZCBS ZW5kZXJFbGVtZW50OjpkZXN0cm95TGVmdG92ZXJDaGlsZHJlbigpCiB7CiAgICAgd2hpbGUgKG1f Zmlyc3RDaGlsZCkgewotICAgICAgICBpZiAobV9maXJzdENoaWxkLT5pc0xpc3RNYXJrZXIoKSB8 fCAobV9maXJzdENoaWxkLT5zdHlsZSgpLnN0eWxlVHlwZSgpID09IEZJUlNUX0xFVFRFUiAmJiAh bV9maXJzdENoaWxkLT5pc1RleHQoKSkpIHsKLSAgICAgICAgICAgIG1fZmlyc3RDaGlsZC0+cmVt b3ZlRnJvbVBhcmVudCgpOyAvLyBMaXN0IG1hcmtlcnMgYXJlIG93bmVkIGJ5IHRoZWlyIGVuY2xv c2luZyBsaXN0IGFuZCBzbyBkb24ndCBnZXQgZGVzdHJveWVkIGJ5IHRoaXMgY29udGFpbmVyLiBT aW1pbGFybHksIGZpcnN0IGxldHRlcnMgYXJlIGRlc3Ryb3llZCBieSB0aGVpciByZW1haW5pbmcg dGV4dCBmcmFnbWVudC4KKyAgICAgICAgaWYgKG1fZmlyc3RDaGlsZC0+c3R5bGUoKS5zdHlsZVR5 cGUoKSA9PSBGSVJTVF9MRVRURVIgJiYgIW1fZmlyc3RDaGlsZC0+aXNUZXh0KCkpIHsKKyAgICAg ICAgICAgIG1fZmlyc3RDaGlsZC0+cmVtb3ZlRnJvbVBhcmVudCgpOyAvLyA6Zmlyc3QtbGV0dGVy IGZyYWdtZW50IHJlbmRlcmVycyBhcmUgZGVzdHJveWVkIGJ5IHRoZWlyIHJlbWFpbmluZyB0ZXh0 IGZyYWdtZW50LgogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gRGVzdHJveSBhbnkg YW5vbnltb3VzIGNoaWxkcmVuIHJlbWFpbmluZyBpbiB0aGUgcmVuZGVyIHRyZWUsIGFzIHdlbGwg YXMgaW1wbGljaXQgKHNoYWRvdykgRE9NIGVsZW1lbnRzIGxpa2UgdGhvc2UgdXNlZCBpbiB0aGUg ZW5naW5lLWJhc2VkIHRleHQgZmllbGRzLgogICAgICAgICAgICAgaWYgKG1fZmlyc3RDaGlsZC0+ bm9kZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJ dGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0SXRlbS5jcHAKaW5k ZXggMzI0YmIwYy4uYzAzMjUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxpc3RJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGlzdEl0ZW0uY3BwCkBAIC00NSw2ICs0NSw3IEBAIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7 CiAKIFJlbmRlckxpc3RJdGVtOjpSZW5kZXJMaXN0SXRlbShFbGVtZW50JiBlbGVtZW50LCBQYXNz UmVmPFJlbmRlclN0eWxlPiBzdHlsZSkKICAgICA6IFJlbmRlckJsb2NrRmxvdyhlbGVtZW50LCBX VEY6Om1vdmUoc3R5bGUpKQorICAgICwgbV9tYXJrZXIobnVsbHB0cikKICAgICAsIG1faGFzRXhw bGljaXRWYWx1ZShmYWxzZSkKICAgICAsIG1faXNWYWx1ZVVwVG9EYXRlKGZhbHNlKQogICAgICwg bV9ub3RJbkxpc3QoZmFsc2UpCkBAIC01MiwxMiArNTMsMjQgQEAgUmVuZGVyTGlzdEl0ZW06OlJl bmRlckxpc3RJdGVtKEVsZW1lbnQmIGVsZW1lbnQsIFBhc3NSZWY8UmVuZGVyU3R5bGU+IHN0eWxl KQogICAgIHNldElubGluZShmYWxzZSk7CiB9CiAKK1JlbmRlckxpc3RJdGVtOjp+UmVuZGVyTGlz dEl0ZW0oKQoreworICAgIEFTU0VSVCghbV9tYXJrZXIgfHwgIW1fbWFya2VyLT5wYXJlbnQoKSk7 CisgICAgaWYgKG1fbWFya2VyKSB7CisgICAgICAgIG1fbWFya2VyLT5kZXN0cm95KCk7CisgICAg ICAgIEFTU0VSVCghbV9tYXJrZXIpOworICAgIH0KK30KKwogdm9pZCBSZW5kZXJMaXN0SXRlbTo6 c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBv bGRTdHlsZSkKIHsKICAgICBSZW5kZXJCbG9ja0Zsb3c6OnN0eWxlRGlkQ2hhbmdlKGRpZmYsIG9s ZFN0eWxlKTsKIAogICAgIGlmIChzdHlsZSgpLmxpc3RTdHlsZVR5cGUoKSA9PSBOb25lTGlzdFN0 eWxlICYmICghc3R5bGUoKS5saXN0U3R5bGVJbWFnZSgpIHx8IHN0eWxlKCkubGlzdFN0eWxlSW1h Z2UoKS0+ZXJyb3JPY2N1cnJlZCgpKSkgewotICAgICAgICBtX21hcmtlciA9IG51bGxwdHI7Cisg ICAgICAgIGlmIChtX21hcmtlcikgeworICAgICAgICAgICAgbV9tYXJrZXItPmRlc3Ryb3koKTsK KyAgICAgICAgICAgIEFTU0VSVCghbV9tYXJrZXIpOworICAgICAgICB9CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKQEAgLTY2LDE4ICs3OSwxMiBAQCB2b2lkIFJlbmRlckxpc3RJdGVtOjpzdHls ZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UgZGlmZiwgY29uc3QgUmVuZGVyU3R5bGUqIG9sZAog ICAgIC8vIHVwIChlLmcuLCBpbiBzb21lIGRlZXBseSBuZXN0ZWQgbGluZSBib3gpLiBTZWUgQ1NT MyBzcGVjLgogICAgIG5ld1N0eWxlLmdldCgpLmluaGVyaXRGcm9tKCZzdHlsZSgpKTsKICAgICBp ZiAoIW1fbWFya2VyKSB7Ci0gICAgICAgIG1fbWFya2VyID0gY3JlYXRlUmVuZGVyZXI8UmVuZGVy TGlzdE1hcmtlcj4oKnRoaXMsIFdURjo6bW92ZShuZXdTdHlsZSkpOworICAgICAgICBtX21hcmtl ciA9IGNyZWF0ZVJlbmRlcmVyPFJlbmRlckxpc3RNYXJrZXI+KCp0aGlzLCBXVEY6Om1vdmUobmV3 U3R5bGUpKS5sZWFrUHRyKCk7CiAgICAgICAgIG1fbWFya2VyLT5pbml0aWFsaXplU3R5bGUoKTsK ICAgICB9IGVsc2UKICAgICAgICAgbV9tYXJrZXItPnNldFN0eWxlKFdURjo6bW92ZShuZXdTdHls ZSkpOwogfQogCi12b2lkIFJlbmRlckxpc3RJdGVtOjp3aWxsQmVEZXN0cm95ZWQoKQotewotICAg IG1fbWFya2VyID0gbnVsbHB0cjsKLSAgICBSZW5kZXJCbG9ja0Zsb3c6OndpbGxCZURlc3Ryb3ll ZCgpOwotfQotCiB2b2lkIFJlbmRlckxpc3RJdGVtOjppbnNlcnRlZEludG9UcmVlKCkKIHsKICAg ICBSZW5kZXJCbG9ja0Zsb3c6Omluc2VydGVkSW50b1RyZWUoKTsKQEAgLTI3Myw3ICsyODAsNyBA QCB2b2lkIFJlbmRlckxpc3RJdGVtOjppbnNlcnRPck1vdmVNYXJrZXJSZW5kZXJlcklmTmVlZGVk KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVuZGVyRWxlbWVudCogY3VycmVudFBhcmVudCA9 IG1fbWFya2VyLT5wYXJlbnQoKTsKLSAgICBSZW5kZXJCbG9jayogbmV3UGFyZW50ID0gZ2V0UGFy ZW50T2ZGaXJzdExpbmVCb3godGhpcywgbV9tYXJrZXIuZ2V0KCkpOworICAgIFJlbmRlckJsb2Nr KiBuZXdQYXJlbnQgPSBnZXRQYXJlbnRPZkZpcnN0TGluZUJveCh0aGlzLCBtX21hcmtlcik7CiAg ICAgaWYgKCFuZXdQYXJlbnQpIHsKICAgICAgICAgLy8gSWYgdGhlIG1hcmtlciBpcyBjdXJyZW50 bHkgY29udGFpbmVkIGluc2lkZSBhbiBhbm9ueW1vdXMgYm94LAogICAgICAgICAvLyB0aGVuIHdl IGFyZSB0aGUgb25seSBpdGVtIGluIHRoYXQgYW5vbnltb3VzIGJveCAoc2luY2Ugbm8gbGluZSBi b3gKQEAgLTI5Miw3ICsyOTksNyBAQCB2b2lkIFJlbmRlckxpc3RJdGVtOjppbnNlcnRPck1vdmVN YXJrZXJSZW5kZXJlcklmTmVlZGVkKCkKICAgICAgICAgLy8gY29udGFpbmVycyBvdGhlciB0aGFu IG91cnNlbHZlcywgc28gd2UgbmVlZCB0byBkaXNhYmxlIExheW91dFN0YXRlLgogICAgICAgICBM YXlvdXRTdGF0ZURpc2FibGVyIGxheW91dFN0YXRlRGlzYWJsZXIoJnZpZXcoKSk7CiAgICAgICAg IG1fbWFya2VyLT5yZW1vdmVGcm9tUGFyZW50KCk7Ci0gICAgICAgIG5ld1BhcmVudC0+YWRkQ2hp bGQobV9tYXJrZXIuZ2V0KCksIGZpcnN0Tm9uTWFya2VyQ2hpbGQobmV3UGFyZW50KSk7CisgICAg ICAgIG5ld1BhcmVudC0+YWRkQ2hpbGQobV9tYXJrZXIsIGZpcnN0Tm9uTWFya2VyQ2hpbGQobmV3 UGFyZW50KSk7CiAgICAgICAgIG1fbWFya2VyLT51cGRhdGVNYXJnaW5zQW5kQ29udGVudCgpOwog ICAgICAgICAvLyBJZiBjdXJyZW50IHBhcmVudCBpcyBhbiBhbm9ueW1vdXMgYmxvY2sgdGhhdCBo YXMgbG9zdCBhbGwgaXRzIGNoaWxkcmVuLCBkZXN0cm95IGl0LgogICAgICAgICBpZiAoY3VycmVu dFBhcmVudCAmJiBjdXJyZW50UGFyZW50LT5pc0Fub255bW91c0Jsb2NrKCkgJiYgIWN1cnJlbnRQ YXJlbnQtPmZpcnN0Q2hpbGQoKSAmJiAhZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpjdXJyZW50UGFy ZW50KS5jb250aW51YXRpb24oKSkKQEAgLTQwMCw3ICs0MDcsNyBAQCB2b2lkIFJlbmRlckxpc3RJ dGVtOjpwb3NpdGlvbkxpc3RNYXJrZXIoKQogICAgICAgICAgICAgTGF5b3V0UmVjdCBtYXJrZXJS ZWN0KG1hcmtlckxvZ2ljYWxMZWZ0ICsgbGluZU9mZnNldCwgYmxvY2tPZmZzZXQsIG1fbWFya2Vy LT53aWR0aCgpLCBtX21hcmtlci0+aGVpZ2h0KCkpOwogICAgICAgICAgICAgaWYgKCFzdHlsZSgp LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCiAgICAgICAgICAgICAgICAgbWFya2VyUmVjdCA9 IG1hcmtlclJlY3QudHJhbnNwb3NlZFJlY3QoKTsKLSAgICAgICAgICAgIFJlbmRlckJveCogbyA9 IG1fbWFya2VyLmdldCgpOworICAgICAgICAgICAgUmVuZGVyQm94KiBvID0gbV9tYXJrZXI7CiAg ICAgICAgICAgICBib29sIHByb3BhZ2F0ZVZpc3VhbE92ZXJmbG93ID0gdHJ1ZTsKICAgICAgICAg ICAgIGJvb2wgcHJvcGFnYXRlTGF5b3V0T3ZlcmZsb3cgPSB0cnVlOwogICAgICAgICAgICAgZG8g ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RJdGVtLmgg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaAppbmRleCA3M2RhNmZi Li4yNTZkNjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEl0ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEl0ZW0uaApA QCAtMzQsNiArMzQsNyBAQCBjbGFzcyBSZW5kZXJMaXN0TWFya2VyOwogY2xhc3MgUmVuZGVyTGlz dEl0ZW0gZmluYWwgOiBwdWJsaWMgUmVuZGVyQmxvY2tGbG93IHsKIHB1YmxpYzoKICAgICBSZW5k ZXJMaXN0SXRlbShFbGVtZW50JiwgUGFzc1JlZjxSZW5kZXJTdHlsZT4pOworICAgIHZpcnR1YWwg flJlbmRlckxpc3RJdGVtKCk7CiAgICAgRWxlbWVudCYgZWxlbWVudCgpIGNvbnN0IHsgcmV0dXJu IGRvd25jYXN0PEVsZW1lbnQ+KG5vZGVGb3JOb25Bbm9ueW1vdXMoKSk7IH0KIAogICAgIGludCB2 YWx1ZSgpIGNvbnN0IHsgaWYgKCFtX2lzVmFsdWVVcFRvRGF0ZSkgdXBkYXRlVmFsdWVOb3coKTsg cmV0dXJuIG1fdmFsdWU7IH0KQEAgLTU1LDEzICs1NiwxMyBAQCBwdWJsaWM6CiAgICAgc3RhdGlj IHZvaWQgdXBkYXRlSXRlbVZhbHVlc0Zvck9yZGVyZWRMaXN0KGNvbnN0IEhUTUxPTGlzdEVsZW1l bnQqKTsKICAgICBzdGF0aWMgdW5zaWduZWQgaXRlbUNvdW50Rm9yT3JkZXJlZExpc3QoY29uc3Qg SFRNTE9MaXN0RWxlbWVudCopOwogCisgICAgdm9pZCBkaWREZXN0cm95TGlzdE1hcmtlcigpIHsg bV9tYXJrZXIgPSBudWxscHRyOyB9CisKIHByaXZhdGU6CiAgICAgdmlydHVhbCBjb25zdCBjaGFy KiByZW5kZXJOYW1lKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gIlJlbmRlckxpc3RJdGVtIjsg fQogCiAgICAgdmlydHVhbCBib29sIGlzTGlzdEl0ZW0oKSBjb25zdCBvdmVycmlkZSB7IHJldHVy biB0cnVlOyB9CiAgICAgCi0gICAgdmlydHVhbCB2b2lkIHdpbGxCZURlc3Ryb3llZCgpIG92ZXJy aWRlOwotCiAgICAgdmlydHVhbCB2b2lkIGluc2VydGVkSW50b1RyZWUoKSBvdmVycmlkZTsKICAg ICB2aXJ0dWFsIHZvaWQgd2lsbEJlUmVtb3ZlZEZyb21UcmVlKCkgb3ZlcnJpZGU7CiAKQEAgLTg1 LDcgKzg2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGV4cGxpY2l0VmFsdWVDaGFuZ2VkKCk7CiAK ICAgICBpbnQgbV9leHBsaWNpdFZhbHVlOwotICAgIFJlbmRlclB0cjxSZW5kZXJMaXN0TWFya2Vy PiBtX21hcmtlcjsKKyAgICBSZW5kZXJMaXN0TWFya2VyKiBtX21hcmtlcjsKICAgICBtdXRhYmxl IGludCBtX3ZhbHVlOwogCiAgICAgYm9vbCBtX2hhc0V4cGxpY2l0VmFsdWUgOiAxOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RNYXJrZXIuY3BwCmluZGV4IGFiMjlhY2Mu LmVkMGExYjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 TWFya2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdE1hcmtl ci5jcHAKQEAgLTExMjgsNiArMTEyOCw3IEBAIFJlbmRlckxpc3RNYXJrZXI6OlJlbmRlckxpc3RN YXJrZXIoUmVuZGVyTGlzdEl0ZW0mIGxpc3RJdGVtLCBQYXNzUmVmPFJlbmRlclN0eWxlCiAKIFJl bmRlckxpc3RNYXJrZXI6On5SZW5kZXJMaXN0TWFya2VyKCkKIHsKKyAgICBtX2xpc3RJdGVtLmRp ZERlc3Ryb3lMaXN0TWFya2VyKCk7CiAgICAgaWYgKG1faW1hZ2UpCiAgICAgICAgIG1faW1hZ2Ut PnJlbW92ZUNsaWVudCh0aGlzKTsKIH0K