58993 2011-04-20 08:21:22 -0700 Web Inspector: persist local resource history between inspector / browser launches. 2011-04-21 07:07:09 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned abarth apavlov bweinstein eric joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 389237 0 pfeldman 2011-04-20 08:21:22 -0700 Patch to follow. 389242 1 90341 pfeldman 2011-04-20 08:28:04 -0700 Created attachment 90341 Patch 389284 2 90341 yurys 2011-04-20 09:32:29 -0700 Comment on attachment 90341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=90341&action=review > Source/WebCore/inspector/front-end/Resource.js:742 > this._content = newContent; This way the content displayed in the inspector will differ from the actual one after the restore. 389358 3 90365 pfeldman 2011-04-20 11:06:10 -0700 Created attachment 90365 [PATCH] With the loaderId check. 389928 4 90365 yurys 2011-04-21 04:25:02 -0700 Comment on attachment 90365 [PATCH] With the loaderId check. View in context: https://bugs.webkit.org/attachment.cgi?id=90365&action=review > Source/WebCore/inspector/front-end/ResourceTreeModel.js:306 > resource.frameId = frame.id; Consider passing all of these values as parameter to the constructor. 389935 5 90365 pfeldman 2011-04-21 04:43:59 -0700 Comment on attachment 90365 [PATCH] With the loaderId check. Clearing flags on attachment: 90365 Committed r84483: <http://trac.webkit.org/changeset/84483> 389936 6 pfeldman 2011-04-21 04:44:08 -0700 All reviewed patches have been landed. Closing bug. 390001 7 webkit.review.bot 2011-04-21 07:07:09 -0700 http://trac.webkit.org/changeset/84483 might have broken GTK Linux 32-bit Debug The following tests are not passing: media/controls-strict.html 90341 2011-04-20 08:28:04 -0700 2011-04-20 11:06:04 -0700 Patch bug-58993-20110420192802.patch text/plain 5573 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQzNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZTYzNjA4MWExN2NhN2Ix NTM1YTgxMDUwZDI0MzgyMWIyZGVkYTEzLi44MjEyZDY5MjdiMmQ4MjNkYzJiZWZhZTUxZmYzMjli NzQ3MDhkN2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDQtMjAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHBlcnNpc3QgbG9jYWwgcmVz b3VyY2UgaGlzdG9yeSBiZXR3ZWVuIGluc3BlY3RvciAvIGJyb3dzZXIgbGF1bmNoZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODk5MworCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX3Jlc3RvcmVSZXZpc2lvbnMpOgorCisyMDExLTA0LTIw ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBSZXZpZXdl ZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBTYXZl IEFzIHRvIHRoZSBSZXNvdXJjZXMgcGFuZWwgY29udGV4dCBtZW51LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggZDgzNzNjZDI2ZWIyOTll YWExMmNiZGY1NzJjMGNmMjJlMGY3Yzc0OS4uYzhlOTE3MTZkMmVlMjUzMWFlN2MwMTY1YjQ1MmRi YjAyNWFkOTYwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlLmpzCkBAIC0zNCw2ICszNCw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZSA9IGZ1bmN0 aW9uKGlkZW50aWZpZXIsIHVybCkKICAgICB0aGlzLl9jYXRlZ29yeSA9IFdlYkluc3BlY3Rvci5y ZXNvdXJjZUNhdGVnb3JpZXMub3RoZXI7CiAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFj a3MgPSBbXTsKICAgICB0aGlzLmhpc3RvcnkgPSBbXTsKKworICAgIHRoaXMuX3Jlc3RvcmVSZXZp c2lvbnMoKTsKIH0KIAogLy8gS2VlcCB0aGVzZSBpbiBzeW5jIHdpdGggV2ViQ29yZTo6SW5zcGVj dG9yUmVzb3VyY2U6OlR5cGUKQEAgLTEwOCw2ICsxMTAsMTcgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlLnJlZ2lzdGVyRG9tYWluTW9kZWxCaW5kaW5nID0gZnVuY3Rpb24odHlwZSwgYmluZGluZykK ICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX2RvbWFpbk1vZGVsQmluZGluZ3NbdHlwZV0gPSBi aW5kaW5nOwogfQogCitXZWJJbnNwZWN0b3IuUmVzb3VyY2UuY2xlYXJSZXZpc2lvbkhpc3Rvcnkg PSBmdW5jdGlvbigpCit7CisgICAgaWYgKCF3aW5kb3cubG9jYWxTdG9yYWdlKQorICAgICAgICBy ZXR1cm47CisKKyAgICBmb3IgKHZhciBrZXkgaW4gd2luZG93LmxvY2FsU3RvcmFnZSkgeworICAg ICAgICBpZiAoa2V5LmluZGV4T2YoInJlc291cmNlLWhpc3Rvcnl8IikgPT09IDApCisgICAgICAg ICAgICBkZWxldGUgd2luZG93LmxvY2FsU3RvcmFnZVtrZXldOworICAgIH0KK30KKwogV2ViSW5z cGVjdG9yLlJlc291cmNlLkV2ZW50cyA9IHsKICAgICBSZXZpc2lvbkFkZGVkOiAwCiB9CkBAIC03 MjEsMTUgKzczNCw2NyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAg ICAgICBiaW5kaW5nLnNldENvbnRlbnQodGhpcywgbmV3Q29udGVudCwgbWFqb3JDaGFuZ2UsIGNh bGxiYWNrKTsKICAgICB9LAogCi0gICAgYWRkUmV2aXNpb246IGZ1bmN0aW9uKG5ld0NvbnRlbnQp CisgICAgYWRkUmV2aXNpb246IGZ1bmN0aW9uKG5ld0NvbnRlbnQsIHRpbWVzdGFtcCwgcmVzdG9y aW5nSGlzdG9yeSkKICAgICB7CiAgICAgICAgIHZhciByZXZpc2lvbiA9IG5ldyBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VSZXZpc2lvbih0aGlzLCB0aGlzLl9jb250ZW50LCB0aGlzLl9jb250ZW50VGlt ZXN0YW1wKTsKICAgICAgICAgdGhpcy5oaXN0b3J5LnB1c2gocmV2aXNpb24pOwogCiAgICAgICAg IHRoaXMuX2NvbnRlbnQgPSBuZXdDb250ZW50OwotICAgICAgICB0aGlzLl9jb250ZW50VGltZXN0 YW1wID0gbmV3IERhdGUoKTsKKyAgICAgICAgdGhpcy5fY29udGVudFRpbWVzdGFtcCA9IHRpbWVz dGFtcCB8fCBuZXcgRGF0ZSgpOwogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudHMuUmV2aXNpb25BZGRlZCwgcmV2aXNpb24p OworCisgICAgICAgIGlmICghcmVzdG9yaW5nSGlzdG9yeSkKKyAgICAgICAgICAgIHRoaXMuX3Bl cnNpc3RSZXZpc2lvbigpOworICAgIH0sCisKKyAgICBfcGVyc2lzdFJldmlzaW9uOiBmdW5jdGlv bigpCisgICAgeworICAgICAgICBpZiAoIXdpbmRvdy5sb2NhbFN0b3JhZ2UpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgdmFyIHVybCA9IHRoaXMudXJsOworICAgICAgICB2YXIgdGlt ZXN0YW1wID0gdGhpcy5fY29udGVudFRpbWVzdGFtcC5nZXRUaW1lKCk7CisgICAgICAgIHZhciBj b250ZW50ID0gdGhpcy5fY29udGVudDsKKyAgICAgICAgZnVuY3Rpb24gcGVyc2lzdCgpCisgICAg ICAgIHsKKyAgICAgICAgICAgIHZhciBrZXkgPSAicmVzb3VyY2UtaGlzdG9yeXwiICsgdXJsICsg InwiICsgdGltZXN0YW1wOworICAgICAgICAgICAgd2luZG93LmxvY2FsU3RvcmFnZVtrZXldID0g Y29udGVudDsKKyAgICAgICAgfQorICAgIAorICAgICAgICAvLyBTY2hlZHVsZSBhc3luYyBzdG9y YWdlLgorICAgICAgICBzZXRUaW1lb3V0KHBlcnNpc3QsIDApOworICAgIH0sCisKKyAgICBfcmVz dG9yZVJldmlzaW9uczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYgKCF3aW5kb3cubG9j YWxTdG9yYWdlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHRyeSB7CisgICAgICAg ICAgICB2YXIgdXJsS2V5ID0gInJlc291cmNlLWhpc3Rvcnl8IiArIHRoaXMudXJsICsgInwiOwor CisgICAgICAgICAgICB2YXIgY29udGVudCA9IHt9OworICAgICAgICAgICAgdmFyIHRpbWVzdGFt cHMgPSBbXTsKKyAgICAgICAgICAgIGZvciAodmFyIGtleSBpbiB3aW5kb3cubG9jYWxTdG9yYWdl KSB7CisgICAgICAgICAgICAgICAgaWYgKGtleS5pbmRleE9mKHVybEtleSkgIT09IDApCisgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHZhciB0aW1lc3RhbXAg PSBwYXJzZUludChrZXkuc3Vic3RyaW5nKHVybEtleS5sZW5ndGgpKTsKKyAgICAgICAgICAgICAg ICBjb250ZW50W3RpbWVzdGFtcF0gPSB3aW5kb3cubG9jYWxTdG9yYWdlW2tleV07CisgICAgICAg ICAgICAgICAgdGltZXN0YW1wcy5wdXNoKHRpbWVzdGFtcCk7CisgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgIGlmICghdGltZXN0YW1wcy5sZW5ndGgpCisgICAgICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgICAgICB0aW1lc3RhbXBzLnNvcnQoKTsKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdGltZXN0YW1wcy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZh ciB0aW1lc3RhbXAgPSB0aW1lc3RhbXBzW2ldOworICAgICAgICAgICAgICAgIHRoaXMuYWRkUmV2 aXNpb24oY29udGVudFt0aW1lc3RhbXBdLCBuZXcgRGF0ZSh0aW1lc3RhbXApLCB0cnVlKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgfSBjYXRjaChlKSB7CisgICAgICAgICAgICBjb25zb2xlLmVy cm9yKGUudG9TdHJpbmcoKSk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgcmVxdWVzdENvbnRl bnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKaW5kZXggODkwZGFlYmYxZDNlMTM5 OGQwMzY2ODkzNWUyMzI5NTMwOWU5NGIxMC4uYjRjM2Y1MmE3ZDdiMGJkZTE4N2QyYTEwMmQ2ZDYz MTQ1YmJhN2E4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBAIC0xMjMsNiArMTIzLDkgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICBpZiAoaXNNYWlu RnJhbWUgJiYgdGhpcy5yZXNvdXJjZUZvclVSTChmcmFtZS51cmwpKQogICAgICAgICAgICAgV2Vi SW5zcGVjdG9yLm1haW5SZXNvdXJjZSA9IHRoaXMucmVzb3VyY2VGb3JVUkwoZnJhbWUudXJsKTsK KworICAgICAgICBpZiAoaXNNYWluRnJhbWUpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUmVz b3VyY2UuY2xlYXJSZXZpc2lvbkhpc3RvcnkoKTsKICAgICB9LAogCiAgICAgX29uRnJhbWVEZXRh Y2hlZEZyb21QYXJlbnQ6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VDU1NUb2tlbml6ZXIuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUNTU1Rva2VuaXplci5qcwppbmRleCA3MjU5 ZGMxY2M3MzAzZmU3OGIzMmZkZDdlNTk2ZGM4NDc2MTQ1NWNhLi5lYjYzMzI0ZTNiZDE0NWY1MTZk ZmI0OWJjMDFlOTdmZjhjMWM0N2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NvdXJjZUNTU1Rva2VuaXplci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUNTU1Rva2VuaXplci5qcwpAQCAtNDUsNyArNDUsNyBA QCBXZWJJbnNwZWN0b3IuU291cmNlQ1NTVG9rZW5pemVyID0gZnVuY3Rpb24oKQogewogICAgIFdl Ykluc3BlY3Rvci5Tb3VyY2VUb2tlbml6ZXIuY2FsbCh0aGlzKTsKIAotICAgIHRoaXMuX3Byb3Bl cnR5S2V5d29yZHMgPSBXZWJJbnNwZWN0b3IuY3NzTmFtZUNvbXBsZXRpb25zLmtleVNldCgpOwor ICAgIHRoaXMuX3Byb3BlcnR5S2V5d29yZHMgPSBXZWJJbnNwZWN0b3IuY3NzTmFtZUNvbXBsZXRp b25zID8gV2ViSW5zcGVjdG9yLmNzc05hbWVDb21wbGV0aW9ucy5rZXlTZXQoKSA6IHt9OwogCiAg ICAgdGhpcy5fdmFsdWVLZXl3b3JkcyA9IFsKICAgICAgICAgImFib3ZlIiwgImFic29sdXRlIiwg ImFjdGl2ZWJvcmRlciIsICJhY3RpdmVjYXB0aW9uIiwgImFmYXIiLCAiYWZ0ZXItd2hpdGUtc3Bh Y2UiLCAiYWhlYWQiLCAiYWxpYXMiLCAiYWxsIiwgImFsbC1zY3JvbGwiLAo= 90365 2011-04-20 11:06:10 -0700 2011-04-21 04:43:59 -0700 [PATCH] With the loaderId check. bug-58993-20110420220608.patch text/plain 7270 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODQzNjUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZTYzNjA4MWExN2NhN2Ix NTM1YTgxMDUwZDI0MzgyMWIyZGVkYTEzLi44MjEyZDY5MjdiMmQ4MjNkYzJiZWZhZTUxZmYzMjli NzQ3MDhkN2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAKIDIwMTEtMDQtMjAgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHBlcnNpc3QgbG9jYWwgcmVz b3VyY2UgaGlzdG9yeSBiZXR3ZWVuIGluc3BlY3RvciAvIGJyb3dzZXIgbGF1bmNoZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODk5MworCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuX3Jlc3RvcmVSZXZpc2lvbnMpOgorCisyMDExLTA0LTIw ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKwogICAgICAgICBSZXZpZXdl ZCBieSBZdXJ5IFNlbWlraGF0c2t5LgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBTYXZl IEFzIHRvIHRoZSBSZXNvdXJjZXMgcGFuZWwgY29udGV4dCBtZW51LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKaW5kZXggYjZk NDEzZjQ4OTZhOTdlMWQxM2JiZjMwZmEwNTYxNmVjZDdlMDRmNy4uMzk5ZjExMDQwNmFkZjg4NGZh MWYyN2Y1MGQ1MWM2MmQ4MzQ2ODk4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCkBAIC0zMTcsMTAgKzMxNyw5IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUgPSB7CiAKICAgICBfY3JlYXRl UmVzb3VyY2U6IGZ1bmN0aW9uKGlkZW50aWZpZXIsIGZyYW1lSWQsIGxvYWRlcklkLCB1cmwsIGRv Y3VtZW50VVJMLCBzdGFja1RyYWNlKQogICAgIHsKLSAgICAgICAgdmFyIHJlc291cmNlID0gbmV3 IFdlYkluc3BlY3Rvci5SZXNvdXJjZShpZGVudGlmaWVyLCB1cmwpOworICAgICAgICB2YXIgcmVz b3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKGlkZW50aWZpZXIsIHVybCwgbG9hZGVy SWQpOwogICAgICAgICByZXNvdXJjZS5kb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMOwogICAgICAg ICByZXNvdXJjZS5mcmFtZUlkID0gZnJhbWVJZDsKLSAgICAgICAgcmVzb3VyY2UubG9hZGVySWQg PSBsb2FkZXJJZDsKICAgICAgICAgcmVzb3VyY2Uuc3RhY2tUcmFjZSA9IHN0YWNrVHJhY2U7CiAg ICAgICAgIHJldHVybiByZXNvdXJjZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCBkODM3M2NkMjZlYjI5OWVhYTEyY2JkZjU3 MmMwY2YyMmUwZjdjNzQ5Li41ZWJmZmYxMzNjNzE0ZmJkNjM3Y2FhNTMxYTc2YWZmYjczNmMzNGYx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMK QEAgLTI1LDE1ICsyNSwxOCBAQAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCiAgKiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICov Ci1XZWJJbnNwZWN0b3IuUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCB1cmwpCitXZWJJ bnNwZWN0b3IuUmVzb3VyY2UgPSBmdW5jdGlvbihpZGVudGlmaWVyLCB1cmwsIGxvYWRlcklkKQog ewogICAgIHRoaXMuaWRlbnRpZmllciA9IGlkZW50aWZpZXI7CiAgICAgdGhpcy51cmwgPSB1cmw7 CisgICAgdGhpcy5sb2FkZXJJZCA9IGxvYWRlcklkOwogICAgIHRoaXMuX3N0YXJ0VGltZSA9IC0x OwogICAgIHRoaXMuX2VuZFRpbWUgPSAtMTsKICAgICB0aGlzLl9jYXRlZ29yeSA9IFdlYkluc3Bl Y3Rvci5yZXNvdXJjZUNhdGVnb3JpZXMub3RoZXI7CiAgICAgdGhpcy5fcGVuZGluZ0NvbnRlbnRD YWxsYmFja3MgPSBbXTsKICAgICB0aGlzLmhpc3RvcnkgPSBbXTsKKworICAgIHRoaXMuX3Jlc3Rv cmVSZXZpc2lvbnMoKTsKIH0KIAogLy8gS2VlcCB0aGVzZSBpbiBzeW5jIHdpdGggV2ViQ29yZTo6 SW5zcGVjdG9yUmVzb3VyY2U6OlR5cGUKQEAgLTEwOCw2ICsxMTEsMTcgQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlLnJlZ2lzdGVyRG9tYWluTW9kZWxCaW5kaW5nID0gZnVuY3Rpb24odHlwZSwgYmlu ZGluZykKICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuX2RvbWFpbk1vZGVsQmluZGluZ3NbdHlw ZV0gPSBiaW5kaW5nOwogfQogCitXZWJJbnNwZWN0b3IuUmVzb3VyY2UuY2xlYXJSZXZpc2lvbkhp c3RvcnkgPSBmdW5jdGlvbigpCit7CisgICAgaWYgKCF3aW5kb3cubG9jYWxTdG9yYWdlKQorICAg ICAgICByZXR1cm47CisKKyAgICBmb3IgKHZhciBrZXkgaW4gd2luZG93LmxvY2FsU3RvcmFnZSkg eworICAgICAgICBpZiAoa2V5LmluZGV4T2YoInJlc291cmNlLWhpc3Rvcnl8IikgPT09IDApCisg ICAgICAgICAgICBkZWxldGUgd2luZG93LmxvY2FsU3RvcmFnZVtrZXldOworICAgIH0KK30KKwog V2ViSW5zcGVjdG9yLlJlc291cmNlLkV2ZW50cyA9IHsKICAgICBSZXZpc2lvbkFkZGVkOiAwCiB9 CkBAIC03MjEsMTUgKzczNSw2OCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0g ewogICAgICAgICBiaW5kaW5nLnNldENvbnRlbnQodGhpcywgbmV3Q29udGVudCwgbWFqb3JDaGFu Z2UsIGNhbGxiYWNrKTsKICAgICB9LAogCi0gICAgYWRkUmV2aXNpb246IGZ1bmN0aW9uKG5ld0Nv bnRlbnQpCisgICAgYWRkUmV2aXNpb246IGZ1bmN0aW9uKG5ld0NvbnRlbnQsIHRpbWVzdGFtcCwg cmVzdG9yaW5nSGlzdG9yeSkKICAgICB7CiAgICAgICAgIHZhciByZXZpc2lvbiA9IG5ldyBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvbih0aGlzLCB0aGlzLl9jb250ZW50LCB0aGlzLl9jb250 ZW50VGltZXN0YW1wKTsKICAgICAgICAgdGhpcy5oaXN0b3J5LnB1c2gocmV2aXNpb24pOwogCiAg ICAgICAgIHRoaXMuX2NvbnRlbnQgPSBuZXdDb250ZW50OwotICAgICAgICB0aGlzLl9jb250ZW50 VGltZXN0YW1wID0gbmV3IERhdGUoKTsKKyAgICAgICAgdGhpcy5fY29udGVudFRpbWVzdGFtcCA9 IHRpbWVzdGFtcCB8fCBuZXcgRGF0ZSgpOwogCiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5FdmVudHMuUmV2aXNpb25BZGRlZCwgcmV2 aXNpb24pOworCisgICAgICAgIGlmICghcmVzdG9yaW5nSGlzdG9yeSkKKyAgICAgICAgICAgIHRo aXMuX3BlcnNpc3RSZXZpc2lvbigpOworICAgIH0sCisKKyAgICBfcGVyc2lzdFJldmlzaW9uOiBm dW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIXdpbmRvdy5sb2NhbFN0b3JhZ2UpCisgICAg ICAgICAgICByZXR1cm47CisKKyAgICAgICAgdmFyIHVybCA9IHRoaXMudXJsOworICAgICAgICB2 YXIgbG9hZGVySWQgPSB0aGlzLmxvYWRlcklkOworICAgICAgICB2YXIgdGltZXN0YW1wID0gdGhp cy5fY29udGVudFRpbWVzdGFtcC5nZXRUaW1lKCk7CisgICAgICAgIHZhciBjb250ZW50ID0gdGhp cy5fY29udGVudDsKKyAgICAgICAgZnVuY3Rpb24gcGVyc2lzdCgpCisgICAgICAgIHsKKyAgICAg ICAgICAgIHZhciBrZXkgPSAicmVzb3VyY2UtaGlzdG9yeXwiICsgdXJsICsgInwiICsgbG9hZGVy SWQgKyAifCIgKyB0aW1lc3RhbXA7CisgICAgICAgICAgICB3aW5kb3cubG9jYWxTdG9yYWdlW2tl eV0gPSBjb250ZW50OworICAgICAgICB9CisgICAgCisgICAgICAgIC8vIFNjaGVkdWxlIGFzeW5j IHN0b3JhZ2UuCisgICAgICAgIHNldFRpbWVvdXQocGVyc2lzdCwgMCk7CisgICAgfSwKKworICAg IF9yZXN0b3JlUmV2aXNpb25zOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIXdpbmRv dy5sb2NhbFN0b3JhZ2UpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdHJ5IHsKKyAg ICAgICAgICAgIHZhciB1cmxLZXkgPSAicmVzb3VyY2UtaGlzdG9yeXwiICsgdGhpcy51cmwgKyAi fCIgKyB0aGlzLmxvYWRlcklkICsgInwiOworCisgICAgICAgICAgICB2YXIgY29udGVudCA9IHt9 OworICAgICAgICAgICAgdmFyIHRpbWVzdGFtcHMgPSBbXTsKKyAgICAgICAgICAgIGZvciAodmFy IGtleSBpbiB3aW5kb3cubG9jYWxTdG9yYWdlKSB7CisgICAgICAgICAgICAgICAgaWYgKGtleS5p bmRleE9mKHVybEtleSkgIT09IDApCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAg ICAgICAgICAgICAgIHZhciB0aW1lc3RhbXAgPSBwYXJzZUludChrZXkuc3Vic3RyaW5nKHVybEtl eS5sZW5ndGgpKTsKKyAgICAgICAgICAgICAgICBjb250ZW50W3RpbWVzdGFtcF0gPSB3aW5kb3cu bG9jYWxTdG9yYWdlW2tleV07CisgICAgICAgICAgICAgICAgdGltZXN0YW1wcy5wdXNoKHRpbWVz dGFtcCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghdGltZXN0YW1wcy5sZW5n dGgpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICB0aW1lc3RhbXBzLnNv cnQoKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGltZXN0YW1wcy5sZW5ndGg7 ICsraSkgeworICAgICAgICAgICAgICAgIHZhciB0aW1lc3RhbXAgPSB0aW1lc3RhbXBzW2ldOwor ICAgICAgICAgICAgICAgIHRoaXMuYWRkUmV2aXNpb24oY29udGVudFt0aW1lc3RhbXBdLCBuZXcg RGF0ZSh0aW1lc3RhbXApLCB0cnVlKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSBjYXRjaChl KSB7CisgICAgICAgICAgICBjb25zb2xlLmVycm9yKGUudG9TdHJpbmcoKSk7CisgICAgICAgIH0K ICAgICB9LAogCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2Rl bC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9k ZWwuanMKaW5kZXggODkwZGFlYmYxZDNlMTM5OGQwMzY2ODkzNWUyMzI5NTMwOWU5NGIxMC4uYzBk ZDY5MTZlNTY5MjdhODIxNDc1ZjgwMTYwODYxYmVlMmRlZjhkOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCkBA IC0xMjMsNiArMTIzLDkgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlw ZSA9IHsKIAogICAgICAgICBpZiAoaXNNYWluRnJhbWUgJiYgdGhpcy5yZXNvdXJjZUZvclVSTChm cmFtZS51cmwpKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZSA9IHRoaXMu cmVzb3VyY2VGb3JVUkwoZnJhbWUudXJsKTsKKworICAgICAgICBpZiAoaXNNYWluRnJhbWUpCisg ICAgICAgICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuY2xlYXJSZXZpc2lvbkhpc3RvcnkoKTsK ICAgICB9LAogCiAgICAgX29uRnJhbWVEZXRhY2hlZEZyb21QYXJlbnQ6IGZ1bmN0aW9uKGV2ZW50 KQpAQCAtMjk5LDkgKzMwMiw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90 b3R5cGUgPSB7CiAKICAgICBfY3JlYXRlUmVzb3VyY2U6IGZ1bmN0aW9uKGZyYW1lLCB1cmwpCiAg ICAgewotICAgICAgICB2YXIgcmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKG51 bGwsIHVybCk7CisgICAgICAgIHZhciByZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UobnVsbCwgdXJsLCBmcmFtZS5sb2FkZXJJZCk7CiAgICAgICAgIHJlc291cmNlLmZyYW1lSWQg PSBmcmFtZS5pZDsKLSAgICAgICAgcmVzb3VyY2UubG9hZGVySWQgPSBmcmFtZS5sb2FkZXJJZDsK ICAgICAgICAgcmVzb3VyY2UuZG9jdW1lbnRVUkwgPSBmcmFtZS51cmw7CiAgICAgICAgIHJldHVy biByZXNvdXJjZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NvdXJjZUNTU1Rva2VuaXplci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlQ1NTVG9rZW5pemVyLmpzCmluZGV4IDcyNTlkYzFjYzczMDNmZTc4 YjMyZmRkN2U1OTZkYzg0NzYxNDU1Y2EuLmViNjMzMjRlM2JkMTQ1ZjUxNmRmYjQ5YmMwMWU5N2Zm OGMxYzQ3YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U291cmNlQ1NTVG9rZW5pemVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlQ1NTVG9rZW5pemVyLmpzCkBAIC00NSw3ICs0NSw3IEBAIFdlYkluc3BlY3Rv ci5Tb3VyY2VDU1NUb2tlbml6ZXIgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlNv dXJjZVRva2VuaXplci5jYWxsKHRoaXMpOwogCi0gICAgdGhpcy5fcHJvcGVydHlLZXl3b3JkcyA9 IFdlYkluc3BlY3Rvci5jc3NOYW1lQ29tcGxldGlvbnMua2V5U2V0KCk7CisgICAgdGhpcy5fcHJv cGVydHlLZXl3b3JkcyA9IFdlYkluc3BlY3Rvci5jc3NOYW1lQ29tcGxldGlvbnMgPyBXZWJJbnNw ZWN0b3IuY3NzTmFtZUNvbXBsZXRpb25zLmtleVNldCgpIDoge307CiAKICAgICB0aGlzLl92YWx1 ZUtleXdvcmRzID0gWwogICAgICAgICAiYWJvdmUiLCAiYWJzb2x1dGUiLCAiYWN0aXZlYm9yZGVy IiwgImFjdGl2ZWNhcHRpb24iLCAiYWZhciIsICJhZnRlci13aGl0ZS1zcGFjZSIsICJhaGVhZCIs ICJhbGlhcyIsICJhbGwiLCAiYWxsLXNjcm9sbCIsCg==