32610 2009-12-16 06:57:32 -0800 Web Inspector: Links to source in CPU profiles should open Scripts (debugger) panel 2009-12-17 07:34:48 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mnaganov webkit-unassigned bweinstein commit-queue joepeck keishi pfeldman pmuellr rik timothy webkit.review.bot oldest_to_newest 172282 0 mnaganov 2009-12-16 06:57:32 -0800 It is more convenient to explore performance issues using debugger, not resources panel. 172283 1 44973 mnaganov 2009-12-16 07:05:12 -0800 Created attachment 44973 Proposed fix 172284 2 webkit.review.bot 2009-12-16 07:07:52 -0800 style-queue ran check-webkit-style on attachment 44973 without any errors. 172316 3 44973 pfeldman 2009-12-16 09:11:32 -0800 Comment on attachment 44973 Proposed fix > WebInspector.canShowResourceForURL = function(url, preferredPanel) > WebInspector.showResourceForURL = function(url, line, preferredPanel) It would be much more clear if you made Panel's canShowResource and showResource accept URL instead of resource. That way you would be able to make canShowResourceForURL and showResourceForURL here panel-agnostic. 172521 4 45012 mnaganov 2009-12-16 13:55:56 -0800 Created attachment 45012 proposed change, comments addressed 172526 5 webkit.review.bot 2009-12-16 14:00:20 -0800 style-queue ran check-webkit-style on attachment 45012 without any errors. 172537 6 45012 pfeldman 2009-12-16 14:24:47 -0800 Comment on attachment 45012 proposed change, comments addressed > +WebInspector._choosePanelToShowResourceForURL = function(url, preferredPanel) > { > - var resource = this.resourceForURL(url); > - if (!resource) > - return false; > - > + var panel = null; > if (preferredPanel && preferredPanel in WebInspector.panels) { > - var panel = this.panels[preferredPanel]; > - if (!("showResource" in panel)) > + panel = this.panels[preferredPanel]; > + if (!("showResourceForURL" in panel)) > panel = null; > - else if ("canShowResource" in panel && !panel.canShowResource(resource)) > + else if ("canShowResourceForURL" in panel && !panel.canShowResourceForURL(url)) > panel = null; > } > + if (!panel && preferredPanel != "resources") > + return this._choosePanelToShowResourceForURL(url, "resources"); > + return panel; > +} Can we implement this a bit more simple? - Require that any preferredPanel has necessary canShow and show methods - first check against preferredPanel, in case of failure explicitly check against resources. No need to reenter method. > + > +WebInspector.showResourceForURL = function(url, line, preferredPanel) > +{ This name no longer applies. WebInspector.showScriptOrResourceForURL ? r- for confusing logic in _choosePanelToShowResourceForURL and name of the method. 172739 7 45060 mnaganov 2009-12-17 06:28:38 -0800 Created attachment 45060 Proposed fix, comments addressed 172741 8 webkit.review.bot 2009-12-17 06:30:28 -0800 style-queue ran check-webkit-style on attachment 45060 without any errors. 172753 9 45060 pfeldman 2009-12-17 07:20:08 -0800 Comment on attachment 45060 Proposed fix, comments addressed > + showSourceLineForURL: function(url, line) > + { > + this.showResource(WebInspector.resourceForURL(url)); You lose line information here. Rest is Ok. 172754 10 45064 mnaganov 2009-12-17 07:21:00 -0800 Created attachment 45064 fixed 'line' argument loss for resources panel 172755 11 webkit.review.bot 2009-12-17 07:22:17 -0800 style-queue ran check-webkit-style on attachment 45064 without any errors. 172762 12 45064 commit-queue 2009-12-17 07:34:42 -0800 Comment on attachment 45064 fixed 'line' argument loss for resources panel Clearing flags on attachment: 45064 Committed r52253: <http://trac.webkit.org/changeset/52253> 172763 13 commit-queue 2009-12-17 07:34:48 -0800 All reviewed patches have been landed. Closing bug. 44973 2009-12-16 07:05:12 -0800 2009-12-16 13:55:56 -0800 Proposed fix fix-profile-source-links-patch text/plain 4835 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2IzNmMxMS4uZmNlMTE0OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAwOS0xMi0xNiAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkdmljZSBsaW5rcyB0byBzb3VyY2UgY29kZSBpbiBDUFUg cHJvZmlsZXIgdG8gb3BlbiBpbiBkZWJ1Z2dlciwKKyAgICAgICAgbm90IGluIHJlc291cmNlcyB0 YWIuCisKKyAgICAgICAgQWxzbyB3b3JrIGFyb3VuZCB0aGUgY2FzZSB3aGVuIHJlc291cmNlcyBh cmUgZGlzYWJsZWQsIGJ1dCBzY3JpcHRzIGFyZSBwcmVzZW50LgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjYxMAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlByb2ZpbGVEYXRhR3JpZE5vZGUucHJvdG90eXBlLmNyZWF0ZUNlbGwpOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2NyaXB0Rm9yVVJMKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLmNhblNob3dSZXNvdXJjZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd1NjcmlwdE9yUmVzb3Vy Y2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGluayk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuZG9jdW1lbnRDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY2FuU2hvd1Jl c291cmNlRm9yVVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zaG93UmVzb3VyY2VGb3JVUkwp OgorCiAyMDA5LTEyLTE1ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0YUdyaWRUcmVlLmpzIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVEYXRhR3JpZFRyZWUuanMKaW5kZXggOWE3Yzc0MS4u ZGIxNTZiZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVE YXRhR3JpZFRyZWUuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVE YXRhR3JpZFRyZWUuanMKQEAgLTEwMiw2ICsxMDIsNyBAQCBXZWJJbnNwZWN0b3IuUHJvZmlsZURh dGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB1cmxFbGVtZW50LmNsYXNzTmFt ZSA9ICJwcm9maWxlLW5vZGUtZmlsZSB3ZWJraXQtaHRtbC1yZXNvdXJjZS1saW5rIjsKICAgICAg ICAgICAgIHVybEVsZW1lbnQuaHJlZiA9IHRoaXMucHJvZmlsZU5vZGUudXJsOwogICAgICAgICAg ICAgdXJsRWxlbWVudC5saW5lTnVtYmVyID0gdGhpcy5wcm9maWxlTm9kZS5saW5lTnVtYmVyOwor ICAgICAgICAgICAgdXJsRWxlbWVudC5wcmVmZXJyZWRQYW5lbCA9ICJzY3JpcHRzIjsKIAogICAg ICAgICAgICAgaWYgKHRoaXMucHJvZmlsZU5vZGUubGluZU51bWJlciA+IDApCiAgICAgICAgICAg ICAgICAgdXJsRWxlbWVudC50ZXh0Q29udGVudCA9IGZpbGVOYW1lICsgIjoiICsgdGhpcy5wcm9m aWxlTm9kZS5saW5lTnVtYmVyOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRz UGFuZWwuanMKaW5kZXggN2Y5YjdlYS4uYmFhYjkyZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0zMTAsNiArMzEwLDExIEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fc291cmNl SURNYXBbaWRdOwogICAgIH0sCiAKKyAgICBzY3JpcHRGb3JVUkw6IGZ1bmN0aW9uKHVybCkKKyAg ICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zY3JpcHRzRm9yVVJMc0luRmlsZXNTZWxlY3RbdXJs XTsKKyAgICB9LAorCiAgICAgYWRkQnJlYWtwb2ludDogZnVuY3Rpb24oYnJlYWtwb2ludCkKICAg ICB7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmJyZWFrcG9pbnRzLmFkZEJyZWFrcG9pbnQo YnJlYWtwb2ludCk7CkBAIC00OTcsOSArNTAyLDEwIEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgeC5zaG93KHRoaXMudmlld3NDb250YWluZXJF bGVtZW50KTsKICAgICB9LAogCi0gICAgY2FuU2hvd1Jlc291cmNlOiBmdW5jdGlvbihyZXNvdXJj ZSkKKyAgICBjYW5TaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHNjcmlwdE9yUmVzb3VyY2UpCiAgICAg ewotICAgICAgICByZXR1cm4gcmVzb3VyY2UgJiYgcmVzb3VyY2Uuc2NyaXB0cy5sZW5ndGggJiYg SW5zcGVjdG9yQmFja2VuZC5kZWJ1Z2dlckVuYWJsZWQoKTsKKyAgICAgICAgcmV0dXJuIHNjcmlw dE9yUmVzb3VyY2UgJiYgSW5zcGVjdG9yQmFja2VuZC5kZWJ1Z2dlckVuYWJsZWQoKSAmJgorICAg ICAgICAgICAgKCEoc2NyaXB0T3JSZXNvdXJjZSBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNv dXJjZSkgfHwgc2NyaXB0T3JSZXNvdXJjZS5zY3JpcHRzLmxlbmd0aCk7IAogICAgIH0sCiAKICAg ICBzaG93U2NyaXB0OiBmdW5jdGlvbihzY3JpcHQsIGxpbmUpCkBAIC02NTEsNyArNjU3LDcgQEAg V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KG9wdGlvbik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIg c2NyaXB0ID0gdGhpcy5fc2NyaXB0c0ZvclVSTHNJbkZpbGVzU2VsZWN0W3VybF07CisgICAgICAg ICAgICB2YXIgc2NyaXB0ID0gdGhpcy5zY3JpcHRGb3JVUkwodXJsKTsKICAgICAgICAgICAgIGlm IChzY3JpcHQpCiAgICAgICAgICAgICAgICBvcHRpb24gPSBzY3JpcHQuZmlsZXNTZWxlY3RPcHRp b247CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmlu ZGV4IDJlZDFlNzcuLmQ2YTJlNGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcwpAQCAtNjAwLDcgKzYwMCw3IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0g ZnVuY3Rpb24oZXZlbnQpCiAgICAgZnVuY3Rpb24gZm9sbG93TGluaygpCiAgICAgewogICAgICAg ICAvLyBGSVhNRTogc3VwcG9ydCB3ZWJraXQtaHRtbC1leHRlcm5hbC1saW5rIGxpbmtzIGhlcmUu Ci0gICAgICAgIGlmIChhbmNob3IuaHJlZiBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXAp IHsKKyAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5jYW5TaG93UmVzb3VyY2VGb3JVUkwoYW5jaG9y LmhyZWYsIGFuY2hvci5wcmVmZXJyZWRQYW5lbCkpIHsKICAgICAgICAgICAgIGlmIChhbmNob3Iu aGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7CiAgICAgICAgICAg ICAgICAgYW5jaG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsi KTsKICAgICAgICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0bWwtcmVz b3VyY2UtbGluayIpOwpAQCAtMTQwOSwxMSArMTQwOSwyMSBAQCBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VGb3JVUkwgPSBmdW5jdGlvbih1cmwpCiAgICAgcmV0dXJuIG51bGw7CiB9CiAKK1dlYkluc3Bl Y3Rvci5jYW5TaG93UmVzb3VyY2VGb3JVUkwgPSBmdW5jdGlvbih1cmwsIHByZWZlcnJlZFBhbmVs KQoreworICAgIHJldHVybiAhIXRoaXMucmVzb3VyY2VGb3JVUkwodXJsKSB8fCAKKyAgICAgICAo cHJlZmVycmVkUGFuZWwgPT0gInNjcmlwdHMiICYmIFdlYkluc3BlY3Rvci5wYW5lbHMuc2NyaXB0 cy5zY3JpcHRGb3JVUkwodXJsKSk7Cit9CisKIFdlYkluc3BlY3Rvci5zaG93UmVzb3VyY2VGb3JV UkwgPSBmdW5jdGlvbih1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKQogewogICAgIHZhciByZXNv dXJjZSA9IHRoaXMucmVzb3VyY2VGb3JVUkwodXJsKTsKLSAgICBpZiAoIXJlc291cmNlKQotICAg ICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFyZXNvdXJjZSkgeworICAgICAgICBpZiAocHJl ZmVycmVkUGFuZWwgPT0gInNjcmlwdHMiKQorICAgICAgICAgICAgcmVzb3VyY2UgPSBXZWJJbnNw ZWN0b3IucGFuZWxzLnNjcmlwdHMuc2NyaXB0Rm9yVVJMKHVybCk7CisgICAgICAgIGlmICghcmVz b3VyY2UpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCiAgICAgaWYgKHByZWZl cnJlZFBhbmVsICYmIHByZWZlcnJlZFBhbmVsIGluIFdlYkluc3BlY3Rvci5wYW5lbHMpIHsKICAg ICAgICAgdmFyIHBhbmVsID0gdGhpcy5wYW5lbHNbcHJlZmVycmVkUGFuZWxdOwo= 45012 2009-12-16 13:55:56 -0800 2009-12-17 06:28:38 -0800 proposed change, comments addressed fix-profile-source-links-patch text/plain 6843 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjBmYjM2OC4uNWVlYmE4NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAwOS0xMi0xNiAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkdmljZSBsaW5rcyB0byBzb3VyY2UgY29kZSBpbiBDUFUg cHJvZmlsZXIgdG8gb3BlbiBpbiBkZWJ1Z2dlciwKKyAgICAgICAgbm90IGluIHJlc291cmNlcyB0 YWIuCisKKyAgICAgICAgQWxzbyB3b3JrIGFyb3VuZCB0aGUgY2FzZSB3aGVuIHJlc291cmNlcyBh cmUgZGlzYWJsZWQsIGJ1dCBzY3JpcHRzIGFyZSBwcmVzZW50LgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjYxMAorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlRGF0 YUdyaWRUcmVlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlByb2ZpbGVEYXRhR3JpZE5vZGUu cHJvdG90eXBlLmNyZWF0ZUNlbGwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2VzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJv dG90eXBlLmNhblNob3dSZXNvdXJjZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVz b3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZUZvclVSTCk6CisgICAgICAgICogaW5z cGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZS5zY3JpcHRGb3JVUkwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuY2FuU2hvd1Jlc291cmNlRm9yVVJMKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnNob3dSZXNvdXJjZUZvclVS TCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd1Nj cmlwdE9yUmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGluayk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuX2Nob29zZVBhbmVsVG9TaG93UmVzb3VyY2VGb3JVUkwpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLmNhblNob3dSZXNvdXJjZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc2hvd1Jl c291cmNlRm9yVVJMKToKKwogMjAwOS0xMi0xNiAgQnJpYW4gV2VpbnN0ZWluICA8YndlaW5zdGVp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVEYXRhR3JpZFRyZWUu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwpp bmRleCA5YTdjNzQxLi5kYjE1NmJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwpAQCAtMTAyLDYgKzEwMiw3IEBAIFdlYkluc3Bl Y3Rvci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVybEVs ZW1lbnQuY2xhc3NOYW1lID0gInByb2ZpbGUtbm9kZS1maWxlIHdlYmtpdC1odG1sLXJlc291cmNl LWxpbmsiOwogICAgICAgICAgICAgdXJsRWxlbWVudC5ocmVmID0gdGhpcy5wcm9maWxlTm9kZS51 cmw7CiAgICAgICAgICAgICB1cmxFbGVtZW50LmxpbmVOdW1iZXIgPSB0aGlzLnByb2ZpbGVOb2Rl LmxpbmVOdW1iZXI7CisgICAgICAgICAgICB1cmxFbGVtZW50LnByZWZlcnJlZFBhbmVsID0gInNj cmlwdHMiOwogCiAgICAgICAgICAgICBpZiAodGhpcy5wcm9maWxlTm9kZS5saW5lTnVtYmVyID4g MCkKICAgICAgICAgICAgICAgICB1cmxFbGVtZW50LnRleHRDb250ZW50ID0gZmlsZU5hbWUgKyAi OiIgKyB0aGlzLnByb2ZpbGVOb2RlLmxpbmVOdW1iZXI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggNjBjMTg5NS4uODA3ZTRlNCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNDU2LDYg KzQ1NiwxNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAg ICAgICAgICAgbmV3Vmlldy5zaG93KG9sZFZpZXcuZWxlbWVudC5wYXJlbnROb2RlKTsKICAgICB9 LAogCisgICAgY2FuU2hvd1Jlc291cmNlRm9yVVJMOiBmdW5jdGlvbih1cmwpCisgICAgeworICAg ICAgICByZXR1cm4gISFXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodXJsKTsKKyAgICB9LAor CisgICAgc2hvd1Jlc291cmNlRm9yVVJMOiBmdW5jdGlvbih1cmwsIGxpbmUpCisgICAgeworICAg ICAgICB0aGlzLnNob3dSZXNvdXJjZShXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwodXJsKSk7 CisgICAgfSwKKwogICAgIHNob3dSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2UsIGxpbmUpCiAg ICAgewogICAgICAgICBpZiAoIXJlc291cmNlKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggN2Y5YjdlYS4uMWQ4ZTZhNSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC0zMTAsNiArMzEwLDExIEBAIFdl Ykluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhp cy5fc291cmNlSURNYXBbaWRdOwogICAgIH0sCiAKKyAgICBzY3JpcHRGb3JVUkw6IGZ1bmN0aW9u KHVybCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zY3JpcHRzRm9yVVJMc0luRmlsZXNT ZWxlY3RbdXJsXTsKKyAgICB9LAorCiAgICAgYWRkQnJlYWtwb2ludDogZnVuY3Rpb24oYnJlYWtw b2ludCkKICAgICB7CiAgICAgICAgIHRoaXMuc2lkZWJhclBhbmVzLmJyZWFrcG9pbnRzLmFkZEJy ZWFrcG9pbnQoYnJlYWtwb2ludCk7CkBAIC00OTcsOSArNTAyLDE5IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgeC5zaG93KHRoaXMudmlld3ND b250YWluZXJFbGVtZW50KTsKICAgICB9LAogCi0gICAgY2FuU2hvd1Jlc291cmNlOiBmdW5jdGlv bihyZXNvdXJjZSkKKyAgICBjYW5TaG93UmVzb3VyY2VGb3JVUkw6IGZ1bmN0aW9uKHVybCkKICAg ICB7Ci0gICAgICAgIHJldHVybiByZXNvdXJjZSAmJiByZXNvdXJjZS5zY3JpcHRzLmxlbmd0aCAm JiBJbnNwZWN0b3JCYWNrZW5kLmRlYnVnZ2VyRW5hYmxlZCgpOworICAgICAgICByZXR1cm4gSW5z cGVjdG9yQmFja2VuZC5kZWJ1Z2dlckVuYWJsZWQoKSAmJgorICAgICAgICAgICAgISEoV2ViSW5z cGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCkgfHwgdGhpcy5zY3JpcHRGb3JVUkwodXJsKSk7Cisg ICAgfSwKKworICAgIHNob3dSZXNvdXJjZUZvclVSTDogZnVuY3Rpb24odXJsLCBsaW5lKQorICAg IHsKKyAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVy bCk7CisgICAgICAgIGlmIChyZXNvdXJjZSkKKyAgICAgICAgICAgIHRoaXMuc2hvd1Jlc291cmNl KHJlc291cmNlLCBsaW5lKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5zaG93U2Ny aXB0KHRoaXMuc2NyaXB0Rm9yVVJMKHVybCksIGxpbmUpOwogICAgIH0sCiAKICAgICBzaG93U2Ny aXB0OiBmdW5jdGlvbihzY3JpcHQsIGxpbmUpCkBAIC02NTEsNyArNjY2LDcgQEAgV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIGNvbnNvbGUuYXNz ZXJ0KG9wdGlvbik7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgc2NyaXB0ID0g dGhpcy5fc2NyaXB0c0ZvclVSTHNJbkZpbGVzU2VsZWN0W3VybF07CisgICAgICAgICAgICB2YXIg c2NyaXB0ID0gdGhpcy5zY3JpcHRGb3JVUkwodXJsKTsKICAgICAgICAgICAgIGlmIChzY3JpcHQp CiAgICAgICAgICAgICAgICBvcHRpb24gPSBzY3JpcHQuZmlsZXNTZWxlY3RPcHRpb247CiAgICAg ICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3Iu anMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDJlZDFl NzcuLjI4NTZiZTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwpA QCAtNjAwLDcgKzYwMCw3IEBAIFdlYkluc3BlY3Rvci5kb2N1bWVudENsaWNrID0gZnVuY3Rpb24o ZXZlbnQpCiAgICAgZnVuY3Rpb24gZm9sbG93TGluaygpCiAgICAgewogICAgICAgICAvLyBGSVhN RTogc3VwcG9ydCB3ZWJraXQtaHRtbC1leHRlcm5hbC1saW5rIGxpbmtzIGhlcmUuCi0gICAgICAg IGlmIChhbmNob3IuaHJlZiBpbiBXZWJJbnNwZWN0b3IucmVzb3VyY2VVUkxNYXApIHsKKyAgICAg ICAgaWYgKFdlYkluc3BlY3Rvci5jYW5TaG93UmVzb3VyY2VGb3JVUkwoYW5jaG9yLmhyZWYsIGFu Y2hvci5wcmVmZXJyZWRQYW5lbCkpIHsKICAgICAgICAgICAgIGlmIChhbmNob3IuaGFzU3R5bGVD bGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7CiAgICAgICAgICAgICAgICAgYW5j aG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsiKTsKICAgICAg ICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0bWwtcmVzb3VyY2UtbGlu ayIpOwpAQCAtMTQwOSwyNCArMTQwOSwzMiBAQCBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwg PSBmdW5jdGlvbih1cmwpCiAgICAgcmV0dXJuIG51bGw7CiB9CiAKLVdlYkluc3BlY3Rvci5zaG93 UmVzb3VyY2VGb3JVUkwgPSBmdW5jdGlvbih1cmwsIGxpbmUsIHByZWZlcnJlZFBhbmVsKQorV2Vi SW5zcGVjdG9yLl9jaG9vc2VQYW5lbFRvU2hvd1Jlc291cmNlRm9yVVJMID0gZnVuY3Rpb24odXJs LCBwcmVmZXJyZWRQYW5lbCkKIHsKLSAgICB2YXIgcmVzb3VyY2UgPSB0aGlzLnJlc291cmNlRm9y VVJMKHVybCk7Ci0gICAgaWYgKCFyZXNvdXJjZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCisg ICAgdmFyIHBhbmVsID0gbnVsbDsKICAgICBpZiAocHJlZmVycmVkUGFuZWwgJiYgcHJlZmVycmVk UGFuZWwgaW4gV2ViSW5zcGVjdG9yLnBhbmVscykgewotICAgICAgICB2YXIgcGFuZWwgPSB0aGlz LnBhbmVsc1twcmVmZXJyZWRQYW5lbF07Ci0gICAgICAgIGlmICghKCJzaG93UmVzb3VyY2UiIGlu IHBhbmVsKSkKKyAgICAgICAgcGFuZWwgPSB0aGlzLnBhbmVsc1twcmVmZXJyZWRQYW5lbF07Cisg ICAgICAgIGlmICghKCJzaG93UmVzb3VyY2VGb3JVUkwiIGluIHBhbmVsKSkKICAgICAgICAgICAg IHBhbmVsID0gbnVsbDsKLSAgICAgICAgZWxzZSBpZiAoImNhblNob3dSZXNvdXJjZSIgaW4gcGFu ZWwgJiYgIXBhbmVsLmNhblNob3dSZXNvdXJjZShyZXNvdXJjZSkpCisgICAgICAgIGVsc2UgaWYg KCJjYW5TaG93UmVzb3VyY2VGb3JVUkwiIGluIHBhbmVsICYmICFwYW5lbC5jYW5TaG93UmVzb3Vy Y2VGb3JVUkwodXJsKSkKICAgICAgICAgICAgIHBhbmVsID0gbnVsbDsKICAgICB9CisgICAgaWYg KCFwYW5lbCAmJiBwcmVmZXJyZWRQYW5lbCAhPSAicmVzb3VyY2VzIikKKyAgICAgICAgcmV0dXJu IHRoaXMuX2Nob29zZVBhbmVsVG9TaG93UmVzb3VyY2VGb3JVUkwodXJsLCAicmVzb3VyY2VzIik7 CisgICAgcmV0dXJuIHBhbmVsOworfQogCi0gICAgdGhpcy5jdXJyZW50UGFuZWwgPSBwYW5lbCB8 fCB0aGlzLnBhbmVscy5yZXNvdXJjZXM7CitXZWJJbnNwZWN0b3IuY2FuU2hvd1Jlc291cmNlRm9y VVJMID0gZnVuY3Rpb24odXJsLCBwcmVmZXJyZWRQYW5lbCkKK3sKKyAgICByZXR1cm4gISF0aGlz Ll9jaG9vc2VQYW5lbFRvU2hvd1Jlc291cmNlRm9yVVJMKHVybCwgcHJlZmVycmVkUGFuZWwpOwor fQorCitXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMID0gZnVuY3Rpb24odXJsLCBsaW5l LCBwcmVmZXJyZWRQYW5lbCkKK3sKKyAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHRoaXMuX2Nob29z ZVBhbmVsVG9TaG93UmVzb3VyY2VGb3JVUkwodXJsLCBwcmVmZXJyZWRQYW5lbCk7CiAgICAgaWYg KCF0aGlzLmN1cnJlbnRQYW5lbCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHRoaXMuY3Vy cmVudFBhbmVsLnNob3dSZXNvdXJjZShyZXNvdXJjZSwgbGluZSk7CisgICAgdGhpcy5jdXJyZW50 UGFuZWwuc2hvd1Jlc291cmNlRm9yVVJMKHVybCwgbGluZSk7CiAgICAgcmV0dXJuIHRydWU7CiB9 CiAK 45060 2009-12-17 06:28:38 -0800 2009-12-17 07:21:00 -0800 Proposed fix, comments addressed fix-profile-source-links-patch text/plain 7889 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjQzZjRkMC4uYzM3NTllNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAwOS0xMi0xNyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkdmljZSBsaW5rcyB0byBzb3VyY2UgY29kZSBpbiBDUFUg cHJvZmlsZXIgdG8gb3BlbiBpbiBkZWJ1Z2dlciwKKyAgICAgICAgbm90IGluIHJlc291cmNlcyB0 YWIuCisKKyAgICAgICAgQWxzbyB3b3JrIGFyb3VuZCB0aGUgY2FzZSB3aGVuIHJlc291cmNlcyBh cmUgZGlzYWJsZWQsIGJ1dCBzY3JpcHRzIGFyZSBwcmVzZW50LgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjYxMAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90 b3R5cGUudXBkYXRlTWFpblZpZXdXaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwu cHJvdG90eXBlLmNhblNob3dTb3VyY2VMaW5lRm9yVVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5QYW5lbC5wcm90b3R5cGUuc2hvd1NvdXJjZUxpbmVGb3JVUkwpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVDZWxsKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5jYW5TaG93U291cmNlTGluZUZvclVSTCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dTb3Vy Y2VMaW5lRm9yVVJMKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnNjcmlw dEZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5j YW5TaG93U291cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5zaG93U291cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd1NjcmlwdE9yUmVzb3VyY2UpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGluayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9j dW1lbnRDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2Nob29zZVBhbmVsVG9TaG93U291 cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY2FuU2hvd1NvdXJjZUxpbmVG b3JVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VMaW5lRm9yVVJMKToKKwog MjAwOS0xMi0xNSBNT1JJVEEgSGFqaW1lIDxtb3JyaXRhQGdtYWlsLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9QYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpp bmRleCA5NWNlNmI0Li41MWI5ODdiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpz CkBAIC0zNjMsNiArMzYzLDE2IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgdXBkYXRlTWFpblZpZXdXaWR0aDogZnVuY3Rpb24od2lkdGgpCiAgICAgewogICAgICAgICAv LyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgYW5jZXN0b3JzLgorICAgIH0sCisKKyAgICBjYW5T aG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJsKQorICAgIHsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0sCisKKyAgICBzaG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJs LCBsaW5lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVEYXRhR3JpZFRyZWUuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwppbmRl eCA5YTdjNzQxLi5kYjE1NmJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwpAQCAtMTAyLDYgKzEwMiw3IEBAIFdlYkluc3BlY3Rv ci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVybEVsZW1l bnQuY2xhc3NOYW1lID0gInByb2ZpbGUtbm9kZS1maWxlIHdlYmtpdC1odG1sLXJlc291cmNlLWxp bmsiOwogICAgICAgICAgICAgdXJsRWxlbWVudC5ocmVmID0gdGhpcy5wcm9maWxlTm9kZS51cmw7 CiAgICAgICAgICAgICB1cmxFbGVtZW50LmxpbmVOdW1iZXIgPSB0aGlzLnByb2ZpbGVOb2RlLmxp bmVOdW1iZXI7CisgICAgICAgICAgICB1cmxFbGVtZW50LnByZWZlcnJlZFBhbmVsID0gInNjcmlw dHMiOwogCiAgICAgICAgICAgICBpZiAodGhpcy5wcm9maWxlTm9kZS5saW5lTnVtYmVyID4gMCkK ICAgICAgICAgICAgICAgICB1cmxFbGVtZW50LnRleHRDb250ZW50ID0gZmlsZU5hbWUgKyAiOiIg KyB0aGlzLnByb2ZpbGVOb2RlLmxpbmVOdW1iZXI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggNjBjMTg5NS4uZWQwZDc4ZCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNDU2LDYgKzQ1 NiwxNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICAgICAgbmV3Vmlldy5zaG93KG9sZFZpZXcuZWxlbWVudC5wYXJlbnROb2RlKTsKICAgICB9LAog CisgICAgY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAg ICAgIHJldHVybiAhIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgIH0sCisK KyAgICBzaG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJsLCBsaW5lKQorICAgIHsKKyAg ICAgICAgdGhpcy5zaG93UmVzb3VyY2UoV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCkp OworICAgIH0sCisKICAgICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlLCBsaW5lKQog ICAgIHsKICAgICAgICAgaWYgKCFyZXNvdXJjZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDdmOWI3ZWEuLmIzNjUzNmIgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMzEwLDYgKzMxMCwxMSBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRo aXMuX3NvdXJjZUlETWFwW2lkXTsKICAgICB9LAogCisgICAgc2NyaXB0Rm9yVVJMOiBmdW5jdGlv bih1cmwpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc2NyaXB0c0ZvclVSTHNJbkZpbGVz U2VsZWN0W3VybF07CisgICAgfSwKKwogICAgIGFkZEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGJyZWFr cG9pbnQpCiAgICAgewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5icmVha3BvaW50cy5hZGRC cmVha3BvaW50KGJyZWFrcG9pbnQpOwpAQCAtNDk3LDkgKzUwMiwxOSBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHguc2hvdyh0aGlzLnZpZXdz Q29udGFpbmVyRWxlbWVudCk7CiAgICAgfSwKIAotICAgIGNhblNob3dSZXNvdXJjZTogZnVuY3Rp b24ocmVzb3VyY2UpCisgICAgY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkw6IGZ1bmN0aW9uKHVybCkK ICAgICB7Ci0gICAgICAgIHJldHVybiByZXNvdXJjZSAmJiByZXNvdXJjZS5zY3JpcHRzLmxlbmd0 aCAmJiBJbnNwZWN0b3JCYWNrZW5kLmRlYnVnZ2VyRW5hYmxlZCgpOworICAgICAgICByZXR1cm4g SW5zcGVjdG9yQmFja2VuZC5kZWJ1Z2dlckVuYWJsZWQoKSAmJgorICAgICAgICAgICAgISEoV2Vi SW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCkgfHwgdGhpcy5zY3JpcHRGb3JVUkwodXJsKSk7 CisgICAgfSwKKworICAgIHNob3dTb3VyY2VMaW5lRm9yVVJMOiBmdW5jdGlvbih1cmwsIGxpbmUp CisgICAgeworICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JV UkwodXJsKTsKKyAgICAgICAgaWYgKHJlc291cmNlKQorICAgICAgICAgICAgdGhpcy5zaG93UmVz b3VyY2UocmVzb3VyY2UsIGxpbmUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0aGlzLnNo b3dTY3JpcHQodGhpcy5zY3JpcHRGb3JVUkwodXJsKSwgbGluZSk7CiAgICAgfSwKIAogICAgIHNo b3dTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCwgbGluZSkKQEAgLTY1MSw3ICs2NjYsNyBAQCBXZWJJ bnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgY29uc29s ZS5hc3NlcnQob3B0aW9uKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZhciBzY3Jp cHQgPSB0aGlzLl9zY3JpcHRzRm9yVVJMc0luRmlsZXNTZWxlY3RbdXJsXTsKKyAgICAgICAgICAg IHZhciBzY3JpcHQgPSB0aGlzLnNjcmlwdEZvclVSTCh1cmwpOwogICAgICAgICAgICAgaWYgKHNj cmlwdCkKICAgICAgICAgICAgICAgIG9wdGlvbiA9IHNjcmlwdC5maWxlc1NlbGVjdE9wdGlvbjsK ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg MmVkMWU3Ny4uMmMwNGVkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCkBAIC02MDAsMTMgKzYwMCwxMyBAQCBXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGljayA9IGZ1 bmN0aW9uKGV2ZW50KQogICAgIGZ1bmN0aW9uIGZvbGxvd0xpbmsoKQogICAgIHsKICAgICAgICAg Ly8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayBsaW5rcyBoZXJlLgot ICAgICAgICBpZiAoYW5jaG9yLmhyZWYgaW4gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMTWFwKSB7 CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkwoYW5jaG9y LmhyZWYsIGFuY2hvci5wcmVmZXJyZWRQYW5lbCkpIHsKICAgICAgICAgICAgIGlmIChhbmNob3Iu aGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7CiAgICAgICAgICAg ICAgICAgYW5jaG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsi KTsKICAgICAgICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0bWwtcmVz b3VyY2UtbGluayIpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBXZWJJbnNwZWN0b3Iu c2hvd1Jlc291cmNlRm9yVVJMKGFuY2hvci5ocmVmLCBhbmNob3IubGluZU51bWJlciwgYW5jaG9y LnByZWZlcnJlZFBhbmVsKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlTGlu ZUZvclVSTChhbmNob3IuaHJlZiwgYW5jaG9yLmxpbmVOdW1iZXIsIGFuY2hvci5wcmVmZXJyZWRQ YW5lbCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB2YXIgcHJvZmlsZVN0cmluZyA9 IFdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5VUkxSZWdFeHAuZXhlYyhhbmNob3IuaHJlZik7CiAg ICAgICAgICAgICBpZiAocHJvZmlsZVN0cmluZykKQEAgLTE0MDksMjQgKzE0MDksMjcgQEAgV2Vi SW5zcGVjdG9yLnJlc291cmNlRm9yVVJMID0gZnVuY3Rpb24odXJsKQogICAgIHJldHVybiBudWxs OwogfQogCi1XZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMID0gZnVuY3Rpb24odXJsLCBs aW5lLCBwcmVmZXJyZWRQYW5lbCkKK1dlYkluc3BlY3Rvci5fY2hvb3NlUGFuZWxUb1Nob3dTb3Vy Y2VMaW5lRm9yVVJMID0gZnVuY3Rpb24odXJsLCBwcmVmZXJyZWRQYW5lbCkKIHsKLSAgICB2YXIg cmVzb3VyY2UgPSB0aGlzLnJlc291cmNlRm9yVVJMKHVybCk7Ci0gICAgaWYgKCFyZXNvdXJjZSkK LSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHByZWZlcnJlZFBhbmVsID0gcHJlZmVycmVkUGFu ZWwgfHwgInJlc291cmNlcyI7CisgICAgdmFyIHBhbmVsID0gdGhpcy5wYW5lbHNbcHJlZmVycmVk UGFuZWxdOworICAgIGlmIChwYW5lbCAmJiBwYW5lbC5jYW5TaG93U291cmNlTGluZUZvclVSTCh1 cmwpKQorICAgICAgICByZXR1cm4gcGFuZWw7CisgICAgcGFuZWwgPSB0aGlzLnBhbmVscy5yZXNv dXJjZXM7CisgICAgcmV0dXJuIHBhbmVsLmNhblNob3dTb3VyY2VMaW5lRm9yVVJMKHVybCkgPyBw YW5lbCA6IG51bGw7Cit9CiAKLSAgICBpZiAocHJlZmVycmVkUGFuZWwgJiYgcHJlZmVycmVkUGFu ZWwgaW4gV2ViSW5zcGVjdG9yLnBhbmVscykgewotICAgICAgICB2YXIgcGFuZWwgPSB0aGlzLnBh bmVsc1twcmVmZXJyZWRQYW5lbF07Ci0gICAgICAgIGlmICghKCJzaG93UmVzb3VyY2UiIGluIHBh bmVsKSkKLSAgICAgICAgICAgIHBhbmVsID0gbnVsbDsKLSAgICAgICAgZWxzZSBpZiAoImNhblNo b3dSZXNvdXJjZSIgaW4gcGFuZWwgJiYgIXBhbmVsLmNhblNob3dSZXNvdXJjZShyZXNvdXJjZSkp Ci0gICAgICAgICAgICBwYW5lbCA9IG51bGw7Ci0gICAgfQorV2ViSW5zcGVjdG9yLmNhblNob3dT b3VyY2VMaW5lRm9yVVJMID0gZnVuY3Rpb24odXJsLCBwcmVmZXJyZWRQYW5lbCkKK3sKKyAgICBy ZXR1cm4gISF0aGlzLl9jaG9vc2VQYW5lbFRvU2hvd1NvdXJjZUxpbmVGb3JVUkwodXJsLCBwcmVm ZXJyZWRQYW5lbCk7Cit9CiAKLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHBhbmVsIHx8IHRoaXMu cGFuZWxzLnJlc291cmNlczsKK1dlYkluc3BlY3Rvci5zaG93U291cmNlTGluZUZvclVSTCA9IGZ1 bmN0aW9uKHVybCwgbGluZSwgcHJlZmVycmVkUGFuZWwpCit7CisgICAgdGhpcy5jdXJyZW50UGFu ZWwgPSB0aGlzLl9jaG9vc2VQYW5lbFRvU2hvd1NvdXJjZUxpbmVGb3JVUkwodXJsLCBwcmVmZXJy ZWRQYW5lbCk7CiAgICAgaWYgKCF0aGlzLmN1cnJlbnRQYW5lbCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgIHRoaXMuY3VycmVudFBhbmVsLnNob3dSZXNvdXJjZShyZXNvdXJjZSwgbGluZSk7 CisgICAgdGhpcy5jdXJyZW50UGFuZWwuc2hvd1NvdXJjZUxpbmVGb3JVUkwodXJsLCBsaW5lKTsK ICAgICByZXR1cm4gdHJ1ZTsKIH0KIAo= 45064 2009-12-17 07:21:00 -0800 2009-12-17 07:34:41 -0800 fixed 'line' argument loss for resources panel fix-profile-source-links-patch text/plain 7895 mnaganov ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjQzZjRkMC4uYzM3NTllNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAwOS0xMi0xNyAgTWlraGFpbCBOYWdh bm92ICA8bW5hZ2Fub3ZAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkdmljZSBsaW5rcyB0byBzb3VyY2UgY29kZSBpbiBDUFUg cHJvZmlsZXIgdG8gb3BlbiBpbiBkZWJ1Z2dlciwKKyAgICAgICAgbm90IGluIHJlc291cmNlcyB0 YWIuCisKKyAgICAgICAgQWxzbyB3b3JrIGFyb3VuZCB0aGUgY2FzZSB3aGVuIHJlc291cmNlcyBh cmUgZGlzYWJsZWQsIGJ1dCBzY3JpcHRzIGFyZSBwcmVzZW50LgorCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjYxMAorCisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90 b3R5cGUudXBkYXRlTWFpblZpZXdXaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFuZWwu cHJvdG90eXBlLmNhblNob3dTb3VyY2VMaW5lRm9yVVJMKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5QYW5lbC5wcm90b3R5cGUuc2hvd1NvdXJjZUxpbmVGb3JVUkwpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZS5jcmVhdGVDZWxsKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlJlc291cmNlc1BhbmVsLnByb3RvdHlwZS5jYW5TaG93U291cmNlTGluZUZvclVSTCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnNob3dTb3Vy Y2VMaW5lRm9yVVJMKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLnNjcmlw dEZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5j YW5TaG93U291cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1Bh bmVsLnByb3RvdHlwZS5zaG93U291cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5fc2hvd1NjcmlwdE9yUmVzb3VyY2UpOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLmRvY3VtZW50Q2xpY2suZm9sbG93TGluayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuZG9j dW1lbnRDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2Nob29zZVBhbmVsVG9TaG93U291 cmNlTGluZUZvclVSTCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuY2FuU2hvd1NvdXJjZUxpbmVG b3JVUkwpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VMaW5lRm9yVVJMKToKKwog MjAwOS0xMi0xNSBNT1JJVEEgSGFqaW1lIDxtb3JyaXRhQGdtYWlsLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9QYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpp bmRleCA5NWNlNmI0Li41MWI5ODdiIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpz CkBAIC0zNjMsNiArMzYzLDE2IEBAIFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgdXBkYXRlTWFpblZpZXdXaWR0aDogZnVuY3Rpb24od2lkdGgpCiAgICAgewogICAgICAgICAv LyBTaG91bGQgYmUgaW1wbGVtZW50ZWQgYnkgYW5jZXN0b3JzLgorICAgIH0sCisKKyAgICBjYW5T aG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJsKQorICAgIHsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIH0sCisKKyAgICBzaG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJs LCBsaW5lKQorICAgIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIH0KIApkaWZmIC0t Z2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVEYXRhR3JpZFRyZWUuanMg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwppbmRl eCA5YTdjNzQxLi5kYjE1NmJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUHJvZmlsZURhdGFHcmlkVHJlZS5qcwpAQCAtMTAyLDYgKzEwMiw3IEBAIFdlYkluc3BlY3Rv ci5Qcm9maWxlRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHVybEVsZW1l bnQuY2xhc3NOYW1lID0gInByb2ZpbGUtbm9kZS1maWxlIHdlYmtpdC1odG1sLXJlc291cmNlLWxp bmsiOwogICAgICAgICAgICAgdXJsRWxlbWVudC5ocmVmID0gdGhpcy5wcm9maWxlTm9kZS51cmw7 CiAgICAgICAgICAgICB1cmxFbGVtZW50LmxpbmVOdW1iZXIgPSB0aGlzLnByb2ZpbGVOb2RlLmxp bmVOdW1iZXI7CisgICAgICAgICAgICB1cmxFbGVtZW50LnByZWZlcnJlZFBhbmVsID0gInNjcmlw dHMiOwogCiAgICAgICAgICAgICBpZiAodGhpcy5wcm9maWxlTm9kZS5saW5lTnVtYmVyID4gMCkK ICAgICAgICAgICAgICAgICB1cmxFbGVtZW50LnRleHRDb250ZW50ID0gZmlsZU5hbWUgKyAiOiIg KyB0aGlzLnByb2ZpbGVOb2RlLmxpbmVOdW1iZXI7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggNjBjMTg5NS4uZWQwZDc4ZCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtNDU2LDYgKzQ1 NiwxNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICAgICAgbmV3Vmlldy5zaG93KG9sZFZpZXcuZWxlbWVudC5wYXJlbnROb2RlKTsKICAgICB9LAog CisgICAgY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkw6IGZ1bmN0aW9uKHVybCkKKyAgICB7CisgICAg ICAgIHJldHVybiAhIVdlYkluc3BlY3Rvci5yZXNvdXJjZUZvclVSTCh1cmwpOworICAgIH0sCisK KyAgICBzaG93U291cmNlTGluZUZvclVSTDogZnVuY3Rpb24odXJsLCBsaW5lKQorICAgIHsKKyAg ICAgICAgdGhpcy5zaG93UmVzb3VyY2UoV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCks IGxpbmUpOworICAgIH0sCisKICAgICBzaG93UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNlLCBs aW5lKQogICAgIHsKICAgICAgICAgaWYgKCFyZXNvdXJjZSkKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDdmOWI3ZWEuLmIzNjUzNmIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMzEwLDYgKzMxMCwx MSBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0 dXJuIHRoaXMuX3NvdXJjZUlETWFwW2lkXTsKICAgICB9LAogCisgICAgc2NyaXB0Rm9yVVJMOiBm dW5jdGlvbih1cmwpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc2NyaXB0c0ZvclVSTHNJ bkZpbGVzU2VsZWN0W3VybF07CisgICAgfSwKKwogICAgIGFkZEJyZWFrcG9pbnQ6IGZ1bmN0aW9u KGJyZWFrcG9pbnQpCiAgICAgewogICAgICAgICB0aGlzLnNpZGViYXJQYW5lcy5icmVha3BvaW50 cy5hZGRCcmVha3BvaW50KGJyZWFrcG9pbnQpOwpAQCAtNDk3LDkgKzUwMiwxOSBAQCBXZWJJbnNw ZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHguc2hvdyh0aGlz LnZpZXdzQ29udGFpbmVyRWxlbWVudCk7CiAgICAgfSwKIAotICAgIGNhblNob3dSZXNvdXJjZTog ZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkw6IGZ1bmN0aW9u KHVybCkKICAgICB7Ci0gICAgICAgIHJldHVybiByZXNvdXJjZSAmJiByZXNvdXJjZS5zY3JpcHRz Lmxlbmd0aCAmJiBJbnNwZWN0b3JCYWNrZW5kLmRlYnVnZ2VyRW5hYmxlZCgpOworICAgICAgICBy ZXR1cm4gSW5zcGVjdG9yQmFja2VuZC5kZWJ1Z2dlckVuYWJsZWQoKSAmJgorICAgICAgICAgICAg ISEoV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHVybCkgfHwgdGhpcy5zY3JpcHRGb3JVUkwo dXJsKSk7CisgICAgfSwKKworICAgIHNob3dTb3VyY2VMaW5lRm9yVVJMOiBmdW5jdGlvbih1cmws IGxpbmUpCisgICAgeworICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VGb3JVUkwodXJsKTsKKyAgICAgICAgaWYgKHJlc291cmNlKQorICAgICAgICAgICAgdGhpcy5z aG93UmVzb3VyY2UocmVzb3VyY2UsIGxpbmUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0 aGlzLnNob3dTY3JpcHQodGhpcy5zY3JpcHRGb3JVUkwodXJsKSwgbGluZSk7CiAgICAgfSwKIAog ICAgIHNob3dTY3JpcHQ6IGZ1bmN0aW9uKHNjcmlwdCwgbGluZSkKQEAgLTY1MSw3ICs2NjYsNyBA QCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAg Y29uc29sZS5hc3NlcnQob3B0aW9uKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZh ciBzY3JpcHQgPSB0aGlzLl9zY3JpcHRzRm9yVVJMc0luRmlsZXNTZWxlY3RbdXJsXTsKKyAgICAg ICAgICAgIHZhciBzY3JpcHQgPSB0aGlzLnNjcmlwdEZvclVSTCh1cmwpOwogICAgICAgICAgICAg aWYgKHNjcmlwdCkKICAgICAgICAgICAgICAgIG9wdGlvbiA9IHNjcmlwdC5maWxlc1NlbGVjdE9w dGlvbjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMK aW5kZXggMmVkMWU3Ny4uMmMwNGVkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5z cGVjdG9yLmpzCkBAIC02MDAsMTMgKzYwMCwxMyBAQCBXZWJJbnNwZWN0b3IuZG9jdW1lbnRDbGlj ayA9IGZ1bmN0aW9uKGV2ZW50KQogICAgIGZ1bmN0aW9uIGZvbGxvd0xpbmsoKQogICAgIHsKICAg ICAgICAgLy8gRklYTUU6IHN1cHBvcnQgd2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayBsaW5rcyBo ZXJlLgotICAgICAgICBpZiAoYW5jaG9yLmhyZWYgaW4gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJM TWFwKSB7CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IuY2FuU2hvd1NvdXJjZUxpbmVGb3JVUkwo YW5jaG9yLmhyZWYsIGFuY2hvci5wcmVmZXJyZWRQYW5lbCkpIHsKICAgICAgICAgICAgIGlmIChh bmNob3IuaGFzU3R5bGVDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpKSB7CiAgICAg ICAgICAgICAgICAgYW5jaG9yLnJlbW92ZVN0eWxlQ2xhc3MoIndlYmtpdC1odG1sLWV4dGVybmFs LWxpbmsiKTsKICAgICAgICAgICAgICAgICBhbmNob3IuYWRkU3R5bGVDbGFzcygid2Via2l0LWh0 bWwtcmVzb3VyY2UtbGluayIpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMKGFuY2hvci5ocmVmLCBhbmNob3IubGluZU51bWJlciwg YW5jaG9yLnByZWZlcnJlZFBhbmVsKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291 cmNlTGluZUZvclVSTChhbmNob3IuaHJlZiwgYW5jaG9yLmxpbmVOdW1iZXIsIGFuY2hvci5wcmVm ZXJyZWRQYW5lbCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB2YXIgcHJvZmlsZVN0 cmluZyA9IFdlYkluc3BlY3Rvci5Qcm9maWxlVHlwZS5VUkxSZWdFeHAuZXhlYyhhbmNob3IuaHJl Zik7CiAgICAgICAgICAgICBpZiAocHJvZmlsZVN0cmluZykKQEAgLTE0MDksMjQgKzE0MDksMjcg QEAgV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMID0gZnVuY3Rpb24odXJsKQogICAgIHJldHVy biBudWxsOwogfQogCi1XZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlRm9yVVJMID0gZnVuY3Rpb24o dXJsLCBsaW5lLCBwcmVmZXJyZWRQYW5lbCkKK1dlYkluc3BlY3Rvci5fY2hvb3NlUGFuZWxUb1No b3dTb3VyY2VMaW5lRm9yVVJMID0gZnVuY3Rpb24odXJsLCBwcmVmZXJyZWRQYW5lbCkKIHsKLSAg ICB2YXIgcmVzb3VyY2UgPSB0aGlzLnJlc291cmNlRm9yVVJMKHVybCk7Ci0gICAgaWYgKCFyZXNv dXJjZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHByZWZlcnJlZFBhbmVsID0gcHJlZmVy cmVkUGFuZWwgfHwgInJlc291cmNlcyI7CisgICAgdmFyIHBhbmVsID0gdGhpcy5wYW5lbHNbcHJl ZmVycmVkUGFuZWxdOworICAgIGlmIChwYW5lbCAmJiBwYW5lbC5jYW5TaG93U291cmNlTGluZUZv clVSTCh1cmwpKQorICAgICAgICByZXR1cm4gcGFuZWw7CisgICAgcGFuZWwgPSB0aGlzLnBhbmVs cy5yZXNvdXJjZXM7CisgICAgcmV0dXJuIHBhbmVsLmNhblNob3dTb3VyY2VMaW5lRm9yVVJMKHVy bCkgPyBwYW5lbCA6IG51bGw7Cit9CiAKLSAgICBpZiAocHJlZmVycmVkUGFuZWwgJiYgcHJlZmVy cmVkUGFuZWwgaW4gV2ViSW5zcGVjdG9yLnBhbmVscykgewotICAgICAgICB2YXIgcGFuZWwgPSB0 aGlzLnBhbmVsc1twcmVmZXJyZWRQYW5lbF07Ci0gICAgICAgIGlmICghKCJzaG93UmVzb3VyY2Ui IGluIHBhbmVsKSkKLSAgICAgICAgICAgIHBhbmVsID0gbnVsbDsKLSAgICAgICAgZWxzZSBpZiAo ImNhblNob3dSZXNvdXJjZSIgaW4gcGFuZWwgJiYgIXBhbmVsLmNhblNob3dSZXNvdXJjZShyZXNv dXJjZSkpCi0gICAgICAgICAgICBwYW5lbCA9IG51bGw7Ci0gICAgfQorV2ViSW5zcGVjdG9yLmNh blNob3dTb3VyY2VMaW5lRm9yVVJMID0gZnVuY3Rpb24odXJsLCBwcmVmZXJyZWRQYW5lbCkKK3sK KyAgICByZXR1cm4gISF0aGlzLl9jaG9vc2VQYW5lbFRvU2hvd1NvdXJjZUxpbmVGb3JVUkwodXJs LCBwcmVmZXJyZWRQYW5lbCk7Cit9CiAKLSAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IHBhbmVsIHx8 IHRoaXMucGFuZWxzLnJlc291cmNlczsKK1dlYkluc3BlY3Rvci5zaG93U291cmNlTGluZUZvclVS TCA9IGZ1bmN0aW9uKHVybCwgbGluZSwgcHJlZmVycmVkUGFuZWwpCit7CisgICAgdGhpcy5jdXJy ZW50UGFuZWwgPSB0aGlzLl9jaG9vc2VQYW5lbFRvU2hvd1NvdXJjZUxpbmVGb3JVUkwodXJsLCBw cmVmZXJyZWRQYW5lbCk7CiAgICAgaWYgKCF0aGlzLmN1cnJlbnRQYW5lbCkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwotICAgIHRoaXMuY3VycmVudFBhbmVsLnNob3dSZXNvdXJjZShyZXNvdXJjZSwg bGluZSk7CisgICAgdGhpcy5jdXJyZW50UGFuZWwuc2hvd1NvdXJjZUxpbmVGb3JVUkwodXJsLCBs aW5lKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAo=