61035 2011-05-18 03:50:44 -0700 Web Inspector: hide script location to ui location conversion details from ScriptsPanel 2011-06-08 06:48:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 405623 0 podivilov 2011-05-18 03:50:44 -0700 Web Inspector: add ScriptLocation and UILocation classes and hide conversions in model. 405624 1 93896 podivilov 2011-05-18 03:51:42 -0700 Created attachment 93896 Patch. 405642 2 93896 pfeldman 2011-05-18 04:35:26 -0700 Comment on attachment 93896 Patch. View in context: https://bugs.webkit.org/attachment.cgi?id=93896&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:615 > +WebInspector.ScriptLocation = function(url, sourceID, lineNumber, columnNumber) These should be defined near WebInspector.SourceMapping and should actually be used there. 405645 3 podivilov 2011-05-18 04:51:41 -0700 (In reply to comment #2) > (From update of attachment 93896 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93896&action=review > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:615 > > +WebInspector.ScriptLocation = function(url, sourceID, lineNumber, columnNumber) > > These should be defined near WebInspector.SourceMapping and should actually be used there. ScriptLocation has nothing to do with WebInspector.SourceMapping. SourceMapping always defines a mapping for a single script. ScriptLocation -> UILocation conversion is a part of DebuggerPresentationModel, so it should be defined there. 405649 4 pfeldman 2011-05-18 05:01:26 -0700 > ScriptLocation has nothing to do with WebInspector.SourceMapping. SourceMapping always defines a mapping for a single script. ScriptLocation -> UILocation conversion is a part of DebuggerPresentationModel, so it should be defined there. Hm... I thought that the "mapping" concept of the presentation model was extracted from it as a SourceMapping. At least all conversions from script location to ui location and back are declared on SourceMapping. 405652 5 podivilov 2011-05-18 05:04:27 -0700 (In reply to comment #4) > > ScriptLocation has nothing to do with WebInspector.SourceMapping. SourceMapping always defines a mapping for a single script. ScriptLocation -> UILocation conversion is a part of DebuggerPresentationModel, so it should be defined there. > > Hm... I thought that the "mapping" concept of the presentation model was extracted from it as a SourceMapping. At least all conversions from script location to ui location and back are declared on SourceMapping. SourceMapping is an dpm utility class aimed at converting locations for a single script. We still need a way to convert sourceURL,line,column to sourceFileId,line, which is different. 405656 6 pfeldman 2011-05-18 05:07:29 -0700 > SourceMapping is an dpm utility class aimed at converting locations for a single script. We still need a way to convert sourceURL,line,column to sourceFileId,line, which is different. It does not make sense to me. I think we only have ScriptLocation and UILocation and conversion between them. 405661 7 93900 podivilov 2011-05-18 05:24:33 -0700 Created attachment 93900 Comments addressed. No new abstractions this time. Probably we'll add them later when there will be a more clear need. 405665 8 93902 podivilov 2011-05-18 06:10:09 -0700 Created attachment 93902 Rebase. 405673 9 93902 pfeldman 2011-05-18 06:32:25 -0700 Comment on attachment 93902 Rebase. View in context: https://bugs.webkit.org/attachment.cgi?id=93902&action=review > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:83 > + scriptLocationToUILocation: function(sourceURL, sourceID, lineNumber, columnNumber, callback) sourceId > Source/WebCore/inspector/front-end/ScriptsPanel.js:526 > + this._showSourceLine(sourceFileId, lineNumber); We should not highlight line in case it was not specified in anchor. 405680 10 93906 podivilov 2011-05-18 06:48:28 -0700 Created attachment 93906 Patch. 405681 11 podivilov 2011-05-18 06:48:59 -0700 (In reply to comment #9) > (From update of attachment 93902 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=93902&action=review > > > Source/WebCore/inspector/front-end/DebuggerPresentationModel.js:83 > > + scriptLocationToUILocation: function(sourceURL, sourceID, lineNumber, columnNumber, callback) > > sourceId Done. > > > Source/WebCore/inspector/front-end/ScriptsPanel.js:526 > > + this._showSourceLine(sourceFileId, lineNumber); > > We should not highlight line in case it was not specified in anchor. This code is executed only when line is specified in anchor. 417211 12 podivilov 2011-06-08 06:48:30 -0700 Committed r88344: <http://trac.webkit.org/changeset/88344> 93896 2011-05-18 03:51:42 -0700 2011-05-18 05:24:33 -0700 Patch. patch text/plain 4107 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZWY1MDJkLi5mMzFiYjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTEtMDUtMTggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogYWRkIFNjcmlwdExvY2F0aW9uIGFuZCBVSUxvY2F0aW9uIGNsYXNzZXMgYW5kIGhp ZGUgY29udmVyc2lvbnMgaW4gbW9kZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02MTAzNQorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVn Z2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlLnNvdXJjZUZpbGVGb3JTY3JpcHRVUkwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBl LnNjcmlwdExvY2F0aW9uVG9VSUxvY2F0aW9uLmRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5z Y3JpcHRMb2NhdGlvblRvVUlMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0 TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlVJTG9jYXRpb24pOgorICAgICAgICAq IGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uKToKKwogMjAxMS0w NS0xNyAgWXV0YSBLaXRhbXVyYSAgPHl1dGFrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBLZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBl ODEwZmM1Li45NjVkOWI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC03Nyw3 ICs3NywyMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5 cGUgPSB7CiAKICAgICBzb3VyY2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5jdGlvbihzY3JpcHRVUkwp CiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRmlsZXNbc2NyaXB0VVJMXTsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3RoaXMuX2NyZWF0ZVNvdXJjZUZpbGVJZChz Y3JpcHRVUkwpXTsKKyAgICB9LAorCisgICAgc2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1 bmN0aW9uKHNjcmlwdExvY2F0aW9uLCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIHZhciBzb3Vy Y2VGaWxlID0gdGhpcy5fc291cmNlRmlsZUZvclNjcmlwdChzY3JpcHRMb2NhdGlvbi51cmwsIHNj cmlwdExvY2F0aW9uLnNvdXJjZUlEKTsKKworICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291 cmNlTWFwcGluZyhtYXBwaW5nKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgbGluZU51bWJl ciA9IG1hcHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxpbmUoc2NyaXB0TG9jYXRpb24pOwor ICAgICAgICAgICAgdmFyIHVpTG9jYXRpb24gPSBuZXcgV2ViSW5zcGVjdG9yLlVJTG9jYXRpb24o c291cmNlRmlsZS5pZCwgbGluZU51bWJlcik7CisgICAgICAgICAgICBjYWxsYmFjayh1aUxvY2F0 aW9uKTsKKyAgICAgICAgfQorICAgICAgICBzb3VyY2VGaWxlLnJlcXVlc3RTb3VyY2VNYXBwaW5n KGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nKTsKICAgICB9LAogCiAgICAgcmVxdWVzdFNvdXJjZUZp bGVDb250ZW50OiBmdW5jdGlvbihzb3VyY2VGaWxlSWQsIGNhbGxiYWNrKQpAQCAtNTk5LDYgKzYx MiwyMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAKIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5f X3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsKIAorV2ViSW5zcGVjdG9y LlNjcmlwdExvY2F0aW9uID0gZnVuY3Rpb24odXJsLCBzb3VyY2VJRCwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKQoreworICAgIHRoaXMudXJsID0gdXJsOworICAgIHRoaXMuc291cmNlSUQgPSBz b3VyY2VJRDsKKyAgICB0aGlzLmxpbmVOdW1iZXIgPSBsaW5lTnVtYmVyOworICAgIHRoaXMuY29s dW1uTnVtYmVyID0gY29sdW1uTnVtYmVyOworfQorCitXZWJJbnNwZWN0b3IuVUlMb2NhdGlvbiA9 IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgbGluZU51bWJlcikKK3sKKyAgICB0aGlzLnNvdXJjZUZp bGVJZCA9IHNvdXJjZUZpbGVJZDsKKyAgICB0aGlzLmxpbmVOdW1iZXIgPSBsaW5lTnVtYmVyOwor fQorCiBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9uQnJlYWtwb2ludCA9IGZ1bmN0aW9uKHNvdXJj ZUZpbGUsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKIHsKICAgICB0aGlzLnNvdXJj ZUZpbGUgPSBzb3VyY2VGaWxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdHNQYW5lbC5qcwppbmRleCAyOTNkZTAyLi5lYTBiMjU5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAt NTE2LDEzICs1MTYsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUgPSB7 CiAKICAgICBzaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7Ci0gICAg ICAgIGZ1bmN0aW9uIGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nKG1hcHBpbmcpCisgICAgICAgIGZ1 bmN0aW9uIGRpZEdldFVJTG9jYXRpb24odWlMb2NhdGlvbikKICAgICAgICAgewotICAgICAgICAg ICAgdmFyIGxpbmVOdW1iZXIgPSBtYXBwaW5nLnNjcmlwdExvY2F0aW9uVG9Tb3VyY2VMaW5lKHts aW5lTnVtYmVyOmFuY2hvci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikgLSAxLCBjb2x1bW5O dW1iZXI6MH0pOwotICAgICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUxpbmUoc291cmNlRmlsZS5p ZCwgbGluZU51bWJlcik7CisgICAgICAgICAgICB0aGlzLl9zaG93U291cmNlTGluZSh1aUxvY2F0 aW9uLnNvdXJjZUZpbGVJZCwgdWlMb2NhdGlvbi5saW5lTnVtYmVyKTsKICAgICAgICAgfQotICAg ICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNvdXJjZUZpbGVG b3JTY3JpcHRVUkwoYW5jaG9yLmhyZWYpOwotICAgICAgICBzb3VyY2VGaWxlLnJlcXVlc3RTb3Vy Y2VNYXBwaW5nKGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nLmJpbmQodGhpcykpOworICAgICAgICB2 YXIgc2NyaXB0TG9jYXRpb24gPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdExvY2F0aW9uKGFuY2hv ci5ocmVmLCBudWxsLCBhbmNob3IuZ2V0QXR0cmlidXRlKCJsaW5lX251bWJlciIpIC0gMSwgMCk7 CisgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNjcmlwdExvY2F0aW9uVG9VSUxvY2F0 aW9uKHNjcmlwdExvY2F0aW9uLCBkaWRHZXRVSUxvY2F0aW9uLmJpbmQodGhpcykpOwogICAgIH0s CiAKICAgICBfc2hvd1NvdXJjZUxpbmU6IGZ1bmN0aW9uKHNvdXJjZUZpbGVJZCwgbGluZU51bWJl cikK 93900 2011-05-18 05:24:33 -0700 2011-05-18 06:10:09 -0700 Comments addressed. patch text/plain 3307 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZWY1MDJkLi41OGM4M2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDUtMTggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogaGlkZSBzY3JpcHQgbG9jYXRpb24gdG8gdWkgbG9jYXRpb24gY29udmVyc2lvbiBk ZXRhaWxzIGZyb20gU2NyaXB0c1BhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEwMzUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zb3VyY2VGaWxlRm9yU2NyaXB0VVJMKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5zY3JpcHRMb2NhdGlvblRvVUlMb2NhdGlvbi5kaWRSZXF1ZXN0U291cmNlTWFwcGluZyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUu c2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uKToKKwogMjAxMS0wNS0xNyAgWXV0YSBLaXRhbXVy YSAgPHl1dGFrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW50IFRhbXVy YS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcwppbmRleCBlODEwZmM1Li44YWQ4NTQzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJl c2VudGF0aW9uTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC03Nyw3ICs3NywyMCBAQCBXZWJJbnNw ZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBzb3Vy Y2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5jdGlvbihzY3JpcHRVUkwpCiAgICAgewotICAgICAgICBy ZXR1cm4gdGhpcy5fc291cmNlRmlsZXNbc2NyaXB0VVJMXTsKKyAgICAgICAgcmV0dXJuIHRoaXMu X3NvdXJjZUZpbGVzW3RoaXMuX2NyZWF0ZVNvdXJjZUZpbGVJZChzY3JpcHRVUkwpXTsKKyAgICB9 LAorCisgICAgc2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb246IGZ1bmN0aW9uKHNvdXJjZVVSTCwg c291cmNlSUQsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgY2FsbGJhY2spCisgICAgeworICAg ICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3NvdXJjZUZpbGVGb3JTY3JpcHQoc291cmNlVVJM LCBzb3VyY2VJRCk7CisgICAgICAgIHZhciBzY3JpcHRMb2NhdGlvbiA9IHsgbGluZU51bWJlcjog bGluZU51bWJlciwgY29sdW1uTnVtYmVyOiBjb2x1bW5OdW1iZXIgfTsKKworICAgICAgICBmdW5j dGlvbiBkaWRSZXF1ZXN0U291cmNlTWFwcGluZyhtYXBwaW5nKQorICAgICAgICB7CisgICAgICAg ICAgICB2YXIgbGluZU51bWJlciA9IG1hcHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxpbmUo c2NyaXB0TG9jYXRpb24pOworICAgICAgICAgICAgY2FsbGJhY2soc291cmNlRmlsZS5pZCwgbGlu ZU51bWJlcik7CisgICAgICAgIH0KKyAgICAgICAgc291cmNlRmlsZS5yZXF1ZXN0U291cmNlTWFw cGluZyhkaWRSZXF1ZXN0U291cmNlTWFwcGluZyk7CiAgICAgfSwKIAogICAgIHJlcXVlc3RTb3Vy Y2VGaWxlQ29udGVudDogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBjYWxsYmFjaykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXgg MjkzZGUwMi4uZmY1NmViMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TY3JpcHRzUGFuZWwuanMKQEAgLTUxNiwxMyArNTE2LDExIEBAIFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgc2hvd0FuY2hvckxvY2F0aW9uOiBm dW5jdGlvbihhbmNob3IpCiAgICAgewotICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291cmNl TWFwcGluZyhtYXBwaW5nKQorICAgICAgICBmdW5jdGlvbiBkaWRHZXRVSUxvY2F0aW9uKHNvdXJj ZUZpbGVJZCwgbGluZU51bWJlcikKICAgICAgICAgewotICAgICAgICAgICAgdmFyIGxpbmVOdW1i ZXIgPSBtYXBwaW5nLnNjcmlwdExvY2F0aW9uVG9Tb3VyY2VMaW5lKHtsaW5lTnVtYmVyOmFuY2hv ci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikgLSAxLCBjb2x1bW5OdW1iZXI6MH0pOwotICAg ICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUxpbmUoc291cmNlRmlsZS5pZCwgbGluZU51bWJlcik7 CisgICAgICAgICAgICB0aGlzLl9zaG93U291cmNlTGluZShzb3VyY2VGaWxlSWQsIGxpbmVOdW1i ZXIpOwogICAgICAgICB9Ci0gICAgICAgIHZhciBzb3VyY2VGaWxlID0gdGhpcy5fcHJlc2VudGF0 aW9uTW9kZWwuc291cmNlRmlsZUZvclNjcmlwdFVSTChhbmNob3IuaHJlZik7Ci0gICAgICAgIHNv dXJjZUZpbGUucmVxdWVzdFNvdXJjZU1hcHBpbmcoZGlkUmVxdWVzdFNvdXJjZU1hcHBpbmcuYmlu ZCh0aGlzKSk7CisgICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNjcmlwdExvY2F0aW9u VG9VSUxvY2F0aW9uKGFuY2hvci5ocmVmLCBudWxsLCBhbmNob3IuZ2V0QXR0cmlidXRlKCJsaW5l X251bWJlciIpIC0gMSwgMCwgZGlkR2V0VUlMb2NhdGlvbi5iaW5kKHRoaXMpKTsKICAgICB9LAog CiAgICAgX3Nob3dTb3VyY2VMaW5lOiBmdW5jdGlvbihzb3VyY2VGaWxlSWQsIGxpbmVOdW1iZXIp Cg== 93902 2011-05-18 06:10:09 -0700 2011-05-18 06:48:28 -0700 Rebase. patch text/plain 3869 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYmM5YmQ3Li44ZjE4M2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDUtMTggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogaGlkZSBzY3JpcHQgbG9jYXRpb24gdG8gdWkgbG9jYXRpb24gY29udmVyc2lvbiBk ZXRhaWxzIGZyb20gU2NyaXB0c1BhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEwMzUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zb3VyY2VGaWxlRm9yU2NyaXB0VVJMKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5zY3JpcHRMb2NhdGlvblRvVUlMb2NhdGlvbi5kaWRSZXF1ZXN0U291cmNlTWFwcGluZyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUu c2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uLmRpZEdldFVJTG9jYXRpb24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uKToK KwogMjAxMS0wNS0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qcwppbmRleCA3ZDFhODMxLi41ZDRjZTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLmpzCkBAIC03Nyw3ICs3NywyMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBzb3VyY2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5j dGlvbihzY3JpcHRVUkwpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRmlsZXNb c2NyaXB0VVJMXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3RoaXMuX2NyZWF0 ZVNvdXJjZUZpbGVJZChzY3JpcHRVUkwpXTsKKyAgICB9LAorCisgICAgc2NyaXB0TG9jYXRpb25U b1VJTG9jYXRpb246IGZ1bmN0aW9uKHNvdXJjZVVSTCwgc291cmNlSUQsIGxpbmVOdW1iZXIsIGNv bHVtbk51bWJlciwgY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRo aXMuX3NvdXJjZUZpbGVGb3JTY3JpcHQoc291cmNlVVJMLCBzb3VyY2VJRCk7CisgICAgICAgIHZh ciBzY3JpcHRMb2NhdGlvbiA9IHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVy OiBjb2x1bW5OdW1iZXIgfTsKKworICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291cmNlTWFw cGluZyhtYXBwaW5nKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IG1h cHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxpbmUoc2NyaXB0TG9jYXRpb24pOworICAgICAg ICAgICAgY2FsbGJhY2soc291cmNlRmlsZS5pZCwgbGluZU51bWJlcik7CisgICAgICAgIH0KKyAg ICAgICAgc291cmNlRmlsZS5yZXF1ZXN0U291cmNlTWFwcGluZyhkaWRSZXF1ZXN0U291cmNlTWFw cGluZyk7CiAgICAgfSwKIAogICAgIHJlcXVlc3RTb3VyY2VGaWxlQ29udGVudDogZnVuY3Rpb24o c291cmNlRmlsZUlkLCBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggODhkODM4Mi4uZjdkMThlZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTUxNiwxOCArNTE2LDE4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgc2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewot ICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNvdXJjZUZp bGVGb3JTY3JpcHRVUkwoYW5jaG9yLmhyZWYpOwogICAgICAgICB2YXIgYW5jaG9yTGluZU51bWJl ciA9IHBhcnNlSW50KGFuY2hvci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikpOwotICAgICAg ICBpZiAoYW5jaG9yTGluZU51bWJlciAhPT0gTmFOKSB7Ci0gICAgICAgICAgICBmdW5jdGlvbiBk aWRSZXF1ZXN0U291cmNlTWFwcGluZyhtYXBwaW5nKQotICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIHZhciBsaW5lTnVtYmVyID0gbWFwcGluZy5zY3JpcHRMb2NhdGlvblRvU291cmNlTGlu ZSh7IGxpbmVOdW1iZXI6IGFuY2hvckxpbmVOdW1iZXIgLSAxLCBjb2x1bW5OdW1iZXI6IDAgfSk7 Ci0gICAgICAgICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUxpbmUoc291cmNlRmlsZS5pZCwgbGlu ZU51bWJlcik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBzb3VyY2VGaWxlLnJlcXVlc3RT b3VyY2VNYXBwaW5nKGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nLmJpbmQodGhpcykpOwotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB2YXIgaGFzQW5jaG9yTGluZU51bWJlciA9IGFuY2hvckxp bmVOdW1iZXIgIT09IE5hTjsKKyAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBoYXNBbmNob3JMaW5l TnVtYmVyID8gYW5jaG9yTGluZU51bWJlciAtIDEgOiAwOworCisgICAgICAgIGZ1bmN0aW9uIGRp ZEdldFVJTG9jYXRpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgICAgICB7CisgICAg ICAgICAgICBpZiAoaGFzQW5jaG9yTGluZU51bWJlcikKKyAgICAgICAgICAgICAgICB0aGlzLl9z aG93U291cmNlTGluZShzb3VyY2VGaWxlSWQsIGxpbmVOdW1iZXIpOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlzdG9yeShz b3VyY2VGaWxlSWQpOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFu ZEFkZFRvSGlzdG9yeShzb3VyY2VGaWxlLmlkKTsKKyAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9u TW9kZWwuc2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24oYW5jaG9yLmhyZWYsIG51bGwsIGxpbmVO dW1iZXIsIDAsIGRpZEdldFVJTG9jYXRpb24uYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9z aG93U291cmNlTGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQo= 93906 2011-05-18 06:48:28 -0700 2011-06-08 05:57:08 -0700 Patch. patch text/plain 3869 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYmM5YmQ3Li44ZjE4M2FiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDUtMTggIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogaGlkZSBzY3JpcHQgbG9jYXRpb24gdG8gdWkgbG9jYXRpb24gY29udmVyc2lvbiBk ZXRhaWxzIGZyb20gU2NyaXB0c1BhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NjEwMzUKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1 Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5zb3VyY2VGaWxlRm9yU2NyaXB0VVJMKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlw ZS5zY3JpcHRMb2NhdGlvblRvVUlMb2NhdGlvbi5kaWRSZXF1ZXN0U291cmNlTWFwcGluZyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUu c2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5w cm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uLmRpZEdldFVJTG9jYXRpb24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uKToK KwogMjAxMS0wNS0xOCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5qcwppbmRleCA3ZDFhODMxLi5lMGM2YmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1v ZGVsLmpzCkBAIC03Nyw3ICs3NywyMCBAQCBXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRp b25Nb2RlbC5wcm90b3R5cGUgPSB7CiAKICAgICBzb3VyY2VGaWxlRm9yU2NyaXB0VVJMOiBmdW5j dGlvbihzY3JpcHRVUkwpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fc291cmNlRmlsZXNb c2NyaXB0VVJMXTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUZpbGVzW3RoaXMuX2NyZWF0 ZVNvdXJjZUZpbGVJZChzY3JpcHRVUkwpXTsKKyAgICB9LAorCisgICAgc2NyaXB0TG9jYXRpb25U b1VJTG9jYXRpb246IGZ1bmN0aW9uKHNvdXJjZVVSTCwgc291cmNlSWQsIGxpbmVOdW1iZXIsIGNv bHVtbk51bWJlciwgY2FsbGJhY2spCisgICAgeworICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRo aXMuX3NvdXJjZUZpbGVGb3JTY3JpcHQoc291cmNlVVJMLCBzb3VyY2VJZCk7CisgICAgICAgIHZh ciBzY3JpcHRMb2NhdGlvbiA9IHsgbGluZU51bWJlcjogbGluZU51bWJlciwgY29sdW1uTnVtYmVy OiBjb2x1bW5OdW1iZXIgfTsKKworICAgICAgICBmdW5jdGlvbiBkaWRSZXF1ZXN0U291cmNlTWFw cGluZyhtYXBwaW5nKQorICAgICAgICB7CisgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IG1h cHBpbmcuc2NyaXB0TG9jYXRpb25Ub1NvdXJjZUxpbmUoc2NyaXB0TG9jYXRpb24pOworICAgICAg ICAgICAgY2FsbGJhY2soc291cmNlRmlsZS5pZCwgbGluZU51bWJlcik7CisgICAgICAgIH0KKyAg ICAgICAgc291cmNlRmlsZS5yZXF1ZXN0U291cmNlTWFwcGluZyhkaWRSZXF1ZXN0U291cmNlTWFw cGluZyk7CiAgICAgfSwKIAogICAgIHJlcXVlc3RTb3VyY2VGaWxlQ29udGVudDogZnVuY3Rpb24o c291cmNlRmlsZUlkLCBjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggODhkODM4Mi4uZjdkMThlZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMK QEAgLTUxNiwxOCArNTE2LDE4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBl ID0gewogCiAgICAgc2hvd0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCiAgICAgewot ICAgICAgICB2YXIgc291cmNlRmlsZSA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNvdXJjZUZp bGVGb3JTY3JpcHRVUkwoYW5jaG9yLmhyZWYpOwogICAgICAgICB2YXIgYW5jaG9yTGluZU51bWJl ciA9IHBhcnNlSW50KGFuY2hvci5nZXRBdHRyaWJ1dGUoImxpbmVfbnVtYmVyIikpOwotICAgICAg ICBpZiAoYW5jaG9yTGluZU51bWJlciAhPT0gTmFOKSB7Ci0gICAgICAgICAgICBmdW5jdGlvbiBk aWRSZXF1ZXN0U291cmNlTWFwcGluZyhtYXBwaW5nKQotICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgIHZhciBsaW5lTnVtYmVyID0gbWFwcGluZy5zY3JpcHRMb2NhdGlvblRvU291cmNlTGlu ZSh7IGxpbmVOdW1iZXI6IGFuY2hvckxpbmVOdW1iZXIgLSAxLCBjb2x1bW5OdW1iZXI6IDAgfSk7 Ci0gICAgICAgICAgICAgICAgdGhpcy5fc2hvd1NvdXJjZUxpbmUoc291cmNlRmlsZS5pZCwgbGlu ZU51bWJlcik7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBzb3VyY2VGaWxlLnJlcXVlc3RT b3VyY2VNYXBwaW5nKGRpZFJlcXVlc3RTb3VyY2VNYXBwaW5nLmJpbmQodGhpcykpOwotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB2YXIgaGFzQW5jaG9yTGluZU51bWJlciA9IGFuY2hvckxp bmVOdW1iZXIgIT09IE5hTjsKKyAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSBoYXNBbmNob3JMaW5l TnVtYmVyID8gYW5jaG9yTGluZU51bWJlciAtIDEgOiAwOworCisgICAgICAgIGZ1bmN0aW9uIGRp ZEdldFVJTG9jYXRpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQorICAgICAgICB7CisgICAg ICAgICAgICBpZiAoaGFzQW5jaG9yTGluZU51bWJlcikKKyAgICAgICAgICAgICAgICB0aGlzLl9z aG93U291cmNlTGluZShzb3VyY2VGaWxlSWQsIGxpbmVOdW1iZXIpOworICAgICAgICAgICAgZWxz ZQorICAgICAgICAgICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFuZEFkZFRvSGlzdG9yeShz b3VyY2VGaWxlSWQpOwogICAgICAgICB9Ci0gICAgICAgIHRoaXMuX3Nob3dTb3VyY2VGcmFtZUFu ZEFkZFRvSGlzdG9yeShzb3VyY2VGaWxlLmlkKTsKKyAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9u TW9kZWwuc2NyaXB0TG9jYXRpb25Ub1VJTG9jYXRpb24oYW5jaG9yLmhyZWYsIG51bGwsIGxpbmVO dW1iZXIsIDAsIGRpZEdldFVJTG9jYXRpb24uYmluZCh0aGlzKSk7CiAgICAgfSwKIAogICAgIF9z aG93U291cmNlTGluZTogZnVuY3Rpb24oc291cmNlRmlsZUlkLCBsaW5lTnVtYmVyKQo=