166294 2016-12-20 15:31:27 -0800 Web Inspector: Fix Content Flow Container Regions Computed Style section 2017-01-03 14:32:45 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck inspector-bugzilla-changes joepeck oldest_to_newest 1261813 0 joepeck 2016-12-20 15:31:27 -0800 Summary: Fix Content Flow Computed Style section These LayoutTests were consistently failing, but only noticeable if you --force because they are marked [Pass Timeout]: LayoutTests/inspector/dom/content-flow-list.html LayoutTests/inspector/dom/content-node-region-info.html One looks like a testing issue (domTree is not updated across navigation). The other looks like a legit issue that can be addressed. Steps to Reproduce: 1. Inspect div#flow on LayoutTests/inspector/dom/content-node-region-info.html 2. Show Styles > Computed Styles sidebar => Expected Container Regions section for the regions it flows into 1261820 1 297562 joepeck 2016-12-20 15:34:06 -0800 Created attachment 297562 [PATCH] Proposed Fix 1262005 2 297562 bburg 2016-12-21 10:25:50 -0800 Comment on attachment 297562 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=297562&action=review r=me > LayoutTests/ChangeLog:8 > + * inspector/dom/content-flow-list.html: Should we try to unskip this test now? > Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js:663 > + functionDeclaration: appendWebInspectorSourceURL(inspectedPage_node_getFlowInfo.toString()), I like this name. I updated the style guide to document this convention. 1263482 3 joepeck 2017-01-03 12:03:04 -0800 (In reply to comment #2) > Comment on attachment 297562 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=297562&action=review > > r=me > > > LayoutTests/ChangeLog:8 > > + * inspector/dom/content-flow-list.html: > > Should we try to unskip this test now? I'll leave this up to you as you start investigating the tests. It should be okay but we had "random failures" in the past which wouldn't account for these deterministic failures. 1263550 4 joepeck 2017-01-03 14:32:45 -0800 https://trac.webkit.org/changeset/210250 297562 2016-12-20 15:34:06 -0800 2017-01-03 14:32:31 -0800 [PATCH] Proposed Fix content-flows-1.patch text/plain 9347 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlOTI4N2UzLi4yMTY2YzdhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTYtMTIt MjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIg SW5zcGVjdG9yOiBGaXggQ29udGVudCBGbG93IENvbnRhaW5lciBSZWdpb25zIENvbXB1dGVkIFN0 eWxlIHNlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2NjI5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaW5zcGVjdG9yL2RvbS9jb250ZW50LWZsb3ctbGlzdC5odG1sOgorICAgICAgICBVcGRh dGUgdGhlIGRvbVRyZWUgYWNyb3NzIG5hdmlnYXRpb25zLiBBbHNvIGR5bmFtaWNhbGx5IGFkZCB0 aGUgZmxvd3MgdG8KKyAgICAgICAgZW5zdXJlIHdlIGdldCB0aGUgZXZlbnRzLgorCisyMDE2LTEy LTIwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2Vi IEluc3BlY3RvcjogRml4IHNvbWUgdHlwb3MgYW5kIHN0eWxlIGluIExheW91dFRlc3RzL2luc3Bl Y3RvcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2 MjczCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vY29udGVudC1mbG93 LWxpc3QuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kb20vY29udGVudC1mbG93LWxpc3Qu aHRtbAppbmRleCA4NDY5MjBjLi5jYTk0MzExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZG9tL2NvbnRlbnQtZmxvdy1saXN0Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL2RvbS9jb250ZW50LWZsb3ctbGlzdC5odG1sCkBAIC05LDI1ICs5LDMwIEBACiA8L3N0eWxl PgogPHNjcmlwdCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNw ZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0PgotZnVuY3Rpb24gcmVtb3ZlRmxvdygp Ci17CitmdW5jdGlvbiBhZGRGbG93KCkgeworICAgIGxldCBkaXYgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKKyAgICBkaXYuaWQgPSAiZmxvdzEiOworICAgIGRvY3VtZW50LmJvZHku YXBwZW5kQ2hpbGQoZGl2KTsKK30KKworZnVuY3Rpb24gcmVtb3ZlRmxvdygpIHsKICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZmxvdzEiKS5yZW1vdmUoKTsKIH0KIAogZnVuY3Rpb24gdGVz dCgpCiB7Ci0gICAgbGV0IGRvbVRyZWUgPSBXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFn ZXIubWFpbkZyYW1lLmRvbVRyZWU7CisgICAgbGV0IGRvbVRyZWU7CiAKICAgICBmdW5jdGlvbiBv blJvb3RET01Ob2RlSW52YWxpZGF0ZWQoKQogICAgIHsKICAgICAgICAgZG9tVHJlZS5yZXF1ZXN0 Q29udGVudEZsb3dMaXN0KCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2Uo ImFkZEZsb3coKSIpOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIG9uQ29udGVudEZsb3dXYXNBZGRl ZChldmVudCkKICAgICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoZXZlbnQu ZGF0YS5mbG93Lm5hbWUsICJmbG93MSIsICJDb250ZW50RmxvdyB3YXMgYWRkZWQiKTsKICAgICAg ICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChkb21UcmVlLmNvbnRlbnRGbG93Q29sbGVjdGlv bi5pdGVtcy5zaXplLCAxLCAiRmxvdyBjb3VudCBpcyAxIik7Ci0KICAgICAgICAgSW5zcGVjdG9y VGVzdC5ldmFsdWF0ZUluUGFnZSgicmVtb3ZlRmxvdygpIik7CiAgICAgfQogCkBAIC0zOSw2ICs0 NCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIH0KIAogICAgIFdlYkluc3BlY3Rvci5GcmFtZS5h ZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5GcmFtZS5FdmVudC5NYWluUmVzb3VyY2VEaWRD aGFuZ2UsIGZ1bmN0aW9uKCkgeworICAgICAgICBkb21UcmVlID0gV2ViSW5zcGVjdG9yLmZyYW1l UmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5kb21UcmVlOwogICAgICAgICBkb21UcmVlLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkRPTVRyZWUuRXZlbnQuUm9vdERPTU5vZGVJbnZhbGlk YXRlZCwgb25Sb290RE9NTm9kZUludmFsaWRhdGVkKTsKICAgICAgICAgZG9tVHJlZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5ET01UcmVlLkV2ZW50LkNvbnRlbnRGbG93V2FzQWRkZWQs IG9uQ29udGVudEZsb3dXYXNBZGRlZCk7CiAgICAgICAgIGRvbVRyZWUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuRE9NVHJlZS5FdmVudC5Db250ZW50Rmxvd1dhc1JlbW92ZWQsIG9uQ29u dGVudEZsb3dXYXNSZW1vdmVkKTsKQEAgLTUwLDggKzU2LDYgQEAgZnVuY3Rpb24gdGVzdCgpCiA8 L3NjcmlwdD4KIDwvaGVhZD4KIDxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KLSAgICA8cD5UZXN0 aW5nIHRoYXQgdGhlIENvbnRlbnRGbG93cyBldmVudHMgYXJlIGNvcnJlY3RseSBkaXNwYXRjaGVk IHdoZW4gbmV3IGZsb3dzIGFyZSBjcmVhdGVkL3JlbW92ZWQuPC9wPgotCi0gICAgPGRpdiBpZD0i ZmxvdzEiPjwvZGl2PgorPHA+VGVzdGluZyB0aGF0IHRoZSBDb250ZW50Rmxvd3MgZXZlbnRzIGFy ZSBjb3JyZWN0bHkgZGlzcGF0Y2hlZCB3aGVuIG5ldyBmbG93cyBhcmUgY3JlYXRlZC9yZW1vdmVk LjwvcD4KIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAzOTg2 NDguLjRlOWViNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAy MDE2LTEyLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAg ICAgV2ViIEluc3BlY3RvcjogRml4IENvbnRlbnQgRmxvdyBDb250YWluZXIgUmVnaW9ucyBDb21w dXRlZCBTdHlsZSBzZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjYyOTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLl9jb2VyY2VS ZW1vdGVBcnJheU9mRE9NTm9kZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5h Z2VyLnByb3RvdHlwZS5nZXROb2RlQ29udGVudEZsb3dJbmZvLmRvbU5vZGVSZXNvbHZlZCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLmdldE5vZGVDb250 ZW50Rmxvd0luZm8ucmVtb3RlT2JqZWN0UHJvcGVydGllc0F2YWlsYWJsZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIucHJvdG90eXBlLmdldE5vZGVDb250ZW50Rmxvd0lu Zm8pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVRyZWVNYW5hZ2VyLnByb3RvdHlwZS5nZXRO b2RlQ29udGVudEZsb3dJbmZvLmJhY2tlbmRGdW5jdGlvbi5nZXRDb21wdXRlZFByb3BlcnR5KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlci5wcm90b3R5cGUu Z2V0Tm9kZUNvbnRlbnRGbG93SW5mby5iYWNrZW5kRnVuY3Rpb24uZ2V0Q29udGVudEZsb3dOYW1l KTogRGVsZXRlZC4KKyAgICAgICAgVXBkYXRlIHRoaXMgdG8gdXNlIEFycmF5LmZyb20oKSB0byBj b252ZXJ0IHRoZSBOb2RlTGlzdCB0byBhbiBBcnJheSwgYW5kIHRoZW4KKyAgICAgICAgdXNlIHRo ZSBhbHJlYWR5IGF2YWlsYWJsZSBSZW1vdGVPYmplY3QncyBzaXplIHByb3BlcnR5IGluc3RlYWQg b2YgZ2V0dGluZyB0aGUKKyAgICAgICAgImxlbmd0aCIgcHJvcGVydHkgZnJvbSB0aGUgQXJyYXku CisKKzIwMTYtMTItMjAgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDb25zb2xlIGNvdWxkIGJlIG1hZGUgdXNlZnVsIGZvciB2 ZXJ5IHNpbXBsZSBhd2FpdCBleHByZXNzaW9ucwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1NjgxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yOTc1 NTMzOT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Nv bnRyb2xsZXJzL0RPTVRyZWVNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKaW5kZXggYjYyZGVlMy4uYzdj NDAwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRE9NVHJlZU1hbmFnZXIuanMKQEAgLTI0OCw3ICsyNDgs NyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgdGhpcy5fdW5iaW5kKG5vZGUpOwog ICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuRE9NVHJl ZU1hbmFnZXIuRXZlbnQuTm9kZVJlbW92ZWQsIHtub2RlLCBwYXJlbnR9KTsKICAgICB9Ci0gICAg CisKICAgICBfY3VzdG9tRWxlbWVudFN0YXRlQ2hhbmdlZChlbGVtZW50SWQsIG5ld1N0YXRlKQog ICAgIHsKICAgICAgICAgY29uc3Qgbm9kZSA9IHRoaXMuX2lkVG9ET01Ob2RlW2VsZW1lbnRJZF07 CkBAIC02MDUsOSArNjA1LDIxIEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNz IERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICBmbG93 LnJlbW92ZUNvbnRlbnROb2RlKHRoaXMubm9kZUZvcklkKGNvbnRlbnROb2RlSWQpKTsKICAgICB9 CiAKLSAgICBfY29lcmNlUmVtb3RlQXJyYXlPZkRPTU5vZGVzKG9iamVjdElkLCBjYWxsYmFjaykK KyAgICBfY29lcmNlUmVtb3RlQXJyYXlPZkRPTU5vZGVzKHJlbW90ZU9iamVjdCwgY2FsbGJhY2sp CiAgICAgewotICAgICAgICB2YXIgbGVuZ3RoLCBub2RlcywgcmVjZWl2ZWQgPSAwLCBsYXN0RXJy b3IgPSBudWxsLCBkb21UcmVlTWFuYWdlciA9IHRoaXM7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHJlbW90ZU9iamVjdC50eXBlID09PSAib2JqZWN0Iik7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHJlbW90ZU9iamVjdC5zdWJ0eXBlID09PSAiYXJyYXkiKTsKKworICAgICAgICBsZXQgbGVuZ3Ro ID0gcmVtb3RlT2JqZWN0LnNpemU7CisgICAgICAgIGlmICghbGVuZ3RoKSB7CisgICAgICAgICAg ICBjYWxsYmFjayhudWxsLCBbXSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKwor ICAgICAgICBsZXQgbm9kZXM7CisgICAgICAgIGxldCByZWNlaXZlZCA9IDA7CisgICAgICAgIGxl dCBsYXN0RXJyb3IgPSBudWxsOworICAgICAgICBsZXQgZG9tVHJlZU1hbmFnZXIgPSB0aGlzOwog CiAgICAgICAgIGZ1bmN0aW9uIG5vZGVSZXF1ZXN0ZWQoaW5kZXgsIGVycm9yLCBub2RlSWQpCiAg ICAgICAgIHsKQEAgLTYxOSwyOCArNjMxLDE3IEBAIFdlYkluc3BlY3Rvci5ET01UcmVlTWFuYWdl ciA9IGNsYXNzIERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAg ICAgICAgICAgICAgIGNhbGxiYWNrKGxhc3RFcnJvciwgbm9kZXMpOwogICAgICAgICB9CiAKLSAg ICAgICAgV2ViSW5zcGVjdG9yLnJ1bnRpbWVNYW5hZ2VyLmdldFByb3BlcnRpZXNGb3JSZW1vdGVP YmplY3Qob2JqZWN0SWQsIGZ1bmN0aW9uKGVycm9yLCBwcm9wZXJ0aWVzKSB7CisgICAgICAgIFdl Ykluc3BlY3Rvci5ydW50aW1lTWFuYWdlci5nZXRQcm9wZXJ0aWVzRm9yUmVtb3RlT2JqZWN0KHJl bW90ZU9iamVjdC5vYmplY3RJZCwgZnVuY3Rpb24oZXJyb3IsIHByb3BlcnRpZXMpIHsKICAgICAg ICAgICAgIGlmIChlcnJvcikgewogICAgICAgICAgICAgICAgIGNhbGxiYWNrKGVycm9yKTsKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBs ZW5ndGhQcm9wZXJ0eSA9IHByb3BlcnRpZXMuZ2V0KCJsZW5ndGgiKTsKLSAgICAgICAgICAgIGlm ICghbGVuZ3RoUHJvcGVydHkgfHwgbGVuZ3RoUHJvcGVydHkudmFsdWUudHlwZSAhPT0gIm51bWJl ciIpIHsKLSAgICAgICAgICAgICAgICBjYWxsYmFjayhudWxsKTsKLSAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICB9Ci0KLSAgICAgICAgICAgIGxlbmd0aCA9IGxlbmd0aFByb3Bl cnR5LnZhbHVlLnZhbHVlOwotICAgICAgICAgICAgaWYgKCFsZW5ndGgpIHsKLSAgICAgICAgICAg ICAgICBjYWxsYmFjayhudWxsLCBbXSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgfQotCiAgICAgICAgICAgICBub2RlcyA9IG5ldyBBcnJheShsZW5ndGgpOwotICAgICAg ICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAg IHZhciBub2RlUHJvcGVydHkgPSBwcm9wZXJ0aWVzLmdldChTdHJpbmcoaSkpOworICAgICAgICAg ICAgZm9yIChsZXQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIGxl dCBub2RlUHJvcGVydHkgPSBwcm9wZXJ0aWVzLmdldChTdHJpbmcoaSkpOwogICAgICAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KG5vZGVQcm9wZXJ0eS52YWx1ZS50eXBlID09PSAib2JqZWN0Iik7 CisgICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQobm9kZVByb3BlcnR5LnZhbHVlLnN1YnR5 cGUgPT09ICJub2RlIik7CiAgICAgICAgICAgICAgICAgRE9NQWdlbnQucmVxdWVzdE5vZGUobm9k ZVByb3BlcnR5LnZhbHVlLm9iamVjdElkLCBub2RlUmVxdWVzdGVkLmJpbmQobnVsbCwgaSkpOwog ICAgICAgICAgICAgfQogICAgICAgICB9KTsKQEAgLTY1NiwxMSArNjU3LDEwIEBAIFdlYkluc3Bl Y3Rvci5ET01UcmVlTWFuYWdlciA9IGNsYXNzIERPTVRyZWVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5z cGVjdG9yLk9iamVjdAogICAgICAgICAgICAgICAgIHJlc3VsdFJlYWR5Q2FsbGJhY2soZXJyb3Ip OwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIC8v IFNlcmlhbGl6ZSAiYmFja2VuZEZ1bmN0aW9uIiBhbmQgZXhlY3V0ZSBpdCBpbiB0aGUgY29udGV4 dCBvZiB0aGUgcGFnZQotICAgICAgICAgICAgLy8gcGFzc2luZyB0aGUgRE9NTm9kZSBhcyB0aGUg InRoaXMiIHJlZmVyZW5jZS4KKwogICAgICAgICAgICAgdmFyIGV2YWxQYXJhbWV0ZXJzID0gewog ICAgICAgICAgICAgICAgIG9iamVjdElkOiByZW1vdGVPYmplY3Qub2JqZWN0SWQsCi0gICAgICAg ICAgICAgICAgZnVuY3Rpb25EZWNsYXJhdGlvbjogYXBwZW5kV2ViSW5zcGVjdG9yU291cmNlVVJM KGJhY2tlbmRGdW5jdGlvbi50b1N0cmluZygpKSwKKyAgICAgICAgICAgICAgICBmdW5jdGlvbkRl Y2xhcmF0aW9uOiBhcHBlbmRXZWJJbnNwZWN0b3JTb3VyY2VVUkwoaW5zcGVjdGVkUGFnZV9ub2Rl X2dldEZsb3dJbmZvLnRvU3RyaW5nKCkpLAogICAgICAgICAgICAgICAgIGRvTm90UGF1c2VPbkV4 Y2VwdGlvbnNBbmRNdXRlQ29uc29sZTogdHJ1ZSwKICAgICAgICAgICAgICAgICByZXR1cm5CeVZh bHVlOiBmYWxzZSwKICAgICAgICAgICAgICAgICBnZW5lcmF0ZVByZXZpZXc6IGZhbHNlCkBAIC03 MjEsMTYgKzcyMSwxMyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJlZU1hbmFnZXIgPSBjbGFzcyBET01U cmVlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlZ2lv bnNQcm9wZXJ0eS52YWx1ZS50eXBlID09PSAib2JqZWN0Iik7Ci0gICAgICAgICAgICBjb25zb2xl LmFzc2VydChyZWdpb25zUHJvcGVydHkudmFsdWUuc3VidHlwZSA9PT0gImFycmF5Iik7Ci0gICAg ICAgICAgICB0aGlzLl9jb2VyY2VSZW1vdGVBcnJheU9mRE9NTm9kZXMocmVnaW9uc1Byb3BlcnR5 LnZhbHVlLm9iamVjdElkLCBmdW5jdGlvbihlcnJvciwgbm9kZXMpIHsKKyAgICAgICAgICAgIHRo aXMuX2NvZXJjZVJlbW90ZUFycmF5T2ZET01Ob2RlcyhyZWdpb25zUHJvcGVydHkudmFsdWUsIGZ1 bmN0aW9uKGVycm9yLCBub2RlcykgewogICAgICAgICAgICAgICAgIHJlc3VsdC5yZWdpb25zID0g bm9kZXM7CiAgICAgICAgICAgICAgICAgcmVzdWx0UmVhZHlDYWxsYmFjayhlcnJvciwgcmVzdWx0 KTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9CiAKLSAgICAgICAgLy8gTm90ZSB0aGF0ICJi YWNrZW5kRnVuY3Rpb24iIGlzIHNlcmlhbGl6ZWQgYW5kIGV4ZWN1dGVkIGluIHRoZSBjb250ZXh0 IG9mIHRoZSBwYWdlLgotICAgICAgICBmdW5jdGlvbiBiYWNrZW5kRnVuY3Rpb24oKQorICAgICAg ICBmdW5jdGlvbiBpbnNwZWN0ZWRQYWdlX25vZGVfZ2V0Rmxvd0luZm8oKQogICAgICAgICB7CiAg ICAgICAgICAgICBmdW5jdGlvbiBnZXRDb21wdXRlZFByb3BlcnR5KG5vZGUsIHByb3BlcnR5TmFt ZSkKICAgICAgICAgICAgIHsKQEAgLTc2NCw3ICs3NjEsNyBAQCBXZWJJbnNwZWN0b3IuRE9NVHJl ZU1hbmFnZXIgPSBjbGFzcyBET01UcmVlTWFuYWdlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl Y3QKICAgICAgICAgICAgIGlmIChyZXN1bHQuY29udGVudEZsb3dOYW1lKSB7CiAgICAgICAgICAg ICAgICAgdmFyIGZsb3dUaHJlYWQgPSBub2RlLm93bmVyRG9jdW1lbnQud2Via2l0R2V0TmFtZWRG bG93cygpLm5hbWVkSXRlbShyZXN1bHQuY29udGVudEZsb3dOYW1lKTsKICAgICAgICAgICAgICAg ICBpZiAoZmxvd1RocmVhZCkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LnJlZ2lvbnMgPSBm bG93VGhyZWFkLmdldFJlZ2lvbnNCeUNvbnRlbnQobm9kZSk7CisgICAgICAgICAgICAgICAgICAg IHJlc3VsdC5yZWdpb25zID0gQXJyYXkuZnJvbShmbG93VGhyZWFkLmdldFJlZ2lvbnNCeUNvbnRl bnQobm9kZSkpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0Owo=