156183 2016-04-04 15:24:30 -0700 Web Inspector: Uncaught exception in CSS with string "constructor" (WebInspector.Color.fromString()) 2016-04-04 17:12:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1180530 0 joepeck 2016-04-04 15:24:30 -0700 * SUMMARY Uncaught exception in CSS with string "constructor" (WebInspector.Color.fromString()) * TEST constructor { constructor: constructor; } * EXCEPTION: [Error] Uncaught exception in promise TypeError: WebInspector.Color.Keywords[keyword].concat is not a function. (In 'WebInspector.Color.Keywords[keyword].concat(1)', 'WebInspector.Color.Keywords[keyword].concat' is undefined) fromString — Color.js:112:131 createCodeMirrorTextMarkers — CodeMirrorTextMarkers.js:65 createCodeMirrorColorTextMarkers — CodeMirrorTextMarkers.js:121 _updateEditableMarkers — SourceCodeTextEditor.js:1582 _contentDidPopulate — SourceCodeTextEditor.js:431 _populateWithContent — SourceCodeTextEditor.js:449 _contentAvailable — SourceCodeTextEditor.js:472 _contentAvailable promiseReactionJob promiseLogError (Utilities.js:1250) promiseReactionJob 1180531 1 webkit-bug-importer 2016-04-04 15:24:51 -0700 <rdar://problem/25539279> 1180539 2 275583 joepeck 2016-04-04 15:41:10 -0700 Created attachment 275583 [PATCH] Proposed Fix 1180556 3 275583 bburg 2016-04-04 16:04:47 -0700 Comment on attachment 275583 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=275583&action=review > Source/WebInspectorUI/UserInterface/Debug/UncaughtExceptionReporter.js:213 > +window.promiseLogError = handleError; heh heh, very clever. > Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js:81 > + sourceCode.requestContent().then(this._contentAvailable.bind(this)).catch(promiseLogError); Reading this function in context, I don't like the function name. It sounds like the verb is 'promise' to log something, not 'log' a promise error. Maybe it should be called handlePromiseException or something. > Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js:83 > // FIXME: Cmd+L shorcut doesn't actually work. Drive-by Nit: 'shortcut' 1180557 4 275587 joepeck 2016-04-04 16:13:35 -0700 Created attachment 275587 [PATCH] For Landing 1180586 5 275587 commit-queue 2016-04-04 17:12:30 -0700 Comment on attachment 275587 [PATCH] For Landing Clearing flags on attachment: 275587 Committed r199031: <http://trac.webkit.org/changeset/199031> 1180587 6 commit-queue 2016-04-04 17:12:34 -0700 All reviewed patches have been landed. Closing bug. 275583 2016-04-04 15:41:10 -0700 2016-04-04 16:13:35 -0700 [PATCH] Proposed Fix promise-exceptions.patch text/plain 6173 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFmMzVjNzcuLjc3MTU0ZmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE2LTA0LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgZXhjZXB0aW9uIGluIENTUyB3aXRoIHN0cmluZyAiY29uc3RydWN0b3IiIChXZWJJbnNwZWN0 b3IuQ29sb3IuZnJvbVN0cmluZygpKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU2MTgzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTUzOTI3OT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvTW9kZWxzL0NvbG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbG9yLmZy b21TdHJpbmcpOgorICAgICAgICBGaXggdGhlIHVuY2F1Z2h0IGV4Y2VwdGlvbiBpc3N1ZS4gT25s eSBsb29rIGF0IG93biBwcm9wZXJ0aWVzIG9mCisgICAgICAgIG91ciBrZXl3b3JkIG1hcCB0byBh dm9pZCB2YWx1ZXMgbGlrZSAidG9TdHJpbmciIGFuZCAiY29uc3RydWN0b3IiLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzOgorICAg ICAgICAoaGFuZGxlRXJyb3IpOgorICAgICAgICAoaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24pOgor ICAgICAgICAoaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNvcmQpOgorICAgICAgICBHZW5lcmFs aXplIHVuY2F1Z2h0IGV4Y2VwdGlvbiBoYW5kbGVyIGVycm9yIHNoZWV0IHRvIGdldAorICAgICAg ICBleGNlcHRpb24gcmVjb3JkcyBmcm9tIGJvdGggdW5jYXVnaHQgZXhjZXB0aW9ucyAod2luZG93 Lm9uZXJyb3IpCisgICAgICAgIGFuZCBnZW5lcmFsIFJ1bnRpbWUgRXJyb3Igb2JqZWN0cyAoVHlw ZUVycm9yLCBldGMpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5q czoKKyAgICAgICAgKHdpbmRvdy5wcm9taXNlTG9nRXJyb3Iud2luZG93LnByb21pc2VMb2dFcnJv cik6CisgICAgICAgIEFkZCBhIGZhbGxiYWNrIGxvZyBleGNlcHRpb24gaGVscGVyLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BbmFseXplck1hbmFnZXIuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuQW5hbHl6ZXJNYW5hZ2VyLnByb3RvdHlwZS5nZXRBbmFseXplck1l c3NhZ2VzRm9yU291cmNlQ29kZSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Tb3Vy Y2VDb2RlVGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4 dEVkaXRvcik6CisgICAgICAgIEFkZCBjYXRjaCBoYW5kbGVycyB0byBQcm9taXNlcyB0byBsb2cg ZXhjZXB0aW9ucy4KKworMjAxNi0wNC0wNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcHJvdmUgSmF2YVNjcmlwdCBwcmV0 dHkgcHJpbnRpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NjE3OAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMjU1MzU3MTk+CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL1V0aWxpdGllcy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCmlu ZGV4IGY3MGU2YWYuLjQ5NGYyMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzCkBAIC0xMjQ0LDMgKzEyNDQsMTAgQEAg ZnVuY3Rpb24gdGltZXN0YW1wKCkKIHsKICAgICByZXR1cm4gd2luZG93LnBlcmZvcm1hbmNlID8g cGVyZm9ybWFuY2Uubm93KCkgOiBEYXRlLm5vdygpOwogfQorCitpZiAoIXdpbmRvdy5wcm9taXNl TG9nRXJyb3IpIHsKKyAgICB3aW5kb3cucHJvbWlzZUxvZ0Vycm9yID0gZnVuY3Rpb24gcHJvbWlz ZUxvZ0Vycm9yKGVycm9yKQorICAgIHsKKyAgICAgICAgY29uc29sZS5lcnJvcigiVW5jYXVnaHQg ZXhjZXB0aW9uIGluIFByb21pc2UiLCBlcnJvcik7CisgICAgfTsKK30KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0FuYWx5emVyTWFu YWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJz L0FuYWx5emVyTWFuYWdlci5qcwppbmRleCA2NjY2ZWIzLi5kNzg2NWQ1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9BbmFseXplck1h bmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQW5hbHl6ZXJNYW5hZ2VyLmpzCkBAIC05Niw3ICs5Niw3IEBAIFdlYkluc3BlY3Rvci5B bmFseXplck1hbmFnZXIgPSBjbGFzcyBBbmFseXplck1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2JqZWN0CiAgICAgICAgICAgICAgICAgcmVzb2x2ZShhbmFseXplck1lc3NhZ2VzKTsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgc291cmNlQ29kZS5yZXF1ZXN0Q29udGVudCgpLnRo ZW4ocmV0cmlldmVBbmFseXplck1lc3NhZ2VzLmJpbmQodGhpcykpOworICAgICAgICAgICAgc291 cmNlQ29kZS5yZXF1ZXN0Q29udGVudCgpLnRoZW4ocmV0cmlldmVBbmFseXplck1lc3NhZ2VzLmJp bmQodGhpcykpLmNhdGNoKHByb21pc2VMb2dFcnJvcik7CiAgICAgICAgIH0uYmluZCh0aGlzKSk7 CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvRGVidWcvVW5jYXVnaHRFeGNlcHRpb25SZXBvcnRlci5qcwppbmRl eCA1NzhiYTA1Li5lNzc0N2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVyLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVnL1VuY2F1Z2h0RXhjZXB0aW9uUmVw b3J0ZXIuanMKQEAgLTUwLDE0ICs1MCwyNSBAQCBmdW5jdGlvbiB1bmJsb2NrRXZlbnRIYW5kbGVy cygpIHsKICAgICAgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcihuYW1lLCBzdG9wRXZl bnRQcm9wYWdhdGlvbiwgdHJ1ZSk7CiB9CiAKK2Z1bmN0aW9uIGhhbmRsZUVycm9yKGVycm9yKSB7 CisgICAgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNvcmQoeworICAgICAgICBtZXNzYWdlOiBl cnJvci5tZXNzYWdlLAorICAgICAgICB1cmw6IHBhcnNlVVJMKGVycm9yLnNvdXJjZVVSTCkubGFz dFBhdGhDb21wb25lbnQsCisgICAgICAgIGxpbmVOdW1iZXI6IGVycm9yLmxpbmUsCisgICAgICAg IGNvbHVtbk51bWJlcjogZXJyb3IuY29sdW1uLAorICAgIH0pOworfQorCiBmdW5jdGlvbiBoYW5k bGVVbmNhdWdodEV4Y2VwdGlvbihldmVudCkgewotICAgIGxldCBleGNlcHRpb25SZWNvcmQgPSB7 CisgICAgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNvcmQoewogICAgICAgICBtZXNzYWdlOiBl dmVudC5tZXNzYWdlLAogICAgICAgICB1cmw6IHBhcnNlVVJMKGV2ZW50LmZpbGVuYW1lKS5sYXN0 UGF0aENvbXBvbmVudCwKICAgICAgICAgbGluZU51bWJlcjogZXZlbnQubGluZW5vLAotICAgICAg ICBjb2x1bW5OdW1iZXI6IGV2ZW50LmNvbG5vCi0gICAgfTsKKyAgICAgICAgY29sdW1uTnVtYmVy OiBldmVudC5jb2xubywKKyAgICB9KTsKK30KIAorZnVuY3Rpb24gaGFuZGxlVW5jYXVnaHRFeGNl cHRpb25SZWNvcmQoZXhjZXB0aW9uUmVjb3JkKSB7CiAgICAgaWYgKCF3aW5kb3cuX191bmNhdWdo dEV4Y2VwdGlvbnMpCiAgICAgICAgIHdpbmRvdy5fX3VuY2F1Z2h0RXhjZXB0aW9ucyA9IFtdOwog CkBAIC0xOTksNSArMjEwLDYgQEAgRG9jdW1lbnQgYW55IGFkZGl0aW9uYWwgaW5mb3JtYXRpb24g dGhhdCBtaWdodCBiZSB1c2VmdWwgaW4gcmVzb2x2aW5nIHRoZSBwcm9ibGUKIH0KIAogd2luZG93 LmFkZEV2ZW50TGlzdGVuZXIoImVycm9yIiwgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb24pOword2lu ZG93LnByb21pc2VMb2dFcnJvciA9IGhhbmRsZUVycm9yOwogCiB9KSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbG9yLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbG9yLmpzCmluZGV4IDM3 NTVhNDAuLmFiNDk1NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9Db2xvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvQ29sb3IuanMKQEAgLTEwMyw3ICsxMDMsNyBAQCBXZWJJbnNwZWN0b3Iu Q29sb3IgPSBjbGFzcyBDb2xvcgogICAgICAgICAgICAgICAgIF0pOwogICAgICAgICAgICAgfSBl bHNlIGlmIChtYXRjaFszXSkgeyAvLyBrZXl3b3JkCiAgICAgICAgICAgICAgICAgbGV0IGtleXdv cmQgPSBtYXRjaFszXS50b0xvd2VyQ2FzZSgpOwotICAgICAgICAgICAgICAgIGlmICghV2ViSW5z cGVjdG9yLkNvbG9yLktleXdvcmRzW2tleXdvcmRdKQorICAgICAgICAgICAgICAgIGlmICghV2Vi SW5zcGVjdG9yLkNvbG9yLktleXdvcmRzLmhhc093blByb3BlcnR5KGtleXdvcmQpKQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgICAgICAgICBsZXQgY29sb3IgPSBu ZXcgV2ViSW5zcGVjdG9yLkNvbG9yKFdlYkluc3BlY3Rvci5Db2xvci5Gb3JtYXQuS2V5d29yZCwg V2ViSW5zcGVjdG9yLkNvbG9yLktleXdvcmRzW2tleXdvcmRdLmNvbmNhdCgxKSk7CiAgICAgICAg ICAgICAgICAgY29sb3Iua2V5d29yZCA9IGtleXdvcmQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0 RWRpdG9yLmpzCmluZGV4IGNiZjAyY2UuLmVlNjNhNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVUZXh0RWRpdG9yLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNvZGVU ZXh0RWRpdG9yLmpzCkBAIC03OCw3ICs3OCw3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGV4 dEVkaXRvciA9IGNsYXNzIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGV4dGVuZHMgV2ViSW5zcGVjCiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIHRoaXMuX3NvdXJjZUNvZGUuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuU291cmNlQ29kZS5FdmVudC5Tb3VyY2VNYXBBZGRlZCwgdGhpcy5fc291 cmNlQ29kZVNvdXJjZU1hcEFkZGVkLCB0aGlzKTsKIAotICAgICAgICBzb3VyY2VDb2RlLnJlcXVl c3RDb250ZW50KCkudGhlbih0aGlzLl9jb250ZW50QXZhaWxhYmxlLmJpbmQodGhpcykpOworICAg ICAgICBzb3VyY2VDb2RlLnJlcXVlc3RDb250ZW50KCkudGhlbih0aGlzLl9jb250ZW50QXZhaWxh YmxlLmJpbmQodGhpcykpLmNhdGNoKHByb21pc2VMb2dFcnJvcik7CiAKICAgICAgICAgLy8gRklY TUU6IENtZCtMIHNob3JjdXQgZG9lc24ndCBhY3R1YWxseSB3b3JrLgogICAgICAgICBuZXcgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuQ29tbWFuZCwgIkwiLCB0aGlzLnNob3dHb1RvTGluZURpYWxvZy5iaW5kKHRoaXMp LCB0aGlzLmVsZW1lbnQpOwo= 275587 2016-04-04 16:13:35 -0700 2016-04-04 17:12:30 -0700 [PATCH] For Landing for-landing-1.patch text/plain 6422 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDFmMzVjNzcuLjMyNzdhY2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2IEBACiAyMDE2LTA0LTA0ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVn aHQgZXhjZXB0aW9uIGluIENTUyB3aXRoIHN0cmluZyAiY29uc3RydWN0b3IiIChXZWJJbnNwZWN0 b3IuQ29sb3IuZnJvbVN0cmluZygpKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTU2MTgzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTUzOTI3OT4K KworICAgICAgICBSZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9Nb2RlbHMvQ29sb3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29sb3IuZnJvbVN0 cmluZyk6CisgICAgICAgIEZpeCB0aGUgdW5jYXVnaHQgZXhjZXB0aW9uIGlzc3VlLiBPbmx5IGxv b2sgYXQgb3duIHByb3BlcnRpZXMgb2YKKyAgICAgICAgb3VyIGtleXdvcmQgbWFwIHRvIGF2b2lk IHZhbHVlcyBsaWtlICJ0b1N0cmluZyIgYW5kICJjb25zdHJ1Y3RvciIuCisKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL0RlYnVnL1VuY2F1Z2h0RXhjZXB0aW9uUmVwb3J0ZXIuanM6CisgICAgICAg IChoYW5kbGVFcnJvcik6CisgICAgICAgIChoYW5kbGVVbmNhdWdodEV4Y2VwdGlvbik6CisgICAg ICAgIChoYW5kbGVVbmNhdWdodEV4Y2VwdGlvblJlY29yZCk6CisgICAgICAgIEdlbmVyYWxpemUg dW5jYXVnaHQgZXhjZXB0aW9uIGhhbmRsZXIgZXJyb3Igc2hlZXQgdG8gZ2V0CisgICAgICAgIGV4 Y2VwdGlvbiByZWNvcmRzIGZyb20gYm90aCB1bmNhdWdodCBleGNlcHRpb25zICh3aW5kb3cub25l cnJvcikKKyAgICAgICAgYW5kIGdlbmVyYWwgUnVudGltZSBFcnJvciBvYmplY3RzIChUeXBlRXJy b3IsIGV0YykuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzOgor ICAgICAgICAod2luZG93LnByb21pc2VMb2dFcnJvci53aW5kb3cucHJvbWlzZUxvZ0Vycm9yKToK KyAgICAgICAgQWRkIGEgZmFsbGJhY2sgbG9nIGV4Y2VwdGlvbiBoZWxwZXIuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0FuYWx5emVyTWFuYWdlci5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5BbmFseXplck1hbmFnZXIucHJvdG90eXBlLmdldEFuYWx5emVyTWVzc2Fn ZXNGb3JTb3VyY2VDb2RlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZUNv ZGVUZXh0RWRpdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUZXh0RWRp dG9yKToKKyAgICAgICAgQWRkIGNhdGNoIGhhbmRsZXJzIHRvIFByb21pc2VzIHRvIGxvZyBleGNl cHRpb25zLgorCisyMDE2LTA0LTA0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW1wcm92ZSBKYXZhU2NyaXB0IHByZXR0eSBw cmludGluZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTU2MTc4CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNTUzNTcxOT4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvVXRpbGl0aWVzLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKaW5kZXgg ZjcwZTZhZi4uZDk5NTI1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQmFzZS9VdGlsaXRpZXMuanMKQEAgLTEyNDQsMyArMTI0NCwxMCBAQCBmdW5j dGlvbiB0aW1lc3RhbXAoKQogewogICAgIHJldHVybiB3aW5kb3cucGVyZm9ybWFuY2UgPyBwZXJm b3JtYW5jZS5ub3coKSA6IERhdGUubm93KCk7CiB9CisKK2lmICghd2luZG93LmhhbmRsZVByb21p c2VFeGNlcHRpb24pIHsKKyAgICB3aW5kb3cuaGFuZGxlUHJvbWlzZUV4Y2VwdGlvbiA9IGZ1bmN0 aW9uIGhhbmRsZVByb21pc2VFeGNlcHRpb24oZXJyb3IpCisgICAgeworICAgICAgICBjb25zb2xl LmVycm9yKCJVbmNhdWdodCBleGNlcHRpb24gaW4gUHJvbWlzZSIsIGVycm9yKTsKKyAgICB9Owor fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQW5hbHl6ZXJNYW5hZ2VyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvQW5hbHl6ZXJNYW5hZ2VyLmpzCmluZGV4IDY2NjZlYjMuLjk5YzYy NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRy b2xsZXJzL0FuYWx5emVyTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9Db250cm9sbGVycy9BbmFseXplck1hbmFnZXIuanMKQEAgLTk2LDcgKzk2LDcg QEAgV2ViSW5zcGVjdG9yLkFuYWx5emVyTWFuYWdlciA9IGNsYXNzIEFuYWx5emVyTWFuYWdlciBl eHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgICAgICByZXNvbHZlKGFuYWx5 emVyTWVzc2FnZXMpOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBzb3VyY2VDb2RlLnJl cXVlc3RDb250ZW50KCkudGhlbihyZXRyaWV2ZUFuYWx5emVyTWVzc2FnZXMuYmluZCh0aGlzKSk7 CisgICAgICAgICAgICBzb3VyY2VDb2RlLnJlcXVlc3RDb250ZW50KCkudGhlbihyZXRyaWV2ZUFu YWx5emVyTWVzc2FnZXMuYmluZCh0aGlzKSkuY2F0Y2goaGFuZGxlUHJvbWlzZUV4Y2VwdGlvbik7 CiAgICAgICAgIH0uYmluZCh0aGlzKSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlvblJlcG9ydGVy LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvRGVidWcvVW5jYXVnaHRF eGNlcHRpb25SZXBvcnRlci5qcwppbmRleCA1NzhiYTA1Li4wMmM3Mzk0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9EZWJ1Zy9VbmNhdWdodEV4Y2VwdGlv blJlcG9ydGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Rl YnVnL1VuY2F1Z2h0RXhjZXB0aW9uUmVwb3J0ZXIuanMKQEAgLTUwLDE0ICs1MCwyNSBAQCBmdW5j dGlvbiB1bmJsb2NrRXZlbnRIYW5kbGVycygpIHsKICAgICAgICAgZG9jdW1lbnQucmVtb3ZlRXZl bnRMaXN0ZW5lcihuYW1lLCBzdG9wRXZlbnRQcm9wYWdhdGlvbiwgdHJ1ZSk7CiB9CiAKK2Z1bmN0 aW9uIGhhbmRsZUVycm9yKGVycm9yKSB7CisgICAgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNv cmQoeworICAgICAgICBtZXNzYWdlOiBlcnJvci5tZXNzYWdlLAorICAgICAgICB1cmw6IHBhcnNl VVJMKGVycm9yLnNvdXJjZVVSTCkubGFzdFBhdGhDb21wb25lbnQsCisgICAgICAgIGxpbmVOdW1i ZXI6IGVycm9yLmxpbmUsCisgICAgICAgIGNvbHVtbk51bWJlcjogZXJyb3IuY29sdW1uLAorICAg IH0pOworfQorCiBmdW5jdGlvbiBoYW5kbGVVbmNhdWdodEV4Y2VwdGlvbihldmVudCkgewotICAg IGxldCBleGNlcHRpb25SZWNvcmQgPSB7CisgICAgaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNv cmQoewogICAgICAgICBtZXNzYWdlOiBldmVudC5tZXNzYWdlLAogICAgICAgICB1cmw6IHBhcnNl VVJMKGV2ZW50LmZpbGVuYW1lKS5sYXN0UGF0aENvbXBvbmVudCwKICAgICAgICAgbGluZU51bWJl cjogZXZlbnQubGluZW5vLAotICAgICAgICBjb2x1bW5OdW1iZXI6IGV2ZW50LmNvbG5vCi0gICAg fTsKKyAgICAgICAgY29sdW1uTnVtYmVyOiBldmVudC5jb2xubywKKyAgICB9KTsKK30KIAorZnVu Y3Rpb24gaGFuZGxlVW5jYXVnaHRFeGNlcHRpb25SZWNvcmQoZXhjZXB0aW9uUmVjb3JkKSB7CiAg ICAgaWYgKCF3aW5kb3cuX191bmNhdWdodEV4Y2VwdGlvbnMpCiAgICAgICAgIHdpbmRvdy5fX3Vu Y2F1Z2h0RXhjZXB0aW9ucyA9IFtdOwogCkBAIC0xOTksNSArMjEwLDYgQEAgRG9jdW1lbnQgYW55 IGFkZGl0aW9uYWwgaW5mb3JtYXRpb24gdGhhdCBtaWdodCBiZSB1c2VmdWwgaW4gcmVzb2x2aW5n IHRoZSBwcm9ibGUKIH0KIAogd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoImVycm9yIiwgaGFuZGxl VW5jYXVnaHRFeGNlcHRpb24pOword2luZG93LmhhbmRsZVByb21pc2VFeGNlcHRpb24gPSBoYW5k bGVFcnJvcjsKIAogfSkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9Db2xvci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01vZGVscy9Db2xvci5qcwppbmRleCAzNzU1YTQwLi5hYjQ5NTQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvQ29sb3IuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NvbG9yLmpzCkBA IC0xMDMsNyArMTAzLDcgQEAgV2ViSW5zcGVjdG9yLkNvbG9yID0gY2xhc3MgQ29sb3IKICAgICAg ICAgICAgICAgICBdKTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAobWF0Y2hbM10pIHsgLy8ga2V5 d29yZAogICAgICAgICAgICAgICAgIGxldCBrZXl3b3JkID0gbWF0Y2hbM10udG9Mb3dlckNhc2Uo KTsKLSAgICAgICAgICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5Db2xvci5LZXl3b3Jkc1trZXl3 b3JkXSkKKyAgICAgICAgICAgICAgICBpZiAoIVdlYkluc3BlY3Rvci5Db2xvci5LZXl3b3Jkcy5o YXNPd25Qcm9wZXJ0eShrZXl3b3JkKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIG51bGw7 CiAgICAgICAgICAgICAgICAgbGV0IGNvbG9yID0gbmV3IFdlYkluc3BlY3Rvci5Db2xvcihXZWJJ bnNwZWN0b3IuQ29sb3IuRm9ybWF0LktleXdvcmQsIFdlYkluc3BlY3Rvci5Db2xvci5LZXl3b3Jk c1trZXl3b3JkXS5jb25jYXQoMSkpOwogICAgICAgICAgICAgICAgIGNvbG9yLmtleXdvcmQgPSBr ZXl3b3JkOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvU291cmNlQ29kZVRleHRFZGl0b3IuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcwppbmRleCBjYmYwMmNlLi5k ZWI1Y2Q3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VDb2RlVGV4dEVkaXRvci5qcwpAQCAtNzgsOSArNzgs OSBAQCBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRleHRFZGl0b3IgPSBjbGFzcyBTb3VyY2VDb2Rl VGV4dEVkaXRvciBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0 aGlzLl9zb3VyY2VDb2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGUu RXZlbnQuU291cmNlTWFwQWRkZWQsIHRoaXMuX3NvdXJjZUNvZGVTb3VyY2VNYXBBZGRlZCwgdGhp cyk7CiAKLSAgICAgICAgc291cmNlQ29kZS5yZXF1ZXN0Q29udGVudCgpLnRoZW4odGhpcy5fY29u dGVudEF2YWlsYWJsZS5iaW5kKHRoaXMpKTsKKyAgICAgICAgc291cmNlQ29kZS5yZXF1ZXN0Q29u dGVudCgpLnRoZW4odGhpcy5fY29udGVudEF2YWlsYWJsZS5iaW5kKHRoaXMpKS5jYXRjaChoYW5k bGVQcm9taXNlRXhjZXB0aW9uKTsKIAotICAgICAgICAvLyBGSVhNRTogQ21kK0wgc2hvcmN1dCBk b2Vzbid0IGFjdHVhbGx5IHdvcmsuCisgICAgICAgIC8vIEZJWE1FOiBDbWQrTCBzaG9ydGN1dCBk b2Vzbid0IGFjdHVhbGx5IHdvcmsuCiAgICAgICAgIG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRT aG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kLCAi TCIsIHRoaXMuc2hvd0dvVG9MaW5lRGlhbG9nLmJpbmQodGhpcyksIHRoaXMuZWxlbWVudCk7CiAg ICAgICAgIG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5 Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCAiRyIsIHRoaXMuc2hvd0dvVG9MaW5lRGlh bG9nLmJpbmQodGhpcyksIHRoaXMuZWxlbWVudCk7CiAgICAgfQo=