59590 2011-04-27 02:28:17 -0700 Web Inspector: clicking bookmarklet multiplies resources panel entries. 2011-04-27 07:42:11 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo ossy pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 393455 0 pfeldman 2011-04-27 02:28:17 -0700 Patch to follow. 393505 1 91271 pfeldman 2011-04-27 05:04:24 -0700 Created attachment 91271 Patch 393508 2 91271 yurys 2011-04-27 05:13:54 -0700 Comment on attachment 91271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91271&action=review > Source/WebCore/ChangeLog:19 > +2011-04-27 Pavel Feldman <pfeldman@google.com> poor merge? > Source/WebCore/inspector/front-end/ResourceTreeModel.js:73 > this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded); Can we get rid of this call in favor of _frameNavigated? 393509 3 91273 pfeldman 2011-04-27 05:24:35 -0700 Created attachment 91273 Patch 393510 4 91273 yurys 2011-04-27 05:29:45 -0700 Comment on attachment 91273 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91273&action=review > Source/WebCore/inspector/front-end/ResourceTreeModel.js:136 > WebInspector.mainResource = this.resourceForURL(frame.url); Can you swap this line with the one above? > Source/WebCore/inspector/front-end/ResourcesPanel.js:1017 > + this._treeElementForResource[resource.url] = resourceTreeElement; I'd rather move it to the beginning of the method. > Source/WebCore/inspector/front-end/ResourcesPanel.js:1022 > + WebInspector.BaseStorageTreeElement.prototype.removeChildren.call(); call(this) 393515 5 pfeldman 2011-04-27 05:37:30 -0700 Committed r85048: <http://trac.webkit.org/changeset/85048> 393539 6 ossy 2011-04-27 07:33:15 -0700 It seems that a test need rebaseline after this patch. Could you confirm it? --- /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/inspector/extensions/extensions-events-expected.txt 2011-04-27 05:54:26.000000000 -0700 +++ /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release-tests/build/layout-test-results/inspector/extensions/extensions-events-actual.txt 2011-04-27 05:54:26.000000000 -0700 @@ -5,8 +5,8 @@ RUNNING TEST: extension_testOnNavigated Page reloaded. Page reloaded. -Navigated to: extensions-events.html Navigated to: extensions-events.html?navigated +Navigated to: extensions-events.html RUNNING TEST: extension_testOnResourceFinished onFinished fired RUNNING TEST: extension_testOnSelectionChanged 393541 7 webkit.review.bot 2011-04-27 07:42:11 -0700 http://trac.webkit.org/changeset/85048 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: inspector/extensions/extensions-events.html 91271 2011-04-27 05:04:24 -0700 2011-04-27 05:24:27 -0700 Patch bug-59590-20110427160421.patch text/plain 6744 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODUwNDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NzJiZTk4YjhhZWRkYzhj NWVhZjJkNWU5MzdkMzdmZTE3OTJhNmRhLi40NGZhNzJkMjcxNWJlYzkxMTY4YzIyMGEzOTEyYjll ZmQ4NzljNjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIwMTEtMDQtMjcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsaWNraW5nIGJvb2ttYXJr bGV0IG11bHRpcGxpZXMgcmVzb3VyY2VzIHBhbmVsIGVudHJpZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU5MAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwucHJvdG90eXBlLl9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVSZXNvdXJjZVRy ZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLmFwcGVuZFJlc291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5mcm9udGVuZFJldXNlZCk6CisKKzIwMTEtMDQtMjcgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWto YXRza3kuCisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogb3BlbmluZyBib29rbWFya2xldCBkaXNj b25uZWN0cyBET00gYWdlbnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01OTU4OAorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTUFnZW50OjpzZXREb2N1bWVudCk6 CisKKzIwMTEtMDQtMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCiAKICAgICAgICAgV2ViIEluc3Bl Y3Rvcjogb3BlbmluZyBib29rbWFya2xldCBkaXNjb25uZWN0cyBET00gYWdlbnQuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVs LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2Rl bC5qcwppbmRleCAyZjAwZGRkZTNlZDM2NDM0MDFjNTE1ZDhiMzczMzA3ODQ0ZDdlYWRjLi43YjY3 OWUyN2I2MWI2OTlhYjc1NzkwN2I4NjkyNjExN2VlNjkzZjdkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKQEAg LTM1LDggKzM1LDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsID0gZnVuY3Rpb24o bmV0d29ya01hbmFnZXIpCiAgICAgV2ViSW5zcGVjdG9yLm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5hZ2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VV cGRhdGVkLCB0aGlzLl9vblJlc291cmNlVXBkYXRlZCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9y Lm5ldHdvcmtNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk5ldHdvcmtNYW5h Z2VyLkV2ZW50VHlwZXMuUmVzb3VyY2VGaW5pc2hlZCwgdGhpcy5fb25SZXNvdXJjZVVwZGF0ZWQs IHRoaXMpOwogCi0gICAgdGhpcy5mcm9udGVuZFJldXNlZCgpOwogICAgIEluc3BlY3RvckJhY2tl bmQucmVnaXN0ZXJEb21haW5EaXNwYXRjaGVyKCJQYWdlIiwgbmV3IFdlYkluc3BlY3Rvci5QYWdl RGlzcGF0Y2hlcih0aGlzKSk7CisgICAgdGhpcy5mcm9udGVuZFJldXNlZCgpOwogfQogCiBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcyA9IHsKQEAgLTY0LDExICs2NCwx MiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwucHJvdG90eXBlID0gewogICAgICAg ICBpZiAoZXJyb3IpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZSA9IHRoaXMuX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5KG1haW5GcmFtZVBheWxv YWQpOwogICAgICAgICB0aGlzLl9jYWNoZWRSZXNvdXJjZXNQcm9jZXNzZWQgPSB0cnVlOwogCi0g ICAgICAgIHRoaXMuX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZChXZWJJbnNwZWN0b3IubWFp blJlc291cmNlLnVybCk7CisgICAgICAgIC8vIFNpbXVsYXRlIG5hdmlnYXRpb24gZm9yIHRoZSBm cm9udC1lbmQgcmV1c2VkIHNjZW5hcmlvLgorICAgICAgICB0aGlzLl9mcmFtZU5hdmlnYXRlZCht YWluRnJhbWVQYXlsb2FkLmZyYW1lLCBtYWluRnJhbWVQYXlsb2FkLmZyYW1lLmxvYWRlcklkKTsK IAorICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291cmNlID0gdGhpcy5fYWRkRnJhbWVzUmVj dXJzaXZlbHkobWFpbkZyYW1lUGF5bG9hZCk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkNhY2hl ZFJlc291cmNlc0xvYWRlZCk7CiAgICAgfSwKIApAQCAtMTE1LDggKzExNiw2IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47 CiAKICAgICAgICAgdmFyIGlzTWFpbkZyYW1lID0gIWZyYW1lLnBhcmVudElkOwotICAgICAgICBp ZiAoaXNNYWluRnJhbWUpCi0gICAgICAgICAgICB0aGlzLl9kaXNwYXRjaEluc3BlY3RlZFVSTENo YW5nZWQoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwpOwogCiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVu dFR5cGVzLkZyYW1lTmF2aWdhdGVkLCB7IGZyYW1lOiBmcmFtZSwgbG9hZGVySWQ6IGxvYWRlcklk LCBpc01haW5GcmFtZTogaXNNYWluRnJhbWUgfSk7CiAKQEAgLTEzMSwxMSArMTMwLDExIEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJl ZU1vZGVsLkV2ZW50VHlwZXMuUmVzb3VyY2VBZGRlZCwgcmVzb3VyY2VzRm9yRnJhbWVbdXJsXSk7 CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoaXNNYWluRnJhbWUgJiYgdGhpcy5yZXNvdXJjZUZv clVSTChmcmFtZS51cmwpKQorICAgICAgICBpZiAoaXNNYWluRnJhbWUgJiYgdGhpcy5yZXNvdXJj ZUZvclVSTChmcmFtZS51cmwpKSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IubWFpblJlc291 cmNlID0gdGhpcy5yZXNvdXJjZUZvclVSTChmcmFtZS51cmwpOwotCi0gICAgICAgIGlmIChpc01h aW5GcmFtZSkKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZChm cmFtZS51cmwpOwogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlJlc291cmNlLmNsZWFyUmV2aXNp b25IaXN0b3J5KCk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgX2ZyYW1lRGV0YWNoZWQ6IGZ1 bmN0aW9uKGZyYW1lSWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCAwMThkMTRiNGU3ZWUxZjE4YmJjZjk1NWI2MmE4 MzM0NjhjN2E0MWMwLi4zYjRlNzk0YzEyMTg0ZTMyZjI3OGY0MWRkYjY0OWNjYzdkY2VlMzY4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1Bh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Vz UGFuZWwuanMKQEAgLTE5Miw2ICsxOTIsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlQWRkZWQoe2RhdGE6 cmVzb3VyY2VzW2ldfSk7CiAgICAgICAgIH0KICAgICAgICAgcG9wdWxhdGVGcmFtZS5jYWxsKHRo aXMsIDApOworICAgICAgICB0aGlzLl9jYWNoZWRSZXNvdXJjZXNMb2FkZWQoKTsKICAgICB9LAog CiAgICAgX2ZyYW1lQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtOTI2LDYgKzkyNyw3IEBAIFdl Ykluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50ID0gZnVuY3Rpb24oc3RvcmFnZVBhbmVsLCBmcmFt ZUlkLCB0aXRsZSwgc3VidGl0bGUpCiAgICAgdGhpcy5fZnJhbWVJZCA9IGZyYW1lSWQ7CiAgICAg dGhpcy5zZXRUaXRsZXModGl0bGUsIHN1YnRpdGxlKTsKICAgICB0aGlzLl9jYXRlZ29yeUVsZW1l bnRzID0ge307CisgICAgdGhpcy5fdHJlZUVsZW1lbnRGb3JSZXNvdXJjZSA9IHt9OwogfQogCiBX ZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CkBAIC05OTEsNiArOTkz LDkgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAg YXBwZW5kUmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKKyAgICAgICAgaWYgKHRo aXMuX3RyZWVFbGVtZW50Rm9yUmVzb3VyY2VbcmVzb3VyY2UudXJsXSkKKyAgICAgICAgICAgIHJl dHVybjsKKwogICAgICAgICB2YXIgY2F0ZWdvcnlOYW1lID0gcmVzb3VyY2UuY2F0ZWdvcnkubmFt ZTsKICAgICAgICAgdmFyIGNhdGVnb3J5RWxlbWVudCA9IHJlc291cmNlLmNhdGVnb3J5ID09PSBX ZWJJbnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLmRvY3VtZW50cyA/IHRoaXMgOiB0aGlzLl9j YXRlZ29yeUVsZW1lbnRzW2NhdGVnb3J5TmFtZV07CiAgICAgICAgIGlmICghY2F0ZWdvcnlFbGVt ZW50KSB7CkBAIC0xMDAxLDYgKzEwMDYsMTQgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1l bnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgcmVzb3VyY2VUcmVlRWxlbWVudCA9IG5ldyBX ZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50KHRoaXMuX3N0b3JhZ2VQYW5lbCwg cmVzb3VyY2UpOwogICAgICAgICB0aGlzLl9pbnNlcnRJblByZXNlbnRhdGlvbk9yZGVyKGNhdGVn b3J5RWxlbWVudCwgcmVzb3VyY2VUcmVlRWxlbWVudCk7CiAgICAgICAgIHJlc291cmNlVHJlZUVs ZW1lbnQuX3BvcHVsYXRlUmV2aXNpb25zKCk7CisKKyAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRG b3JSZXNvdXJjZVtyZXNvdXJjZS51cmxdID0gcmVzb3VyY2VUcmVlRWxlbWVudDsKKyAgICB9LAor CisgICAgcmVtb3ZlQ2hpbGRyZW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5yZW1vdmVDaGlsZHJlbi5jYWxs KCk7CisgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50Rm9yUmVzb3VyY2UgPSBbXTsKICAgICB9LAog CiAgICAgYXBwZW5kQ2hpbGQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCAyZWMxOTk2NTE1YjRm ZDczNjg3MzRlYTQ4NGVmNjZmYmE0MTQ0ZjQ1Li5iZTU4OWQwMDJjOThiNDRiNTA3MGIxNTE3NzMy NDk5NThmNjA3NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcwpAQCAtMTM2Nyw2ICsxMzY3LDEwIEBAIFdlYkluc3BlY3Rvci5hZGRNYWlu RXZlbnRMaXN0ZW5lcnMgPSBmdW5jdGlvbihkb2MpCiAKIFdlYkluc3BlY3Rvci5mcm9udGVuZFJl dXNlZCA9IGZ1bmN0aW9uKCkKIHsKKyAgICBDb25zb2xlQWdlbnQuZW5hYmxlKHRoaXMuY29uc29s ZS5zZXRDb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudC5iaW5kKHRoaXMuY29uc29sZSkpOworICAg IERhdGFiYXNlQWdlbnQuZW5hYmxlKCk7CisgICAgRE9NU3RvcmFnZUFnZW50LmVuYWJsZSgpOwor CiAgICAgdGhpcy5uZXR3b3JrTWFuYWdlci5mcm9udGVuZFJldXNlZCgpOwogICAgIHRoaXMucmVz b3VyY2VUcmVlTW9kZWwuZnJvbnRlbmRSZXVzZWQoKTsKICAgICBXZWJJbnNwZWN0b3IucGFuZWxz Lm5ldHdvcmsuY2xlYXIoKTsK 91273 2011-04-27 05:24:35 -0700 2011-04-27 05:29:45 -0700 Patch bug-59590-20110427162432.patch text/plain 7710 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogODUwNDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NzJiZTk4YjhhZWRkYzhj NWVhZjJkNWU5MzdkMzdmZTE3OTJhNmRhLi41NGE3ZWQwMDY0MzllZDJjYzc5MWQ2MzQ4MTMyNTgx N2U5Yjg0ZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMTEtMDQtMjcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNsaWNraW5nIGJvb2ttYXJr bGV0IG11bHRpcGxpZXMgcmVzb3VyY2VzIHBhbmVsIGVudHJpZXMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTU5MAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVRyZWVNb2RlbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwucHJvdG90eXBlLl9wcm9jZXNzQ2FjaGVkUmVzb3VyY2VzKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuX2ZyYW1lTmF2aWdhdGVkKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVSZXNvdXJjZVRy ZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlLmFwcGVuZFJlc291cmNlKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5mcm9udGVuZFJldXNlZCk6CisKKzIwMTEtMDQtMjcgIFBhdmVsIEZlbGRtYW4g IDxwZmVsZG1hbkBnb29nbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWto YXRza3kuCiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjogb3BlbmluZyBib29rbWFya2xldCBkaXNj b25uZWN0cyBET00gYWdlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlVHJlZU1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcwppbmRleCAyZjAwZGRkZTNlZDM2NDM0MDFj NTE1ZDhiMzczMzA3ODQ0ZDdlYWRjLi41YzYyZjQzODQxYzU5NTFmMDJiNzRhZTZiMDhjNWRkMjI4 YWQ2NTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jl c291cmNlVHJlZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VUcmVlTW9kZWwuanMKQEAgLTQ0LDYgKzQ0LDcgQEAgV2ViSW5zcGVjdG9yLlJl c291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMgPSB7CiAgICAgRnJhbWVOYXZpZ2F0ZWQ6ICJGcmFt ZU5hdmlnYXRlZCIsCiAgICAgRnJhbWVEZXRhY2hlZDogIkZyYW1lRGV0YWNoZWQiLAogICAgIFJl c291cmNlQWRkZWQ6ICJSZXNvdXJjZUFkZGVkIiwKKyAgICBXaWxsTG9hZENhY2hlZFJlc291cmNl czogIldpbGxMb2FkQ2FjaGVkUmVzb3VyY2VzIiwKICAgICBDYWNoZWRSZXNvdXJjZXNMb2FkZWQ6 ICJDYWNoZWRSZXNvdXJjZXNMb2FkZWQiLAogICAgIERPTUNvbnRlbnRMb2FkZWQ6ICJET01Db250 ZW50TG9hZGVkIiwKICAgICBPbkxvYWQ6ICJPbkxvYWQiLApAQCAtNjQsMTIgKzY1LDEzIEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChl cnJvcikKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRU b0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5XaWxs TG9hZENhY2hlZFJlc291cmNlcyk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Ug PSB0aGlzLl9hZGRGcmFtZXNSZWN1cnNpdmVseShtYWluRnJhbWVQYXlsb2FkKTsKKyAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLkV2ZW50VHlwZXMuQ2FjaGVkUmVzb3VyY2VzTG9hZGVkKTsKKwogICAgICAgICB0aGlzLl9j YWNoZWRSZXNvdXJjZXNQcm9jZXNzZWQgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX2Rpc3BhdGNo SW5zcGVjdGVkVVJMQ2hhbmdlZChXZWJJbnNwZWN0b3IubWFpblJlc291cmNlLnVybCk7Ci0KLSAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlJlc291cmNl VHJlZU1vZGVsLkV2ZW50VHlwZXMuQ2FjaGVkUmVzb3VyY2VzTG9hZGVkKTsKICAgICB9LAogCiAg ICAgX2Rpc3BhdGNoSW5zcGVjdGVkVVJMQ2hhbmdlZDogZnVuY3Rpb24odXJsKQpAQCAtMTE1LDgg KzExNyw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgdmFyIGlzTWFpbkZyYW1lID0gIWZyYW1lLnBh cmVudElkOwotICAgICAgICBpZiAoaXNNYWluRnJhbWUpCi0gICAgICAgICAgICB0aGlzLl9kaXNw YXRjaEluc3BlY3RlZFVSTENoYW5nZWQoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS51cmwpOwog CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNv dXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkZyYW1lTmF2aWdhdGVkLCB7IGZyYW1lOiBmcmFtZSwg bG9hZGVySWQ6IGxvYWRlcklkLCBpc01haW5GcmFtZTogaXNNYWluRnJhbWUgfSk7CiAKQEAgLTEz MSwxMSArMTMxLDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5z cGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuUmVzb3VyY2VBZGRlZCwgcmVzb3Vy Y2VzRm9yRnJhbWVbdXJsXSk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoaXNNYWluRnJhbWUg JiYgdGhpcy5yZXNvdXJjZUZvclVSTChmcmFtZS51cmwpKQorICAgICAgICBpZiAoaXNNYWluRnJh bWUgJiYgdGhpcy5yZXNvdXJjZUZvclVSTChmcmFtZS51cmwpKSB7CisgICAgICAgICAgICB0aGlz Ll9kaXNwYXRjaEluc3BlY3RlZFVSTENoYW5nZWQoZnJhbWUudXJsKTsKICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5tYWluUmVzb3VyY2UgPSB0aGlzLnJlc291cmNlRm9yVVJMKGZyYW1lLnVybCk7 Ci0KLSAgICAgICAgaWYgKGlzTWFpbkZyYW1lKQogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlJl c291cmNlLmNsZWFyUmV2aXNpb25IaXN0b3J5KCk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAg X2ZyYW1lRGV0YWNoZWQ6IGZ1bmN0aW9uKGZyYW1lSWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwppbmRleCAwMThkMTRiNGU3 ZWUxZjE4YmJjZjk1NWI2MmE4MzM0NjhjN2E0MWMwLi4wMGJjMDg3ZmFlNTdlMmZiZTZkN2RkMjI2 NTA4NTIwNWYwOGUwZGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKQEAgLTE3OCw2ICsxNzgsNyBAQCBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IucmVz b3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5GcmFtZURldGFjaGVkLCB0aGlzLl9mcmFtZURldGFjaGVkLCB0aGlz KTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVu ZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2ZW50VHlwZXMuUmVzb3VyY2VBZGRl ZCwgdGhpcy5fcmVzb3VyY2VBZGRlZCwgdGhpcyk7CiAgICAgICAgIFdlYkluc3BlY3Rvci5yZXNv dXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVN b2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwgdGhpcy5fY2FjaGVkUmVzb3Vy Y2VzTG9hZGVkLCB0aGlzKTsgCisgICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2Rl bC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5 cGVzLldpbGxMb2FkQ2FjaGVkUmVzb3VyY2VzLCB0aGlzLl9yZXNldFJlc291cmNlc1RyZWUsIHRo aXMpOyAKIAogICAgICAgICBmdW5jdGlvbiBwb3B1bGF0ZUZyYW1lKGZyYW1lSWQpCiAgICAgICAg IHsKQEAgLTE5Miw2ICsxOTMsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90 eXBlID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlQWRkZWQoe2RhdGE6cmVzb3Vy Y2VzW2ldfSk7CiAgICAgICAgIH0KICAgICAgICAgcG9wdWxhdGVGcmFtZS5jYWxsKHRoaXMsIDAp OworCisgICAgICAgIHRoaXMuX2luaXREZWZhdWx0U2VsZWN0aW9uKCk7CiAgICAgfSwKIAogICAg IF9mcmFtZUFkZGVkOiBmdW5jdGlvbihldmVudCkKQEAgLTI1Nyw5ICsyNjAsNyBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgaWYgKGV2 ZW50LmRhdGEuaXNNYWluRnJhbWUpIHsKICAgICAgICAgICAgIC8vIFRvdGFsIHVwZGF0ZS4KLSAg ICAgICAgICAgIHRoaXMucmVzb3VyY2VzTGlzdFRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7 Ci0gICAgICAgICAgICB0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWQgPSB7fTsKLSAgICAgICAg ICAgIHRoaXMuX3Jlc2V0KCk7CisgICAgICAgICAgICB0aGlzLl9yZXNldFJlc291cmNlc1RyZWUo KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCkBAIC0yNjksNiArMjcwLDEzIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBm cmFtZVRyZWVFbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7ICAgICAgICAKICAgICB9LAogCisgICAg X3Jlc2V0UmVzb3VyY2VzVHJlZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5yZXNv dXJjZXNMaXN0VHJlZUVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAgdGhpcy5fdHJl ZUVsZW1lbnRGb3JGcmFtZUlkID0ge307CisgICAgICAgIHRoaXMuX3Jlc2V0KCk7CisgICAgfSwK KwogICAgIF9jYWNoZWRSZXNvdXJjZXNMb2FkZWQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IHRoaXMuX2luaXREZWZhdWx0U2VsZWN0aW9uKCk7CkBAIC05MjYsNiArOTM0LDcgQEAgV2ViSW5z cGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihzdG9yYWdlUGFuZWwsIGZyYW1lSWQs IHRpdGxlLCBzdWJ0aXRsZSkKICAgICB0aGlzLl9mcmFtZUlkID0gZnJhbWVJZDsKICAgICB0aGlz LnNldFRpdGxlcyh0aXRsZSwgc3VidGl0bGUpOwogICAgIHRoaXMuX2NhdGVnb3J5RWxlbWVudHMg PSB7fTsKKyAgICB0aGlzLl90cmVlRWxlbWVudEZvclJlc291cmNlID0ge307CiB9CiAKIFdlYklu c3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKQEAgLTk5MSw2ICsxMDAwLDkg QEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogCiAgICAgYXBw ZW5kUmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMu X3RyZWVFbGVtZW50Rm9yUmVzb3VyY2VbcmVzb3VyY2UudXJsXSkKKyAgICAgICAgICAgIHJldHVy bjsKKwogICAgICAgICB2YXIgY2F0ZWdvcnlOYW1lID0gcmVzb3VyY2UuY2F0ZWdvcnkubmFtZTsK ICAgICAgICAgdmFyIGNhdGVnb3J5RWxlbWVudCA9IHJlc291cmNlLmNhdGVnb3J5ID09PSBXZWJJ bnNwZWN0b3IucmVzb3VyY2VDYXRlZ29yaWVzLmRvY3VtZW50cyA/IHRoaXMgOiB0aGlzLl9jYXRl Z29yeUVsZW1lbnRzW2NhdGVnb3J5TmFtZV07CiAgICAgICAgIGlmICghY2F0ZWdvcnlFbGVtZW50 KSB7CkBAIC0xMDAxLDYgKzEwMTMsMTQgQEAgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQu cHJvdG90eXBlID0gewogICAgICAgICB2YXIgcmVzb3VyY2VUcmVlRWxlbWVudCA9IG5ldyBXZWJJ bnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50KHRoaXMuX3N0b3JhZ2VQYW5lbCwgcmVz b3VyY2UpOwogICAgICAgICB0aGlzLl9pbnNlcnRJblByZXNlbnRhdGlvbk9yZGVyKGNhdGVnb3J5 RWxlbWVudCwgcmVzb3VyY2VUcmVlRWxlbWVudCk7CiAgICAgICAgIHJlc291cmNlVHJlZUVsZW1l bnQuX3BvcHVsYXRlUmV2aXNpb25zKCk7CisKKyAgICAgICAgdGhpcy5fdHJlZUVsZW1lbnRGb3JS ZXNvdXJjZVtyZXNvdXJjZS51cmxdID0gcmVzb3VyY2VUcmVlRWxlbWVudDsKKyAgICB9LAorCisg ICAgcmVtb3ZlQ2hpbGRyZW46IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rv ci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5yZW1vdmVDaGlsZHJlbi5jYWxsKCk7 CisgICAgICAgIHRoaXMuX3RyZWVFbGVtZW50Rm9yUmVzb3VyY2UgPSBbXTsKICAgICB9LAogCiAg ICAgYXBwZW5kQ2hpbGQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCAyZWMxOTk2NTE1YjRmZDcz Njg3MzRlYTQ4NGVmNjZmYmE0MTQ0ZjQ1Li5iZTU4OWQwMDJjOThiNDRiNTA3MGIxNTE3NzMyNDk5 NThmNjA3NGRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwpAQCAtMTM2Nyw2ICsxMzY3LDEwIEBAIFdlYkluc3BlY3Rvci5hZGRNYWluRXZl bnRMaXN0ZW5lcnMgPSBmdW5jdGlvbihkb2MpCiAKIFdlYkluc3BlY3Rvci5mcm9udGVuZFJldXNl ZCA9IGZ1bmN0aW9uKCkKIHsKKyAgICBDb25zb2xlQWdlbnQuZW5hYmxlKHRoaXMuY29uc29sZS5z ZXRDb25zb2xlTWVzc2FnZUV4cGlyZWRDb3VudC5iaW5kKHRoaXMuY29uc29sZSkpOworICAgIERh dGFiYXNlQWdlbnQuZW5hYmxlKCk7CisgICAgRE9NU3RvcmFnZUFnZW50LmVuYWJsZSgpOworCiAg ICAgdGhpcy5uZXR3b3JrTWFuYWdlci5mcm9udGVuZFJldXNlZCgpOwogICAgIHRoaXMucmVzb3Vy Y2VUcmVlTW9kZWwuZnJvbnRlbmRSZXVzZWQoKTsKICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5l dHdvcmsuY2xlYXIoKTsK