191810 2018-11-17 14:03:12 -0800 Clarify RenderLayerCompositor::hasAnyAdditionalCompositedLayers() and related code. 2018-11-17 16:53:33 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1479956 0 simon.fraser 2018-11-17 14:03:12 -0800 Clarify RenderLayerCompositor::hasAnyAdditionalCompositedLayers() and related code. 1479958 1 355202 simon.fraser 2018-11-17 14:03:40 -0800 Created attachment 355202 Patch 1479962 2 355202 zalan 2018-11-17 14:08:08 -0800 Comment on attachment 355202 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=355202&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:1257 > + if (&layer != m_renderView.layer()) { > + ASSERT(m_contentLayersCount > 0); > + --m_contentLayersCount; > + } Don't we prefer the early return style? if (&layer == m_renderView.layer()) return; 1479999 3 simon.fraser 2018-11-17 16:52:29 -0800 https://trac.webkit.org/changeset/238354/webkit and https://trac.webkit.org/changeset/238355/webkit 1480003 4 webkit-bug-importer 2018-11-17 16:53:33 -0800 <rdar://problem/46152495> 355202 2018-11-17 14:03:40 -0800 2018-11-17 14:08:08 -0800 Patch bug-191810-20181117140339.patch text/plain 8672 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWJiNjAzNDFiNTA3MGE5 ZjhiZTM4ZWMyMDU0N2FlMDJjMWVjNjMyZS4uM2U3YzYwNzFhN2M1MjBhOWE4OWJhMTNlMjA4N2Vm YzQxMDM5YTcxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTExLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENsYXJpZnkgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjpoYXNBbnlBZGRpdGlvbmFsQ29tcG9zaXRlZExheWVycygpIGFu ZCByZWxhdGVkIGNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xOTE4MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW5hbWUgbV9jb21wb3NpdGVkTGF5ZXJDb3VudCB0byBtX2NvbnRlbnRMYXllcnND b3VudCBhbmQgaGF2ZSBpdCB0cmFjayBsYXllcnMgb3RoZXIKKyAgICAgICAgdGhhbiB0aGUgUmVu ZGVyVmlldydzIGxheWVyLgorCisgICAgICAgIGhhc0FueUFkZGl0aW9uYWxDb21wb3NpdGVkTGF5 ZXJzKCkgaXMgcmVhbGx5IGFib3V0IHdoZXRoZXIgd2UgY2FuIGRyb3Agb3V0IG9mIGNvbXBvc2l0 aW5nCisgICAgICAgIGJlY2F1c2Ugbm8gY29udGVudCBsYXllciBpcyBjb21wb3NpdGVkLCBhbmQg b3ZlcmxheXMgZG9uJ3QgcmVxdWlyZSBjb21wb3NpdGluZywgc28KKyAgICAgICAgcmVuYW1lIGl0 LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5 ZXJzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNv bXBvc2l0aW5nUmVxdWlyZW1lbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29t cG9zaXRvcjo6bmVlZHNDb21wb3NpdGluZ0ZvckNvbnRlbnRPck92ZXJsYXlzIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6bGF5ZXJCZWNhbWVDb21wb3Np dGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRvcjo6bGF5ZXJCZWNh bWVOb25Db21wb3NpdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9zaXRv cjo6bGF5ZXJUcmVlQXNUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQ29tcG9z aXRvcjo6aGFzQW55QWRkaXRpb25hbENvbXBvc2l0ZWRMYXllcnMgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuaDoKKwogMjAxOC0xMS0x NyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5h bWUgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjppbkNvbXBvc2l0aW5nTW9kZSgpIHRvIHVzZXNDb21w b3NpdGluZygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwCmluZGV4IDY4NGU0MDkyOWZmZjQ5YTg1NGI4MzdiZjUzMDJkYjhkZjQ1NDI0 NzEuLjkzZDRmMDM5YjZkNDFjNGVjMTJmZDgxMDYzNjUyNGNjY2IxZGNiYTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC02 MzIsMTIgKzYzMiw2IEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3Np dGluZ0xheWVyc1RpbWVyRmlyZWQoKQogICAgIHVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKENvbXBv c2l0aW5nVXBkYXRlVHlwZTo6QWZ0ZXJMYXlvdXQpOwogfQogCi1ib29sIFJlbmRlckxheWVyQ29t cG9zaXRvcjo6aGFzQW55QWRkaXRpb25hbENvbXBvc2l0ZWRMYXllcnMoY29uc3QgUmVuZGVyTGF5 ZXImIHJvb3RMYXllcikgY29uc3QKLXsKLSAgICBpbnQgbGF5ZXJDb3VudCA9IG1fY29tcG9zaXRl ZExheWVyQ291bnQgKyBwYWdlKCkucGFnZU92ZXJsYXlDb250cm9sbGVyKCkub3ZlcmxheUNvdW50 KCk7Ci0gICAgcmV0dXJuIGxheWVyQ291bnQgPiAocm9vdExheWVyLmlzQ29tcG9zaXRlZCgpID8g MSA6IDApOwotfQotCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2FuY2VsQ29tcG9zaXRp bmdMYXllclVwZGF0ZSgpCiB7CiAgICAgbV91cGRhdGVDb21wb3NpdGluZ0xheWVyc1RpbWVyLnN0 b3AoKTsKQEAgLTY0Niw3ICs2NDAsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y2Fu Y2VsQ29tcG9zaXRpbmdMYXllclVwZGF0ZSgpCiAvLyBSZXR1cm5zIHRydWUgb24gYSBzdWNjZXNz ZnVsIHVwZGF0ZS4KIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVDb21wb3NpdGlu Z0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlVHlwZSwgUmVuZGVyTGF5ZXIqIHVw ZGF0ZVJvb3QpCiB7Ci0gICAgTE9HX1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nLCBzdHJlYW0gPDwg IlJlbmRlckxheWVyQ29tcG9zaXRvciAiIDw8IHRoaXMgPDwgIiB1cGRhdGVDb21wb3NpdGluZ0xh eWVycyAiIDw8IHVwZGF0ZVR5cGUgPDwgIiByb290ICIgPDwgdXBkYXRlUm9vdCk7CisgICAgTE9H X1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nLCBzdHJlYW0gPDwgIlJlbmRlckxheWVyQ29tcG9zaXRv ciAiIDw8IHRoaXMgPDwgIiB1cGRhdGVDb21wb3NpdGluZ0xheWVycyAiIDw8IHVwZGF0ZVR5cGUg PDwgIiBjb250ZW50TGF5ZXJzQ291bnQgIiA8PCBtX2NvbnRlbnRMYXllcnNDb3VudCk7CiAKICNp ZiBFTkFCTEUoVFJFRV9ERUJVR0dJTkcpCiAgICAgaWYgKGNvbXBvc2l0aW5nTG9nRW5hYmxlZCgp KQpAQCAtNzM5LDcgKzczMyw3IEBAIGJvb2wgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVD b21wb3NpdGluZ0xheWVycyhDb21wb3NpdGluZ1VwZGF0ZVR5cGUgdXBkYXRlCiAgICAgICAgICAg ICBhcHBlbmREb2N1bWVudE92ZXJsYXlMYXllcnMoY2hpbGRMaXN0KTsKICAgICAgICAgICAgIC8v IEV2ZW4gd2hlbiBjaGlsZExpc3QgaXMgZW1wdHksIGRvbid0IGRyb3Agb3V0IG9mIGNvbXBvc2l0 aW5nIG1vZGUgaWYgdGhlcmUgYXJlCiAgICAgICAgICAgICAvLyBjb21wb3NpdGVkIGxheWVycyB0 aGF0IHdlIGRpZG4ndCBoaXQgaW4gb3VyIHRyYXZlcnNhbCAoZS5nLiBiZWNhdXNlIG9mIHZpc2li aWxpdHk6aGlkZGVuKS4KLSAgICAgICAgICAgIGlmIChjaGlsZExpc3QuaXNFbXB0eSgpICYmICFo YXNBbnlBZGRpdGlvbmFsQ29tcG9zaXRlZExheWVycygqdXBkYXRlUm9vdCkpCisgICAgICAgICAg ICBpZiAoY2hpbGRMaXN0LmlzRW1wdHkoKSAmJiAhbmVlZHNDb21wb3NpdGluZ0ZvckNvbnRlbnRP ck92ZXJsYXlzKCkpCiAgICAgICAgICAgICAgICAgZGVzdHJveVJvb3RMYXllcigpOwogICAgICAg ICAgICAgZWxzZSBpZiAobV9yb290Q29udGVudExheWVyKQogICAgICAgICAgICAgICAgIG1fcm9v dENvbnRlbnRMYXllci0+c2V0Q2hpbGRyZW4oV1RGTW92ZShjaGlsZExpc3QpKTsKQEAgLTc2Niw3 ICs3NjAsNyBAQCBib29sIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6dXBkYXRlQ29tcG9zaXRpbmdM YXllcnMoQ29tcG9zaXRpbmdVcGRhdGVUeXBlIHVwZGF0ZQogICAgIGlmIChjb21wb3NpdGluZ0xv Z0VuYWJsZWQoKSkgewogICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZW5kZXJMYXllckNvbXBv c2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzIC0gcG9zdCIpOwogICAgICAgICBzaG93UGFp bnRPcmRlclRyZWUobV9yZW5kZXJWaWV3LmxheWVyKCkpOwotICAgICAgICBMT0coQ29tcG9zaXRp bmcsICJSZW5kZXJMYXllckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzIC0gR3Jh cGhpY3NMYXllcnMgcG9zdCIpOworICAgICAgICBMT0coQ29tcG9zaXRpbmcsICJSZW5kZXJMYXll ckNvbXBvc2l0b3I6OnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzIC0gR3JhcGhpY3NMYXllcnMgcG9z dCwgY29udGVudExheWVyc0NvdW50ICVkIiwgbV9jb250ZW50TGF5ZXJzQ291bnQpOwogICAgICAg ICBzaG93R3JhcGhpY3NMYXllclRyZWUobV9yb290Q29udGVudExheWVyLmdldCgpKTsKICAgICB9 CiAjZW5kaWYKQEAgLTk2Nyw3ICs5NjEsNyBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBhbmNlc3RvcgogICAg IC8vIHRvIGJlIGNvbXBvc2l0ZWQsIHRoZW4gd2UgY2FuIGRyb3Agb3V0IG9mIGNvbXBvc2l0aW5n IG1vZGUgYWx0b2dldGhlci4gSG93ZXZlciwgZG9uJ3QgZHJvcCBvdXQgb2YgY29tcG9zaXRpbmcg bW9kZQogICAgIC8vIGlmIHRoZXJlIGFyZSBjb21wb3NpdGVkIGxheWVycyB0aGF0IHdlIGRpZG4n dCBoaXQgaW4gb3VyIHRyYXZlcnNhbCAoZS5nLiBiZWNhdXNlIG9mIHZpc2liaWxpdHk6aGlkZGVu KS4KICAgICBSZXF1aXJlc0NvbXBvc2l0aW5nRGF0YSByb290TGF5ZXJRdWVyeURhdGE7Ci0gICAg aWYgKGxheWVyLmlzUmVuZGVyVmlld0xheWVyKCkgJiYgIWNoaWxkU3RhdGUuc3VidHJlZUlzQ29t cG9zaXRpbmcgJiYgIXJlcXVpcmVzQ29tcG9zaXRpbmdMYXllcihsYXllciwgcm9vdExheWVyUXVl cnlEYXRhKSAmJiAhbV9mb3JjZUNvbXBvc2l0aW5nTW9kZSAmJiAhaGFzQW55QWRkaXRpb25hbENv bXBvc2l0ZWRMYXllcnMobGF5ZXIpKSB7CisgICAgaWYgKGxheWVyLmlzUmVuZGVyVmlld0xheWVy KCkgJiYgIWNoaWxkU3RhdGUuc3VidHJlZUlzQ29tcG9zaXRpbmcgJiYgIXJlcXVpcmVzQ29tcG9z aXRpbmdMYXllcihsYXllciwgcm9vdExheWVyUXVlcnlEYXRhKSAmJiAhbV9mb3JjZUNvbXBvc2l0 aW5nTW9kZSAmJiAhbmVlZHNDb21wb3NpdGluZ0ZvckNvbnRlbnRPck92ZXJsYXlzKCkpIHsKICAg ICAgICAgLy8gRG9uJ3QgZHJvcCBvdXQgb2YgY29tcG9zaXRpbmcgb24gaU9TLCBiZWNhdXNlIHdl IG1heSBmbGFzaC4gU2VlIDxyZGFyOi8vcHJvYmxlbS84MzQ4MzM3Pi4KICNpZiAhUExBVEZPUk0o SU9TX0ZBTUlMWSkKICAgICAgICAgZW5hYmxlQ29tcG9zaXRpbmdNb2RlKGZhbHNlKTsKQEAgLTEy NDAsMTMgKzEyMzQsMjcgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFwcGVuZERvY3Vt ZW50T3ZlcmxheUxheWVycyhWZWN0b3I8UmVmPEdyYXBoaWNzTGF5ZXIKICAgICBjaGlsZExpc3Qu YXBwZW5kKFdURk1vdmUob3ZlcmxheUhvc3QpKTsKIH0KIAorYm9vbCBSZW5kZXJMYXllckNvbXBv c2l0b3I6Om5lZWRzQ29tcG9zaXRpbmdGb3JDb250ZW50T3JPdmVybGF5cygpIGNvbnN0Cit7Cisg ICAgcmV0dXJuIG1fY29udGVudExheWVyc0NvdW50ICsgcGFnZSgpLnBhZ2VPdmVybGF5Q29udHJv bGxlcigpLm92ZXJsYXlDb3VudCgpOworfQorCit2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6 bGF5ZXJCZWNhbWVDb21wb3NpdGVkKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikKK3sKKyAgICBp ZiAoJmxheWVyICE9IG1fcmVuZGVyVmlldy5sYXllcigpKQorICAgICAgICArK21fY29udGVudExh eWVyc0NvdW50OworfQorCiB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6bGF5ZXJCZWNhbWVO b25Db21wb3NpdGVkKGNvbnN0IFJlbmRlckxheWVyJiBsYXllcikKIHsKICAgICAvLyBJbmZvcm0g dGhlIGluc3BlY3RvciB0aGF0IHRoZSBnaXZlbiBSZW5kZXJMYXllciB3YXMgZGVzdHJveWVkLgor ICAgIC8vIEZJWE1FOiAiZGVzdHJveWVkIiBpcyBhIG1pc25vbWVyLgogICAgIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6cmVuZGVyTGF5ZXJEZXN0cm95ZWQoJnBhZ2UoKSwgbGF5ZXIpOwogCi0g ICAgQVNTRVJUKG1fY29tcG9zaXRlZExheWVyQ291bnQgPiAwKTsKLSAgICAtLW1fY29tcG9zaXRl ZExheWVyQ291bnQ7CisgICAgaWYgKCZsYXllciAhPSBtX3JlbmRlclZpZXcubGF5ZXIoKSkgewor ICAgICAgICBBU1NFUlQobV9jb250ZW50TGF5ZXJzQ291bnQgPiAwKTsKKyAgICAgICAgLS1tX2Nv bnRlbnRMYXllcnNDb3VudDsKKyAgICB9CiB9CiAKICNpZiAhTE9HX0RJU0FCTEVECkBAIC0xOTA3 LDcgKzE5MTUsNyBAQCBTdHJpbmcgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpsYXllclRyZWVBc1Rl eHQoTGF5ZXJUcmVlRmxhZ3MgZmxhZ3MpCiAKICAgICAvLyBEdW1wIGFuIGVtcHR5IGxheWVyIHRy ZWUgb25seSBpZiB0aGUgb25seSBjb21wb3NpdGVkIGxheWVyIGlzIHRoZSBtYWluIGZyYW1lJ3Mg dGlsZWQgYmFja2luZywKICAgICAvLyBzbyB0aGF0IHRlc3RzIGV4cGVjdGluZyB1cyB0byBkcm9w IG91dCBvZiBhY2NlbGVyYXRlZCBjb21wb3NpdGluZyB3aGVuIHRoZXJlIGFyZSBubyBsYXllcnMg c3VjY2VlZC4KLSAgICBpZiAoIWhhc0FueUFkZGl0aW9uYWxDb21wb3NpdGVkTGF5ZXJzKHJvb3RS ZW5kZXJMYXllcigpKSAmJiBkb2N1bWVudFVzZXNUaWxlZEJhY2tpbmcoKSAmJiAhKGxheWVyVHJl ZUJlaGF2aW9yICYgTGF5ZXJUcmVlQXNUZXh0SW5jbHVkZVRpbGVDYWNoZXMpKQorICAgIGlmICgh aGFzQ29udGVudENvbXBvc2l0aW5nTGF5ZXJzKCkgJiYgZG9jdW1lbnRVc2VzVGlsZWRCYWNraW5n KCkgJiYgIShsYXllclRyZWVCZWhhdmlvciAmIExheWVyVHJlZUFzVGV4dEluY2x1ZGVUaWxlQ2Fj aGVzKSkKICAgICAgICAgbGF5ZXJUcmVlVGV4dCA9IGVtcHR5U3RyaW5nKCk7CiAKICAgICAvLyBU aGUgdHJ1ZSByb290IGxheWVyIGlzIG5vdCBpbmNsdWRlZCBpbiB0aGUgZHVtcCwgc28gaWYgd2Ug d2FudCB0byByZXBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXll ckNvbXBvc2l0b3IuaAppbmRleCA2NzM0ZTVhNWJhZjhlZWViODFlZmE3ODI4MWVkNmJlMjlkMzEx ODBmLi43MGRkZTUzMmU5ZWE2M2Y1ZjZjMzAzNWI5ZDg2NzkzOGZmNTUzNzdiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5oCkBAIC0xMDUs NiArMTA1LDkgQEAgcHVibGljOgogCiAgICAgYm9vbCBpbkZvcmNlZENvbXBvc2l0aW5nTW9kZSgp IGNvbnN0IHsgcmV0dXJuIG1fZm9yY2VDb21wb3NpdGluZ01vZGU7IH0KIAorICAgIC8vIFRydWUg d2hlbiBzb21lIGNvbnRlbnQgZWxlbWVudCBvdGhlciB0aGFuIHRoZSByb290IGlzIGNvbXBvc2l0 ZWQuCisgICAgYm9vbCBoYXNDb250ZW50Q29tcG9zaXRpbmdMYXllcnMoKSBjb25zdCB7IHJldHVy biBtX2NvbnRlbnRMYXllcnNDb3VudDsgfQorCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIHRoZSBh Y2NlbGVyYXRlZCBjb21wb3NpdGluZyBpcyBlbmFibGVkCiAgICAgYm9vbCBoYXNBY2NlbGVyYXRl ZENvbXBvc2l0aW5nKCkgY29uc3QgeyByZXR1cm4gbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5n OyB9CiAKQEAgLTIxNiw3ICsyMTksNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGNsZWFyQmFja2lu Z0ZvckFsbExheWVycygpOwogICAgIAotICAgIHZvaWQgbGF5ZXJCZWNhbWVDb21wb3NpdGVkKGNv bnN0IFJlbmRlckxheWVyJikgeyArK21fY29tcG9zaXRlZExheWVyQ291bnQ7IH0KKyAgICB2b2lk IGxheWVyQmVjYW1lQ29tcG9zaXRlZChjb25zdCBSZW5kZXJMYXllciYpOwogICAgIHZvaWQgbGF5 ZXJCZWNhbWVOb25Db21wb3NpdGVkKGNvbnN0IFJlbmRlckxheWVyJik7CiAgICAgCiAjaWYgRU5B QkxFKFZJREVPKQpAQCAtMzg2LDcgKzM4OSw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBpc1J1bm5p bmdUcmFuc2Zvcm1BbmltYXRpb24oUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYpIGNvbnN0OwogCiAg ICAgdm9pZCBhcHBlbmREb2N1bWVudE92ZXJsYXlMYXllcnMoVmVjdG9yPFJlZjxHcmFwaGljc0xh eWVyPj4mKTsKLSAgICBib29sIGhhc0FueUFkZGl0aW9uYWxDb21wb3NpdGVkTGF5ZXJzKGNvbnN0 IFJlbmRlckxheWVyJiByb290TGF5ZXIpIGNvbnN0OworCisgICAgYm9vbCBuZWVkc0NvbXBvc2l0 aW5nRm9yQ29udGVudE9yT3ZlcmxheXMoKSBjb25zdDsKIAogICAgIHZvaWQgZW5zdXJlUm9vdExh eWVyKCk7CiAgICAgdm9pZCBkZXN0cm95Um9vdExheWVyKCk7CkBAIC01MDUsNyArNTA5LDcgQEAg cHJpdmF0ZToKIAogICAgIGJvb2wgbV9pc1RyYWNraW5nUmVwYWludHMgeyBmYWxzZSB9OyAvLyBV c2VkIGZvciB0ZXN0aW5nLgogCi0gICAgaW50IG1fY29tcG9zaXRlZExheWVyQ291bnQgeyAwIH07 CisgICAgdW5zaWduZWQgbV9jb250ZW50TGF5ZXJzQ291bnQgeyAwIH07CiAgICAgdW5zaWduZWQg bV9sYXllcnNXaXRoVGlsZWRCYWNraW5nQ291bnQgeyAwIH07CiAgICAgdW5zaWduZWQgbV9sYXll ckZsdXNoQ291bnQgeyAwIH07CiAgICAgdW5zaWduZWQgbV9jb21wb3NpdGluZ1VwZGF0ZUNvdW50 IHsgMCB9Owo=