173121 2017-06-08 16:01:20 -0700 Web Inspector: Web inspector does not show non-shadow children of an element with a shadow root (e.g. <video>) 2017-06-09 14:59:08 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue eric.carlson inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1317114 0 joepeck 2017-06-08 16:01:20 -0700 Summary: Web inspector does not show non-shadow children of an element with a shadow root (e.g. <video>) Test: <video controls> <source src="video.mp4" type="video/mp4"> </video> Steps to Reproduce: 1. Inspect the <video> 2. Expand <video> to show children => Expected to see <source> only saw Shadow Root 1317115 1 joepeck 2017-06-08 16:03:09 -0700 <rdar://problem/30948943> 1317174 2 312373 joepeck 2017-06-08 19:22:36 -0700 Created attachment 312373 [PATCH] Proposed Fix 1317175 3 312373 joepeck 2017-06-08 19:27:01 -0700 Comment on attachment 312373 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=312373&action=review > Source/WebCore/inspector/InspectorDOMAgent.cpp:1370 > + // Always send children if there are ShadowRoots since shadow and non-shadow children are bundled. An alternative solution is to treat actual child nodes and shadow roots more discretely in the frontend. Currently they are all shared in _children and the existence of _children affects things. Switching to treating things more carefully the children can continue to be requested lazily. But this likely means a lot of places in the frontend will need to change based on how _children is used. I will look into this alternate solution and see how it compares to this current solution. The approach in this patch could be problematic if the entire tree (or a very large portion) had nodes with shadow roots, but I don't think that is realistic. 1317590 4 312373 joepeck 2017-06-09 13:07:54 -0700 Comment on attachment 312373 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=312373&action=review >> Source/WebCore/inspector/InspectorDOMAgent.cpp:1370 >> + // Always send children if there are ShadowRoots since shadow and non-shadow children are bundled. > > An alternative solution is to treat actual child nodes and shadow roots more discretely in the frontend. Currently they are all shared in _children and the existence of _children affects things. Switching to treating things more carefully the children can continue to be requested lazily. But this likely means a lot of places in the frontend will need to change based on how _children is used. I will look into this alternate solution and see how it compares to this current solution. > > The approach in this patch could be problematic if the entire tree (or a very large portion) had nodes with shadow roots, but I don't think that is realistic. I think the alternative approach will be simpler and better. I'm going to r- this. 1317608 5 312486 joepeck 2017-06-09 13:48:34 -0700 Created attachment 312486 [PATCH] Proposed Fix 1317612 6 312486 mattbaker 2017-06-09 14:00:04 -0700 Comment on attachment 312486 [PATCH] Proposed Fix r=me. Nice work avoiding a change to the backend. 1317647 7 312486 commit-queue 2017-06-09 14:59:06 -0700 Comment on attachment 312486 [PATCH] Proposed Fix Clearing flags on attachment: 312486 Committed r218020: <http://trac.webkit.org/changeset/218020> 1317648 8 commit-queue 2017-06-09 14:59:08 -0700 All reviewed patches have been landed. Closing bug. 312373 2017-06-08 19:22:36 -0700 2017-06-09 13:48:34 -0700 [PATCH] Proposed Fix shadow-root-1.patch text/plain 8675 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmY2ExMjUxYzQzMS4uYWMyNTI3MGU3YzUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxNy0wNi0wOCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFdlYiBpbnNwZWN0b3IgZG9lcyBub3Qgc2hvdyBub24tc2hhZG93 IGNoaWxkcmVuIG9mIGFuIGVsZW1lbnQgd2l0aCBhIHNoYWRvdyByb290IChlLmcuIDx2aWRlbz4p CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMxMjEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwOTQ4OTQzPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5v bi1zaGFkb3ctY2hpbGRyZW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0 b3IvZG9tL3NoYWRvdy1hbmQtbm9uLXNoYWRvdy1jaGlsZHJlbi5odG1sOiBBZGRlZC4KKwogMjAx Ny0wNi0wNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgcm9sbG91dCByMjE3ODA3LiBDYXVzZWQgYSB0ZXN0IHRvIGNyYXNoLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5vbi1zaGFkb3ct Y2hpbGRyZW4tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ct YW5kLW5vbi1zaGFkb3ctY2hpbGRyZW4tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwLi5lZjNhZWFkZWNkMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kb20vc2hhZG93LWFuZC1ub24tc2hhZG93LWNoaWxkcmVuLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDExIEBACitUZXN0IGZvciBET01Ob2RlLmNoaWxkcmVuIG9mIGFu IGVsZW1lbnQgd2l0aCBhIHNoYWRvdyBhbmQgbm9uLXNoYWRvdyBjaGlsZHJlbi4KKworCisKKz09 IFJ1bm5pbmcgdGVzdCBzdWl0ZTogRE9NTm9kZS5TaGFkb3dBbmROb25TaGFkb3dDaGlsZHJlbgor LS0gUnVubmluZyB0ZXN0IGNhc2U6IERPTU5vZGUuU2hhZG93QW5kTm9uU2hhZG93Q2hpbGRyZW4u VmlkZW9XaXRoU291cmNlCitQQVNTOiBET01Ob2RlIHNob3VsZCBiZSBhIGB2aWRlb2AgZWxlbWVu dC4KK1BBU1M6IERPTU5vZGUgc2hvdWxkIGhhdmUgMiBjaGlsZHJlbi4KK1BBU1M6IERPTU5vZGUg MXN0IGNoaWxkIHNob3VsZCBiZSBhIFNoYWRvd1Jvb3QuCitQQVNTOiBET01Ob2RlIDJuZCBjaGls ZCBzaG91bGQgYmUgYSBgc291cmNlYCBlbGVtZW50LgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZG9tL3NoYWRvdy1hbmQtbm9uLXNoYWRvdy1jaGlsZHJlbi5odG1sIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5vbi1zaGFkb3ctY2hpbGRyZW4uaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNjViZGIzMmNjMzIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZG9tL3NoYWRvdy1hbmQtbm9u LXNoYWRvdy1jaGlsZHJlbi5odG1sCkBAIC0wLDAgKzEsNDMgQEAKKzwhRE9DVFlQRSBodG1sPgor PGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9odHRwL3Rlc3RzL2luc3BlY3Rvci9y ZXNvdXJjZXMvaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KKy8vIEZJWE1F OiBMYXlvdXRUZXN0IHdpdGggPHZpZGVvPiBlbmRzIGJlZm9yZSBydW5uaW5nIGFueSBvbmxvYWQg aGFuZGxlci4KK2lmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICB0ZXN0UnVubmVyLndhaXRVbnRp bERvbmUoKTsKKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgSW5zcGVjdG9yVGVzdC5kZWJ1Zygp OworCisgICAgbGV0IGRvY3VtZW50Tm9kZUlkOworICAgIGxldCBzdWl0ZSA9IEluc3BlY3RvclRl c3QuY3JlYXRlQXN5bmNTdWl0ZSgiRE9NTm9kZS5TaGFkb3dBbmROb25TaGFkb3dDaGlsZHJlbiIp OworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAiRE9NTm9kZS5TaGFk b3dBbmROb25TaGFkb3dDaGlsZHJlbi5WaWRlb1dpdGhTb3VyY2UiLAorICAgICAgICBkZXNjcmlw dGlvbjogIkNoZWNrIGZvciBhbGwgY2hpbGRyZW4gb2YgYSB2aWRlbyB3aXRoIGEgc291cmNlIGNo aWxkLiIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBXZWJJ bnNwZWN0b3IuZG9tVHJlZU1hbmFnZXIucXVlcnlTZWxlY3Rvcihkb2N1bWVudE5vZGVJZCwgIiN0 ZXN0LXZpZGVvIiwgKG5vZGVJZCkgPT4geworICAgICAgICAgICAgICAgIGxldCBkb21Ob2RlID0g V2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2VyLm5vZGVGb3JJZChub2RlSWQpOworICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZG9tTm9kZS5ub2RlTmFtZSgpLCAiVklE RU8iLCAiRE9NTm9kZSBzaG91bGQgYmUgYSBgdmlkZW9gIGVsZW1lbnQuIik7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChkb21Ob2RlLmNoaWxkcmVuLmxlbmd0aCwg MiwgIkRPTU5vZGUgc2hvdWxkIGhhdmUgMiBjaGlsZHJlbi4iKTsKKyAgICAgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdFRoYXQoZG9tTm9kZS5jaGlsZHJlblswXS5pc1NoYWRvd1Jvb3Qo KSwgIkRPTU5vZGUgMXN0IGNoaWxkIHNob3VsZCBiZSBhIFNoYWRvd1Jvb3QuIik7CisgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChkb21Ob2RlLmNoaWxkcmVuWzFdLm5v ZGVOYW1lKCksICJTT1VSQ0UiLCAiRE9NTm9kZSAybmQgY2hpbGQgc2hvdWxkIGJlIGEgYHNvdXJj ZWAgZWxlbWVudC4iKTsKKyAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICB9 KTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgV2ViSW5zcGVjdG9yLmRvbVRyZWVNYW5hZ2Vy LnJlcXVlc3REb2N1bWVudCgoZG9jdW1lbnROb2RlKSA9PiB7CisgICAgICAgIGRvY3VtZW50Tm9k ZUlkID0gZG9jdW1lbnROb2RlLmlkOworICAgICAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5p c2goKTsKKyAgICB9KTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5U ZXN0KCkiPgorPHA+VGVzdCBmb3IgRE9NTm9kZS5jaGlsZHJlbiBvZiBhbiBlbGVtZW50IHdpdGgg YSBzaGFkb3cgYW5kIG5vbi1zaGFkb3cgY2hpbGRyZW4uPC9wPgorPHZpZGVvIGlkPSJ0ZXN0LXZp ZGVvIiBjb250cm9scz48c291cmNlIHNyYz0iZG9lcy1ub3QtZXhpc3QubXA0IiB0eXBlPSJ2aWRl by9tcDQiPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg4MjUwZDVi M2IuLjQyNjRkNTM2MDA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTctMDYtMDgg IEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBXZWIgaW5zcGVjdG9yIGRvZXMgbm90IHNob3cgbm9uLXNoYWRvdyBjaGlsZHJlbiBv ZiBhbiBlbGVtZW50IHdpdGggYSBzaGFkb3cgcm9vdCAoZS5nLiA8dmlkZW8+KQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMTIxCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zMDk0ODk0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUZXN0OiBpbnNwZWN0b3IvZG9tL3NoYWRvdy1hbmQtbm9uLXNoYWRv dy1jaGlsZHJlbi5odG1sCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NQWdlbnQ6OmJ1aWxkT2JqZWN0Rm9y Tm9kZSk6CisgICAgICAgIEFsd2F5cyBpbmNsdWRlIHRoZSBjaGlsZHJlbiBpZiB3ZSBhbHNvIGhh dmUgYSBzaGFkb3cgcm9vdC4gVGhlIGZyb250ZW5kCisgICAgICAgIHRyZWF0cyBib3RoIGRpcmVj dCBlbGVtZW50IGNoaWxkcmVuIGFuZCBzaGFkb3cgcm9vdHMgYXMgdGhlIHRvdGFsIGNoaWxkcmVu LAorICAgICAgICBzbyBpdCB3aWxsIHdhbnQgYm90aCBhbnl3YXlzLgorCiAyMDE3LTA2LTA2ICBK b3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBSZXNv dXJjZSBUaW1pbmcgLyBVc2VyIFRpbWluZyBmcm9tIGV4cGVyaW1lbnRhbCBmZWF0dXJlcyBpbnRv IG1haW4gcHJlZmVyZW5jZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JET01BZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NQWdlbnQuY3BwCmluZGV4IDFjOTY1OTE3MDU5Li43MDcxYjNkZTc2MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwCkBAIC0xMzY3LDYgKzEz NjcsOSBAQCBSZWY8SW5zcGVjdG9yOjpQcm90b2NvbDo6RE9NOjpOb2RlPiBJbnNwZWN0b3JET01B Z2VudDo6YnVpbGRPYmplY3RGb3JOb2RlKE5vZGUqCiAgICAgaWYgKG5vZGUtPmlzQ29udGFpbmVy Tm9kZSgpKSB7CiAgICAgICAgIGludCBub2RlQ291bnQgPSBpbm5lckNoaWxkTm9kZUNvdW50KG5v ZGUpOwogICAgICAgICB2YWx1ZS0+c2V0Q2hpbGROb2RlQ291bnQobm9kZUNvdW50KTsKKyAgICAg ICAgLy8gQWx3YXlzIHNlbmQgY2hpbGRyZW4gaWYgdGhlcmUgYXJlIFNoYWRvd1Jvb3RzIHNpbmNl IHNoYWRvdyBhbmQgbm9uLXNoYWRvdyBjaGlsZHJlbiBhcmUgYnVuZGxlZC4KKyAgICAgICAgaWYg KCFkZXB0aCAmJiBpczxFbGVtZW50Pigqbm9kZSkgJiYgZG93bmNhc3Q8RWxlbWVudD4oKm5vZGUp LnNoYWRvd1Jvb3QoKSkKKyAgICAgICAgICAgIGRlcHRoID0gMTsKICAgICAgICAgUmVmPEluc3Bl Y3Rvcjo6UHJvdG9jb2w6OkFycmF5PEluc3BlY3Rvcjo6UHJvdG9jb2w6OkRPTTo6Tm9kZT4+IGNo aWxkcmVuID0gYnVpbGRBcnJheUZvckNvbnRhaW5lckNoaWxkcmVuKG5vZGUsIGRlcHRoLCBub2Rl c01hcCk7CiAgICAgICAgIGlmIChjaGlsZHJlbi0+bGVuZ3RoKCkgPiAwKQogICAgICAgICAgICAg dmFsdWUtPnNldENoaWxkcmVuKFdURk1vdmUoY2hpbGRyZW4pKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCmluZGV4IGJmNThlOTU1YjRjLi5mNzQyOWI1NWZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMDYtMDggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29y YXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBXZWIgaW5zcGVjdG9yIGRv ZXMgbm90IHNob3cgbm9uLXNoYWRvdyBjaGlsZHJlbiBvZiBhbiBlbGVtZW50IHdpdGggYSBzaGFk b3cgcm9vdCAoZS5nLiA8dmlkZW8+KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTczMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDk0ODk0Mz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NTm9k ZSk6CisgICAgICAgIEVuc3VyZSB3ZSBwb3B1bGF0ZSBfY2hpbGRyZW4gd2hlbiB3ZSBoYXZlIGJv dGggdGhlIHNoYWRvd1Jvb3RzIGFuZAorICAgICAgICBhY3R1YWwgY2hpbGRyZW4gcGF5bG9hZHMu IEN1cnJlbnQgYmFja2VuZHMgd2lsbCBhbHdheXMgc2VuZCB0aGVtCisgICAgICAgIGJvdGggaWYg dGhlcmUgd2FzIGEgc2hhZG93Um9vdCBidXQgaW4gY2FzZSBvZiBvbGRlciBiYWNrZW5kcyB3ZQor ICAgICAgICBjYW4gcmVxdWVzdCB0aGUgY2hpbGRyZW4gYW5kIHBvcHVsYXRlIF9jaGlsZHJlbiB3 aGVuIHdlIGhhdmUgYm90aC4KKwogMjAxNy0wNi0wNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgcm9sbG91dCByMjE3ODA3LiBDYXVz ZWQgYSB0ZXN0IHRvIGNyYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwppbmRleCA3OWVmNmFkNGY3OS4uYzkxZmI5MmJk N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9ET01Ob2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9ET01Ob2RlLmpzCkBAIC03Myw2ICs3Myw5IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0g Y2xhc3MgRE9NTm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5f ZW5hYmxlZFBzZXVkb0NsYXNzZXMgPSBbXTsKIAogICAgICAgICAvLyBGSVhNRTogVGhlIGxvZ2lj IGFyb3VuZCB0aGlzLl9zaGFkb3dSb290cyBhbmQgdGhpcy5fY2hpbGRyZW4gaXMgdmVyeSBjb25m dXNpbmcuCisgICAgICAgIC8vIFdlIGV2ZW50dWFsbHkgaW5jbHVkZSBzaGFkb3cgcm9vdHMgYXQg dGhlIHN0YXJ0IG9mIF9jaGlsZHJlbi4gSG93ZXZlciB3ZSBtaWdodAorICAgICAgICAvLyBub3Qg aGF2ZSBvdXIgYWN0dWFsIGNoaWxkcmVuIHlldC4gU28gd2UgdHJ5IHRvIGRlZmVyIGluaXRpYWxp emluZyBfY2hpbGRyZW4gdW50aWwKKyAgICAgICAgLy8gd2UgaGF2ZSBib3RoIHNoYWRvd1Jvb3Rz IGFuZCBjaGlsZCBub2Rlcy4KICAgICAgICAgdGhpcy5fc2hhZG93Um9vdHMgPSBbXTsKICAgICAg ICAgaWYgKHBheWxvYWQuc2hhZG93Um9vdHMpIHsKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgcGF5bG9hZC5zaGFkb3dSb290cy5sZW5ndGg7ICsraSkgewpAQCAtODMsNiArODYsMTcg QEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUgPSBjbGFzcyBET01Ob2RlIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICAgICAgfQogICAgICAgICB9CiAKKyAgICAgICAgaWYgKHBheWxv YWQuY2hpbGRyZW4pCisgICAgICAgICAgICB0aGlzLl9zZXRDaGlsZHJlblBheWxvYWQocGF5bG9h ZC5jaGlsZHJlbik7CisgICAgICAgIGVsc2UgaWYgKCF0aGlzLl9jaGlsZHJlbiAmJiB0aGlzLl9z aGFkb3dSb290cy5sZW5ndGgpIHsKKyAgICAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyAx MC4zKTogQmFja2VuZCBkaWQgbm90IGFsd2F5cyBzZW5kIGNoaWxkcmVuIGlmIHRoZXJlIHdlcmUg c2hhZG93IHJvb3RzLgorICAgICAgICAgICAgLy8gUmVxdWVzdCB0aGUgbm9uLXNoYWRvdyBjaGls ZHJlbiB0byBhcHBlbmQgdG8gb3VyIGNoaWxkIGxpc3Qgd2l0aCB0aGUgc2hhZG93IHJvb3RzLgor ICAgICAgICAgICAgaWYgKHRoaXMuX2NoaWxkTm9kZUNvdW50KQorICAgICAgICAgICAgICAgIHRo aXMuZ2V0Q2hpbGROb2RlcygpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHRo aXMuX2NoaWxkcmVuID0gdGhpcy5fc2hhZG93Um9vdHMuc2xpY2UoKTsKKyAgICAgICAgfQorCiAg ICAgICAgIGlmICh0aGlzLl9ub2RlVHlwZSA9PT0gTm9kZS5FTEVNRU5UX05PREUpCiAgICAgICAg ICAgICB0aGlzLl9jdXN0b21FbGVtZW50U3RhdGUgPSBwYXlsb2FkLmN1c3RvbUVsZW1lbnRTdGF0 ZSB8fCBXZWJJbnNwZWN0b3IuRE9NTm9kZS5DdXN0b21FbGVtZW50U3RhdGUuQnVpbHRpbjsKICAg ICAgICAgZWxzZQpAQCAtOTMsMTEgKzEwNyw2IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gY2xh c3MgRE9NTm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIHRoaXMu X3RlbXBsYXRlQ29udGVudC5wYXJlbnROb2RlID0gdGhpczsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChwYXlsb2FkLmNoaWxkcmVuKQotICAgICAgICAgICAgdGhpcy5fc2V0Q2hpbGRyZW5QYXls b2FkKHBheWxvYWQuY2hpbGRyZW4pOwotICAgICAgICBlbHNlIGlmICghdGhpcy5fY2hpbGRyZW4g JiYgdGhpcy5fc2hhZG93Um9vdHMubGVuZ3RoKQotICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW4g PSB0aGlzLl9zaGFkb3dSb290cy5zbGljZSgpOwotCiAgICAgICAgIHRoaXMuX3BzZXVkb0VsZW1l bnRzID0gbmV3IE1hcDsKICAgICAgICAgaWYgKHBheWxvYWQucHNldWRvRWxlbWVudHMpIHsKICAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGF5bG9hZC5wc2V1ZG9FbGVtZW50cy5sZW5n dGg7ICsraSkgewo= 312486 2017-06-09 13:48:34 -0700 2017-06-09 14:59:06 -0700 [PATCH] Proposed Fix better-2.patch text/plain 7022 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmY2ExMjUxYzQzMS4uMzU0YjA4MGEwYWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAor MjAxNy0wNi0wOSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IFdlYiBpbnNwZWN0b3IgZG9lcyBub3Qgc2hvdyBub24tc2hhZG93 IGNoaWxkcmVuIG9mIGFuIGVsZW1lbnQgd2l0aCBhIHNoYWRvdyByb290IChlLmcuIDx2aWRlbz4p CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzMxMjEK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwOTQ4OTQzPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5v bi1zaGFkb3ctY2hpbGRyZW4tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0 b3IvZG9tL3NoYWRvdy1hbmQtbm9uLXNoYWRvdy1jaGlsZHJlbi5odG1sOiBBZGRlZC4KKwogMjAx Ny0wNi0wNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQgcm9sbG91dCByMjE3ODA3LiBDYXVzZWQgYSB0ZXN0IHRvIGNyYXNoLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5vbi1zaGFkb3ct Y2hpbGRyZW4tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ct YW5kLW5vbi1zaGFkb3ctY2hpbGRyZW4tZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwLi40M2RiMzgzNmUzMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2luc3BlY3Rvci9kb20vc2hhZG93LWFuZC1ub24tc2hhZG93LWNoaWxkcmVuLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDE0IEBACitUZXN0IGZvciBET01Ob2RlLmNoaWxkcmVuIG9mIGFu IGVsZW1lbnQgd2l0aCBhIHNoYWRvdyBhbmQgbm9uLXNoYWRvdyBjaGlsZHJlbi4KKworCisKKz09 IFJ1bm5pbmcgdGVzdCBzdWl0ZTogRE9NTm9kZS5TaGFkb3dBbmROb25TaGFkb3dDaGlsZHJlbgor LS0gUnVubmluZyB0ZXN0IGNhc2U6IERPTU5vZGUuU2hhZG93QW5kTm9uU2hhZG93Q2hpbGRyZW4u VmlkZW9XaXRoU291cmNlCitQQVNTOiBET01Ob2RlIHNob3VsZCBiZSBhIGB2aWRlb2AgZWxlbWVu dC4KK1BBU1M6IERPTU5vZGUgc2hvdWxkIGhhdmUgY2hpbGQgbm9kZXMuCitQQVNTOiBET01Ob2Rl IHNob3VsZCBpbmRpY2F0ZSBpdCBoYXMgMiBjaGlsZCBub2Rlcy4KK1BBU1M6IERPTU5vZGUgY2hp bGRyZW4gc2hvdWxkIGJlIG51bGwuCitQQVNTOiBET01Ob2RlIHNob3VsZCBoYXZlIDIgY2hpbGRy ZW4uCitQQVNTOiBET01Ob2RlIDFzdCBjaGlsZCBzaG91bGQgYmUgYSBTaGFkb3dSb290LgorUEFT UzogRE9NTm9kZSAybmQgY2hpbGQgc2hvdWxkIGJlIGEgYHNvdXJjZWAgZWxlbWVudC4KKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RvbS9zaGFkb3ctYW5kLW5vbi1zaGFkb3ct Y2hpbGRyZW4uaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vc2hhZG93LWFuZC1ub24t c2hhZG93LWNoaWxkcmVuLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAuLjM2ZDQ5N2UyY2M5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RvbS9zaGFkb3ctYW5kLW5vbi1zaGFkb3ctY2hpbGRyZW4uaHRtbApAQCAtMCwwICsxLDQ3IEBA Cis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0 cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4K KzxzY3JpcHQ+CisvLyBGSVhNRTogTGF5b3V0VGVzdCB3aXRoIDx2aWRlbz4gZW5kcyBiZWZvcmUg cnVubmluZyBhbnkgb25sb2FkIGhhbmRsZXIuCitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAg dGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIGxl dCBkb2N1bWVudE5vZGVJZDsKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZUFz eW5jU3VpdGUoIkRPTU5vZGUuU2hhZG93QW5kTm9uU2hhZG93Q2hpbGRyZW4iKTsKKworICAgIHN1 aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkRPTU5vZGUuU2hhZG93QW5kTm9uU2hh ZG93Q2hpbGRyZW4uVmlkZW9XaXRoU291cmNlIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJDaGVj ayBmb3IgYWxsIGNoaWxkcmVuIG9mIGEgdmlkZW8gd2l0aCBhIHNvdXJjZSBjaGlsZC4iLAorICAg ICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmRv bVRyZWVNYW5hZ2VyLnF1ZXJ5U2VsZWN0b3IoZG9jdW1lbnROb2RlSWQsICIjdGVzdC12aWRlbyIs IChub2RlSWQpID0+IHsKKyAgICAgICAgICAgICAgICBsZXQgZG9tTm9kZSA9IFdlYkluc3BlY3Rv ci5kb21UcmVlTWFuYWdlci5ub2RlRm9ySWQobm9kZUlkKTsKKyAgICAgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV4cGVjdEVxdWFsKGRvbU5vZGUubm9kZU5hbWUoKSwgIlZJREVPIiwgIkRPTU5v ZGUgc2hvdWxkIGJlIGEgYHZpZGVvYCBlbGVtZW50LiIpOworICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0VGhhdChkb21Ob2RlLmhhc0NoaWxkTm9kZXMoKSwgIkRPTU5vZGUgc2hv dWxkIGhhdmUgY2hpbGQgbm9kZXMuIik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RUaGF0KGRvbU5vZGUuY2hpbGROb2RlQ291bnQsICJET01Ob2RlIHNob3VsZCBpbmRpY2F0 ZSBpdCBoYXMgMiBjaGlsZCBub2Rlcy4iKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdE51bGwoZG9tTm9kZS5jaGlsZHJlbiwgIkRPTU5vZGUgY2hpbGRyZW4gc2hvdWxkIGJl IG51bGwuIik7CisgICAgICAgICAgICAgICAgZG9tTm9kZS5nZXRDaGlsZE5vZGVzKChjaGlsZHJl bikgPT4geworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydChjaGlsZHJl biwgZG9tTm9kZS5jaGlsZHJlbik7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwoZG9tTm9kZS5jaGlsZHJlbi5sZW5ndGgsIDIsICJET01Ob2RlIHNob3VsZCBo YXZlIDIgY2hpbGRyZW4uIik7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhw ZWN0VGhhdChkb21Ob2RlLmNoaWxkcmVuWzBdLmlzU2hhZG93Um9vdCgpLCAiRE9NTm9kZSAxc3Qg Y2hpbGQgc2hvdWxkIGJlIGEgU2hhZG93Um9vdC4iKTsKKyAgICAgICAgICAgICAgICAgICAgSW5z cGVjdG9yVGVzdC5leHBlY3RFcXVhbChkb21Ob2RlLmNoaWxkcmVuWzFdLm5vZGVOYW1lKCksICJT T1VSQ0UiLCAiRE9NTm9kZSAybmQgY2hpbGQgc2hvdWxkIGJlIGEgYHNvdXJjZWAgZWxlbWVudC4i KTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOyAKKyAgICAgICAgICAgICAgICB9KTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBXZWJJbnNwZWN0b3Iu ZG9tVHJlZU1hbmFnZXIucmVxdWVzdERvY3VtZW50KChkb2N1bWVudE5vZGUpID0+IHsKKyAgICAg ICAgZG9jdW1lbnROb2RlSWQgPSBkb2N1bWVudE5vZGUuaWQ7CisgICAgICAgIHN1aXRlLnJ1blRl c3RDYXNlc0FuZEZpbmlzaCgpOworICAgIH0pOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0IGZvciBET01Ob2RlLmNoaWxkcmVuIG9mIGFu IGVsZW1lbnQgd2l0aCBhIHNoYWRvdyBhbmQgbm9uLXNoYWRvdyBjaGlsZHJlbi48L3A+Cis8dmlk ZW8gaWQ9InRlc3QtdmlkZW8iIGNvbnRyb2xzPjxzb3VyY2Ugc3JjPSJkb2VzLW5vdC1leGlzdC5t cDQiIHR5cGU9InZpZGVvL21wNCI+PC92aWRlbz4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCmluZGV4IGJmNThlOTU1YjRjLi40Zjg4NmFhNTI4NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTctMDYtMDkgIEpvc2VwaCBQZWNvcmFy byAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBXZWIgaW5z cGVjdG9yIGRvZXMgbm90IHNob3cgbm9uLXNoYWRvdyBjaGlsZHJlbiBvZiBhbiBlbGVtZW50IHdp dGggYSBzaGFkb3cgcm9vdCAoZS5nLiA8dmlkZW8+KQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczMTIxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8z MDk0ODk0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRE9NTm9kZSk6CisgICAgICAgIE9ubHkgcG9wdWxhdGUgX2NoaWxkcmVuIHdoZW4gd2UgaGF2 ZSBib3RoIHRoZSBzaGFkb3dSb290cyBhbmQKKyAgICAgICAgYWN0dWFsIGNoaWxkcmVuIHBheWxv YWRzLiBCYWNrZW5kcyBhbHdheXMgc2VuZCBzaGFkb3dSb290cyBidXQKKyAgICAgICAgb25seSBz ZW5kIGNoaWxkcmVuIHdoZW4gcmVxdWVzdGVkLiBTbyBpZiB3ZSBoYXZlIHNoYWRvd1Jvb3RzCisg ICAgICAgIGJ1dCBleHBlY3QgYWN0dWFsIGNoaWxkcmVuLCBkb24ndCBwb3B1bGF0ZSBfY2hpbGRy ZW4gdW50aWwgd2UKKyAgICAgICAgcmVxdWVzdCB0aGUgY2hpbGQgbm9kZXMuCisKIDIwMTctMDYt MDYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkIHJvbGxvdXQgcjIxNzgwNy4gQ2F1c2VkIGEgdGVzdCB0byBjcmFzaC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01Ob2RlLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTU5vZGUuanMK aW5kZXggNzllZjZhZDRmNzkuLjhmMjQwZGUyN2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvRE9NTm9kZS5qcwpAQCAtNzMsNiArNzMs OSBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGNsYXNzIERPTU5vZGUgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuT2JqZWN0CiAgICAgICAgIHRoaXMuX2VuYWJsZWRQc2V1ZG9DbGFzc2VzID0gW107CiAK ICAgICAgICAgLy8gRklYTUU6IFRoZSBsb2dpYyBhcm91bmQgdGhpcy5fc2hhZG93Um9vdHMgYW5k IHRoaXMuX2NoaWxkcmVuIGlzIHZlcnkgY29uZnVzaW5nLgorICAgICAgICAvLyBXZSBldmVudHVh bGx5IGluY2x1ZGUgc2hhZG93IHJvb3RzIGF0IHRoZSBzdGFydCBvZiBfY2hpbGRyZW4uIEhvd2V2 ZXIgd2UgbWlnaHQKKyAgICAgICAgLy8gbm90IGhhdmUgb3VyIGFjdHVhbCBjaGlsZHJlbiB5ZXQu IFNvIHdlIHRyeSB0byBkZWZlciBpbml0aWFsaXppbmcgX2NoaWxkcmVuIHVudGlsCisgICAgICAg IC8vIHdlIGhhdmUgYm90aCBzaGFkb3dSb290cyBhbmQgY2hpbGQgbm9kZXMuCiAgICAgICAgIHRo aXMuX3NoYWRvd1Jvb3RzID0gW107CiAgICAgICAgIGlmIChwYXlsb2FkLnNoYWRvd1Jvb3RzKSB7 CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBheWxvYWQuc2hhZG93Um9vdHMubGVu Z3RoOyArK2kpIHsKQEAgLTgzLDYgKzg2LDExIEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gY2xh c3MgRE9NTm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogCisgICAgICAgIGlmIChwYXlsb2FkLmNoaWxkcmVuKQorICAgICAgICAgICAgdGhp cy5fc2V0Q2hpbGRyZW5QYXlsb2FkKHBheWxvYWQuY2hpbGRyZW4pOworICAgICAgICBlbHNlIGlm ICh0aGlzLl9zaGFkb3dSb290cy5sZW5ndGggJiYgIXRoaXMuX2NoaWxkTm9kZUNvdW50KQorICAg ICAgICAgICAgdGhpcy5fY2hpbGRyZW4gPSB0aGlzLl9zaGFkb3dSb290cy5zbGljZSgpOworCiAg ICAgICAgIGlmICh0aGlzLl9ub2RlVHlwZSA9PT0gTm9kZS5FTEVNRU5UX05PREUpCiAgICAgICAg ICAgICB0aGlzLl9jdXN0b21FbGVtZW50U3RhdGUgPSBwYXlsb2FkLmN1c3RvbUVsZW1lbnRTdGF0 ZSB8fCBXZWJJbnNwZWN0b3IuRE9NTm9kZS5DdXN0b21FbGVtZW50U3RhdGUuQnVpbHRpbjsKICAg ICAgICAgZWxzZQpAQCAtOTMsMTEgKzEwMSw2IEBAIFdlYkluc3BlY3Rvci5ET01Ob2RlID0gY2xh c3MgRE9NTm9kZSBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIHRoaXMu X3RlbXBsYXRlQ29udGVudC5wYXJlbnROb2RlID0gdGhpczsKICAgICAgICAgfQogCi0gICAgICAg IGlmIChwYXlsb2FkLmNoaWxkcmVuKQotICAgICAgICAgICAgdGhpcy5fc2V0Q2hpbGRyZW5QYXls b2FkKHBheWxvYWQuY2hpbGRyZW4pOwotICAgICAgICBlbHNlIGlmICghdGhpcy5fY2hpbGRyZW4g JiYgdGhpcy5fc2hhZG93Um9vdHMubGVuZ3RoKQotICAgICAgICAgICAgdGhpcy5fY2hpbGRyZW4g PSB0aGlzLl9zaGFkb3dSb290cy5zbGljZSgpOwotCiAgICAgICAgIHRoaXMuX3BzZXVkb0VsZW1l bnRzID0gbmV3IE1hcDsKICAgICAgICAgaWYgKHBheWxvYWQucHNldWRvRWxlbWVudHMpIHsKICAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGF5bG9hZC5wc2V1ZG9FbGVtZW50cy5sZW5n dGg7ICsraSkgewo=