152692 2016-01-04 09:49:48 -0800 Web Inspector: Add basic Animation section to Visual Sidebar 2017-05-24 22:07:24 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 172579 1 hi hi agomez bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1152351 0 hi 2016-01-04 09:49:48 -0800 We currently do not have the capability in Web Inspector to autocomplete the list of keyframes on the page, but the rest of the animation properties are all keyword based, so they can be added. 1152352 1 webkit-bug-importer 2016-01-04 09:49:58 -0800 <rdar://problem/24042244> 1152383 2 268205 hi 2016-01-04 10:48:40 -0800 Created attachment 268205 Patch 1152632 3 268205 joepeck 2016-01-04 20:55:28 -0800 Comment on attachment 268205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268205&action=review > Source/WebInspectorUI/UserInterface/Images/AnimationPlayStatePaused.svg:3 > +<!-- Copyright © 2016 Apple Inc. All rights reserved. --> > +<!-- Copyright © 2016 Devin Rousso <dcrousso+webkit@gmail.com>. All rights reserved. --> Both of these needed? Or just yours? 1152633 4 268205 hi 2016-01-04 21:08:06 -0800 Comment on attachment 268205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268205&action=review >> Source/WebInspectorUI/UserInterface/Images/AnimationPlayStatePaused.svg:3 >> +<!-- Copyright © 2016 Devin Rousso <dcrousso+webkit@gmail.com>. All rights reserved. --> > > Both of these needed? Or just yours? I put both because this icon was almost a direct copy of UserInterface/Images/Pause.svg 1153073 5 268205 timothy 2016-01-06 10:22:01 -0800 Comment on attachment 268205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268205&action=review > Source/WebInspectorUI/UserInterface/Images/AnimationPlayStatePaused.svg:2 > +<!-- Copyright © 2016 Apple Inc. All rights reserved. --> This would be 2015 still. >>> Source/WebInspectorUI/UserInterface/Images/AnimationPlayStatePaused.svg:3 >>> +<!-- Copyright © 2016 Devin Rousso <dcrousso+webkit@gmail.com>. All rights reserved. --> >> >> Both of these needed? Or just yours? > > I put both because this icon was almost a direct copy of UserInterface/Images/Pause.svg You should add your copyright line to the license header in copy-user-interface-resources.pl. 1153240 6 268415 hi 2016-01-06 14:46:24 -0800 Created attachment 268415 Patch 1153259 7 268415 commit-queue 2016-01-06 15:46:39 -0800 Comment on attachment 268415 Patch Clearing flags on attachment: 268415 Committed r194673: <http://trac.webkit.org/changeset/194673> 1153260 8 commit-queue 2016-01-06 15:46:43 -0800 All reviewed patches have been landed. Closing bug. 268205 2016-01-04 10:48:40 -0800 2016-01-06 14:46:24 -0800 Patch bug-152692-20160104114806.patch text/plain 12490 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDBhMGVkOTllNmU5NzkyYzc4NGVlMjY3ZTIzNjJk Y2RiN2I0NjViYzAuLjEwZjAwYWVjZTRlM2E2NTM2YjEwNDlmZDExMGU0YTBiYTgwYzAzZDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE2LTAxLTA0ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFkZCBiYXNpYyBBbmltYXRpb24gc2VjdGlvbiB0byBWaXN1YWwgU2lkZWJhcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjkyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkcyBhIG5vbi1h dXRvY29tcGxldGluZyBzZWN0aW9uIHRvIHRoZSAiRWZmZWN0cyIgc2VjdGlvbiAocmVuYW1lZCBm cm9tCisgICAgICAgICJBbmltYXRpb25zIikgb2YgdGhlIFZpc3VhbCBzaWRlYmFyIGZvciBzZXR0 aW5nIENTUyBBbmltYXRpb24gdmFsdWVzLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5s cHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2Vz L0FuaW1hdGlvblBsYXlTdGF0ZVBhdXNlZC5zdmc6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvSW1hZ2VzL0FuaW1hdGlvblBsYXlTdGF0ZVJ1bm5pbmcuc3ZnOiBBZGRlZC4KKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVmlzdWFsU3R5bGVCYXNpY0lucHV0LmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZUJhc2ljSW5wdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlQmFzaWNJbnB1dC5wcm90b3R5cGUuZ2V0IHZhbHVlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5WaXN1YWxTdHlsZUJhc2ljSW5wdXQucHJvdG90eXBlLnNldCB2YWx1ZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0LnByb3RvdHlwZS5nZXQgc3ludGhl c2l6ZWRWYWx1ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0 LnByb3RvdHlwZS5faGFuZGxlSW5wdXRFbGVtZW50SW5wdXQpOgorICAgICAgICBWZXJ5IGJhc2lj IGVkaXRvciB0aGF0IGlzIGp1c3QgYW4gaW5wdXQgYm94IHdpdGggYSBnaXZlbiBwbGFjZWhvbGRl ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5f cG9wdWxhdGVBbmltYXRpb25TZWN0aW9uKToKKyAgICAgICAgQ3JlYXRlcyB0aGUgbmVjZXNzYXJ5 IHByb3BlcnR5IGVkaXRvcnMgYW5kIGFkZHMgdGhlbSB0byB0aGVpciByZXNwZWN0aXZlIHJvd3Mu CisKIDIwMTYtMDEtMDMgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVmlzdWFsIHNpZGViYXIgc2VsZWN0b3Igc2VjdGlv biBkaXNwbGF5cyBpbmhlcml0ZWQgc2VjdGlvbiBmb3Igbm9uLWVkaXRhYmxlIHJ1bGVzCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzNzgzYWFlY2EzNzgzZWM2YjAwY2RmNjZk NGE0NmU5M2I0ZTU3NGJlLi41NWVmYWFjYjZiNjkzZWMwODNmMzhiM2U4MGI0MTAyYTc5OTNjOWZm IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDI0Mwp6Y21lek5qXilFQW1KT3ZAaWZJZ0s0 NTx2czM/JlQzM2B6e0szPD9ha0smLV56M0tSIytPaXN3UW92dGcqJGd7YU8KekRASnk1ZUxJKFMy fTFAQGp7LXY7TG4xPmluM1dHeXN7cklGRm45eWBsfFd0Kkx+Z1B7eVFDKTM+TCh2aSkhcUVPCnpV NG80PjJXWFRwTHEwPnc8UEUpfHRZRl5jNElQRyk8Tk50R3YtajxnPEA1eClJMkJ+ZTxQQm90Tlc2 MW1ya25TIwpaPThJIVlvcW1DblFGUVdSQSlXMDxJVDwoVjBzeiRPS2FsX2MKCmRlbHRhIDQ3Cnpj bVYrfjBNUCZOQCZ4d28xaDkyI2xrYXY2bGdxYVp2KV5pNTlrYnp4NzZ5fCZrcUVPe2tHTEpQWj48 aHF4NW88cwpGc1YhM2U3TmhfRwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0ltYWdlcy9BbmltYXRpb25QbGF5U3RhdGVQYXVzZWQuc3ZnIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0FuaW1hdGlvblBsYXlTdGF0ZVBh dXNlZC5zdmcKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uZDFjODRlMWZkMjA5ZTMxN2E4ZjliOGVjMjBkMmVmYzQ0YjYw MjYxZQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0ltYWdlcy9BbmltYXRpb25QbGF5U3RhdGVQYXVzZWQuc3ZnCkBAIC0wLDAgKzEsNyBAQAor PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gQ29weXJpZ2h0IMKp IDIwMTYgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4KKzwhLS0gQ29weXJpZ2h0 IMKpIDIwMTYgRGV2aW4gUm91c3NvIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPi4gQWxsIHJp Z2h0cyByZXNlcnZlZC4gLS0+Cis8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2 ZyIgaWQ9InJvb3QiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2IDE2Ij4KKyAgICA8cmVj dCBmaWxsPSJjdXJyZW50Q29sb3IiIHN0cm9rZT0ibm9uZSIgeD0iMi41IiB5PSIyLjUiIHdpZHRo PSIzIiBoZWlnaHQ9IjEwIi8+CisgICAgPHJlY3QgZmlsbD0iY3VycmVudENvbG9yIiBzdHJva2U9 Im5vbmUiIHg9IjkuNSIgeT0iMi41IiB3aWR0aD0iMyIgaGVpZ2h0PSIxMCIvPgorPC9zdmc+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQW5p bWF0aW9uUGxheVN0YXRlUnVubmluZy5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9JbWFnZXMvQW5pbWF0aW9uUGxheVN0YXRlUnVubmluZy5zdmcKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u ZDIxMTNmOWYxMjYzOGFkN2Y0MzMwOGM1Y2QyYzRjNjU4NTk2NGI1ZQotLS0gL2Rldi9udWxsCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9BbmltYXRpb25Q bGF5U3RhdGVSdW5uaW5nLnN2ZwpAQCAtMCwwICsxLDUgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIg ZW5jb2Rpbmc9InV0Zi04Ij8+Cis8IS0tIENvcHlyaWdodCDCqSAyMDE2IERldmluIFJvdXNzbyA8 ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4uIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPHN2 ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJyb290IiB2ZXJzaW9uPSIx LjEiIHZpZXdCb3g9IjAgMCAxNiAxNiI+CisgICAgPHBhdGggZmlsbD0iY3VycmVudENvbG9yIiBz dHJva2U9Im5vbmUiIGQ9Ik0gNC41IDIuNSBMIDQuNSAxMi41IEwgMTIuNSA3LjUgWiIvPgorPC9z dmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWlu Lmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5k ZXggMjJmOTk1Yzc1OGU0NWMxN2YxOGE2OWI2OWIwYzE2ODJjNDM0Mzk1ZC4uMzE1YTc2NzBhMDY4 Y2RkODRhMGE1M2QwZTgzNzFmYmRhMGQ2ZmYwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtNTgyLDYgKzU4Miw3IEBACiAgICAgPHNjcmlw dCBzcmM9IlZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzIj48L3NjcmlwdD4KICAgICA8 c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVQcm9wZXJ0eUVkaXRvci5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Zpc3VhbFN0eWxlQmFja2dyb3VuZFBpY2tlci5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Zpc3VhbFN0eWxlQmFzaWNJbnB1dC5q cyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL1Zpc3VhbFN0eWxlQ29sb3JQaWNr ZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZUNvbW1h U2VwYXJhdGVkS2V5d29yZEVkaXRvci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZp ZXdzL1Zpc3VhbFN0eWxlRm9udEZhbWlseUxpc3RFZGl0b3IuanMiPjwvc2NyaXB0PgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5 bGVCYXNpY0lucHV0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVmlzdWFsU3R5bGVCYXNpY0lucHV0LmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVmNjNkZjRlZTE3MTJhODM0 ZTZlNDZhNTJlOTNlMjg1OGUzMDIzZjUKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUJhc2ljSW5wdXQuanMKQEAg LTAsMCArMSw2NCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNiBEZXZpbiBSb3Vzc28gPGRj cm91c3NvK3dlYmtpdEBnbWFpbC5jb20+LiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CitXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0ID0gY2xhc3MgVmlzdWFsU3R5bGVC YXNpY0lucHV0IGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlUHJvcGVydHlFZGl0b3IK K3sKKyAgICBjb25zdHJ1Y3Rvcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBwbGFjZWhvbGRlciwgbGF5 b3V0UmV2ZXJzZWQpCisgICAgeworICAgICAgICBzdXBlcihwcm9wZXJ0eU5hbWVzLCB0ZXh0LCBu dWxsLCBudWxsLCAiYmFzaWMtaW5wdXQiLCBsYXlvdXRSZXZlcnNlZCk7CisKKyAgICAgICAgdGhp cy5faW5wdXRFbGVtZW50ID0gdGhpcy5jb250ZW50RWxlbWVudC5jcmVhdGVDaGlsZCgiaW5wdXQi KTsKKyAgICAgICAgdGhpcy5faW5wdXRFbGVtZW50LnNwZWxsY2hlY2sgPSBmYWxzZTsKKyAgICAg ICAgdGhpcy5faW5wdXRFbGVtZW50LnNldEF0dHJpYnV0ZSgicGxhY2Vob2xkZXIiLCBwbGFjZWhv bGRlciB8fCAiIik7CisgICAgICAgIHRoaXMuX2lucHV0RWxlbWVudC5hZGRFdmVudExpc3RlbmVy KCJpbnB1dCIsIHRoaXMuX2hhbmRsZUlucHV0RWxlbWVudElucHV0LmJpbmQodGhpcykpOworICAg IH0KKworICAgIC8vIFB1YmxpYworCisgICAgZ2V0IHZhbHVlKCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLl9pbnB1dEVsZW1lbnQudmFsdWUgfHwgbnVsbDsKKyAgICB9CisKKyAgICBzZXQg dmFsdWUodmFsdWUpCisgICAgeworICAgICAgICBpZiAodmFsdWUgJiYgdmFsdWUgPT09IHRoaXMu dmFsdWUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgdGhpcy5faW5wdXRFbGVtZW50 LnZhbHVlID0gdmFsdWUgfHwgIiI7CisgICAgfQorCisgICAgZ2V0IHN5bnRoZXNpemVkVmFsdWUo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMudmFsdWU7CisgICAgfQorCisgICAgLy8gUHJp dmF0ZQorCisgICAgX2hhbmRsZUlucHV0RWxlbWVudElucHV0KGV2ZW50KQorICAgIHsKKyAgICAg ICAgdGhpcy5fdmFsdWVEaWRDaGFuZ2UoKTsKKyAgICB9Cit9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFu ZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qcwppbmRleCA1NzUyNzdhODhmZDcyODZkNjUyMjNhYjY0NWI4ZGE1 NWQwYWQzMGYyLi5lOGRhZjBmZjQzM2YxY2UxMzAzOGVmOGEwODRhOWYzMmU2ZTVmNzhiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxT dHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtOTQsMTEgKzk0LDEyIEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxl RGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX3NlY3Rpb25zLmJhY2tncm91 bmQgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJiYWNrZ3JvdW5kIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJCYWNrZ3JvdW5kIiksIFt0aGlzLl9ncm91cHMuYmFja2dyb3VuZFN0 eWxlLnNlY3Rpb24sIHRoaXMuX2dyb3Vwcy5ib3JkZXIuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLm91 dGxpbmUuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmJveFNoYWRvdy5zZWN0aW9uLCB0aGlzLl9ncm91 cHMubGlzdFN0eWxlLnNlY3Rpb25dKTsKICAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3NlY3Rpb25zLmJhY2tncm91bmQuZWxlbWVudCk7CiAKLSAgICAgICAgLy8gQW5pbWF0 aW9uIFNlY3Rpb24KKyAgICAgICAgLy8gRWZmZWN0cyBTZWN0aW9uCiAgICAgICAgIHRoaXMuX2dl bmVyYXRlU2VjdGlvbigidHJhbnNpdGlvbiIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVHJhbnNp dGlvbiIpKTsKKyAgICAgICAgdGhpcy5fZ2VuZXJhdGVTZWN0aW9uKCJhbmltYXRpb24iLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkFuaW1hdGlvbiIpKTsKIAotICAgICAgICB0aGlzLl9zZWN0aW9u cy5hbmltYXRpb24gPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJhbmltYXRpb24i LCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkFuaW1hdGlvbiIpLCBbdGhpcy5fZ3JvdXBzLnRyYW5z aXRpb24uc2VjdGlvbl0pOwotICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5f c2VjdGlvbnMuYW5pbWF0aW9uLmVsZW1lbnQpOworICAgICAgICB0aGlzLl9zZWN0aW9ucy5lZmZl Y3RzID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbigiZWZmZWN0cyIsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiRWZmZWN0cyIpLCBbdGhpcy5fZ3JvdXBzLnRyYW5zaXRpb24uc2VjdGlv biwgdGhpcy5fZ3JvdXBzLmFuaW1hdGlvbi5zZWN0aW9uXSk7CisgICAgICAgIHRoaXMuZWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLl9zZWN0aW9ucy5lZmZlY3RzLmVsZW1lbnQpOwogICAgIH0KIAog ICAgIC8vIFB1YmxpYwpAQCAtMTEyNCw2ICsxMTI1LDU1IEBAIFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMg V2ViCiAgICAgICAgIHRoaXMuX3BvcHVsYXRlU2VjdGlvbihncm91cCwgW3RyYW5zaXRpb25Hcm91 cF0pOwogICAgIH0KIAorICAgIF9wb3B1bGF0ZUFuaW1hdGlvblNlY3Rpb24oKQorICAgIHsKKyAg ICAgICAgbGV0IGdyb3VwID0gdGhpcy5fZ3JvdXBzLmFuaW1hdGlvbjsKKyAgICAgICAgbGV0IHBy b3BlcnRpZXMgPSBncm91cC5wcm9wZXJ0aWVzOworCisgICAgICAgIGxldCBhbmltYXRpb25OYW1l Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9w ZXJ0aWVzLmFuaW1hdGlvbk5hbWUgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlQmFzaWNJ bnB1dCgiYW5pbWF0aW9uLW5hbWUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5hbWUiKSwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJFbnRlciB0aGUgbmFtZSBvZiBhIEtleWZyYW1lIikpOworCisg ICAgICAgIGFuaW1hdGlvbk5hbWVSb3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmFu aW1hdGlvbk5hbWUuZWxlbWVudCk7CisKKyAgICAgICAgbGV0IGFuaW1hdGlvblRpbWluZ1JvdyA9 IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAgICAgcHJvcGVydGll cy5hbmltYXRpb25UaW1pbmcgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlVGltaW5nRWRp dG9yKCJhbmltYXRpb24tdGltaW5nLWZ1bmN0aW9uIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU aW1pbmciKSwgWyJMaW5lYXIiLCAiRWFzZSIsICJFYXNlIEluIiwgIkVhc2UgT3V0IiwgIkVhc2Ug SW4gT3V0Il0pOworICAgICAgICBwcm9wZXJ0aWVzLmFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50ID0g bmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94KCJhbmltYXRpb24taXRl cmF0aW9uLWNvdW50IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJJdGVyYXRpb25zIiksIHRoaXMu X2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIkluZmluaXRlIl0pLCBudWxsKTsKKworICAgICAg ICBhbmltYXRpb25UaW1pbmdSb3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmFuaW1h dGlvblRpbWluZy5lbGVtZW50KTsKKyAgICAgICAgYW5pbWF0aW9uVGltaW5nUm93LmVsZW1lbnQu YXBwZW5kQ2hpbGQocHJvcGVydGllcy5hbmltYXRpb25JdGVyYXRpb25Db3VudC5lbGVtZW50KTsK KworICAgICAgICBsZXQgYW5pbWF0aW9uRHVyYXRpb25Sb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRl dGFpbHNTZWN0aW9uUm93OworCisgICAgICAgIGxldCBhbmltYXRpb25UaW1lS2V5d29yZHMgPSBb InMiLCAibXMiXTsKKyAgICAgICAgcHJvcGVydGllcy5hbmltYXRpb25EdXJhdGlvbiA9IG5ldyBX ZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVOdW1iZXJJbnB1dEJveCgiYW5pbWF0aW9uLWR1cmF0aW9u IiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEdXJhdGlvbiIpLCBudWxsLCBhbmltYXRpb25UaW1l S2V5d29yZHMpOworICAgICAgICBwcm9wZXJ0aWVzLmFuaW1hdGlvbkRlbGF5ID0gbmV3IFdlYklu c3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94KCJhbmltYXRpb24tZGVsYXkiLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkRlbGF5IiksIG51bGwsIGFuaW1hdGlvblRpbWVLZXl3b3Jkcyk7 CisKKyAgICAgICAgYW5pbWF0aW9uRHVyYXRpb25Sb3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9w ZXJ0aWVzLmFuaW1hdGlvbkR1cmF0aW9uLmVsZW1lbnQpOworICAgICAgICBhbmltYXRpb25EdXJh dGlvblJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYW5pbWF0aW9uRGVsYXkuZWxl bWVudCk7CisKKyAgICAgICAgbGV0IGFuaW1hdGlvbkRpcmVjdGlvblJvdyA9IG5ldyBXZWJJbnNw ZWN0b3IuRGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAgICAgcHJvcGVydGllcy5hbmltYXRpb25E aXJlY3Rpb24gPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tlcigiYW5p bWF0aW9uLWRpcmVjdGlvbiIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRGlyZWN0aW9uIiksIHsK KyAgICAgICAgICAgIGJhc2ljOiB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cy5jb25jYXQoWyJOb3Jt YWwiLCAiUmV2ZXJzZSJdKSwKKyAgICAgICAgICAgIGFkdmFuY2VkOiBbIkFsdGVybmF0ZSIsICJB bHRlcm5hdGUgUmV2ZXJzZSJdCisgICAgICAgIH0pOworICAgICAgICBwcm9wZXJ0aWVzLmFuaW1h dGlvbkZpbGxNb2RlID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUtleXdvcmRQaWNrZXIo ImFuaW1hdGlvbi1maWxsLW1vZGUiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZpbGwgTW9kZSIp LCB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cy5jb25jYXQoWyJOb25lIiwgIkZvcndhcmRzIiwgIkJh Y2t3YXJkcyIsICJCb3RoIl0pKTsKKworICAgICAgICBhbmltYXRpb25EaXJlY3Rpb25Sb3cuZWxl bWVudC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmFuaW1hdGlvbkRpcmVjdGlvbi5lbGVtZW50KTsK KyAgICAgICAgYW5pbWF0aW9uRGlyZWN0aW9uUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVy dGllcy5hbmltYXRpb25GaWxsTW9kZS5lbGVtZW50KTsKKworICAgICAgICBsZXQgYW5pbWF0aW9u U3RhdGVSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAg IHByb3BlcnRpZXMuYW5pbWF0aW9uUGxheVN0YXRlID0gbmV3IFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZUtleXdvcmRJY29uTGlzdCgiYW5pbWF0aW9uLXBsYXktc3RhdGUiLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlN0YXRlIiksIFsiUnVubmluZyIsICJQYXVzZWQiLCAiSW5pdGlhbCJdKTsKKwor ICAgICAgICBhbmltYXRpb25TdGF0ZVJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMu YW5pbWF0aW9uUGxheVN0YXRlLmVsZW1lbnQpOworCisgICAgICAgIGxldCBhbmltYXRpb25Hcm91 cCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Hcm91cChbYW5pbWF0aW9uTmFtZVJv dywgYW5pbWF0aW9uVGltaW5nUm93LCBhbmltYXRpb25EdXJhdGlvblJvdywgYW5pbWF0aW9uRGly ZWN0aW9uUm93LCBhbmltYXRpb25TdGF0ZVJvd10pOworICAgICAgICB0aGlzLl9wb3B1bGF0ZVNl Y3Rpb24oZ3JvdXAsIFthbmltYXRpb25Hcm91cF0pOworICAgIH0KKwogICAgIF9ub1JlbWFpbmlu Z0NvbW1hU2VwYXJhdGVkRWRpdG9ySXRlbXMocHJvcGVydHlDb21iaW5lciwgcHJvcGVydHlFZGl0 b3JzKQogICAgIHsKICAgICAgICAgaWYgKCFwcm9wZXJ0eUNvbWJpbmVyIHx8ICFwcm9wZXJ0eUVk aXRvcnMpCg== 268415 2016-01-06 14:46:24 -0800 2016-01-06 15:46:39 -0800 Patch 152692.diff text/plain 12948 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDcxMGE2MGUuLjlmOGQ4MTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE2LTAxLTA2ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBiYXNpYyBBbmltYXRpb24gc2VjdGlvbiB0byBWaXN1YWwgU2lkZWJhcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNjkyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVyLgorCisgICAgICAgIEFkZHMgYSBub24tYXV0b2NvbXBs ZXRpbmcgc2VjdGlvbiB0byB0aGUgIkVmZmVjdHMiIHNlY3Rpb24gKHJlbmFtZWQgZnJvbQorICAg ICAgICAiQW5pbWF0aW9ucyIpIG9mIHRoZSBWaXN1YWwgc2lkZWJhciBmb3Igc2V0dGluZyBDU1Mg QW5pbWF0aW9uIHZhbHVlcy4KKworICAgICAgICAqIFNjcmlwdHMvY29weS11c2VyLWludGVyZmFj ZS1yZXNvdXJjZXMucGw6CisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2VzL0FuaW1hdGlvblBs YXlTdGF0ZVBhdXNlZC5zdmc6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvSW1hZ2Vz L0FuaW1hdGlvblBsYXlTdGF0ZVJ1bm5pbmcuc3ZnOiBBZGRlZC4KKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL01haW4uaHRtbDoKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFs U3R5bGVCYXNpY0lucHV0LmpzOiBBZGRlZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZUJhc2ljSW5wdXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlQmFzaWNJ bnB1dC5wcm90b3R5cGUuZ2V0IHZhbHVlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5WaXN1YWxT dHlsZUJhc2ljSW5wdXQucHJvdG90eXBlLnNldCB2YWx1ZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0LnByb3RvdHlwZS5nZXQgc3ludGhlc2l6ZWRWYWx1ZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNpY0lucHV0LnByb3RvdHlwZS5f aGFuZGxlSW5wdXRFbGVtZW50SW5wdXQpOgorICAgICAgICBWZXJ5IGJhc2ljIGVkaXRvciB0aGF0 IGlzIGp1c3QgYW4gaW5wdXQgYm94IHdpdGggYSBnaXZlbiBwbGFjZWhvbGRlci4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVBbmlt YXRpb25TZWN0aW9uKToKKyAgICAgICAgQ3JlYXRlcyB0aGUgbmVjZXNzYXJ5IHByb3BlcnR5IGVk aXRvcnMgYW5kIGFkZHMgdGhlbSB0byB0aGVpciByZXNwZWN0aXZlIHJvd3MuCisKKzIwMTYtMDEt MDYgIERldmluIFJvdXNzbyAgPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CisKICAgICAgICAg V2ViIEluc3BlY3RvcjogQWRkIHJlbWFpbmluZyBiYWNrZ3JvdW5kIHN0eWxlIHByb3BlcnRpZXMg dG8gVmlzdWFsIHNpZGViYXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1Mjc1NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAw OGMwNGUxZGIwNjdjODMyYjFhZDdjNjVhMGM5YTM1ZTRkNWM3NWFlLi4yODExODUxZTNjYTBhZTMy M2IyYmEzZDhlMjhmNDY0NGQ0NGQzMGEyIDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDI4 MAp6Y21lekhsallUNG1KUipjaWZJZ0s0NTx2czM/JlQzM2B6e0szPD9ha0smLV56M0tSIytPa1U3 enhWYjtPTUFrRzkKenMzP2A4MnE7fmBrTzU+VkZ5dHtMR1VTMztgOVFAQUslTjRGSDtgV208UHx+ V0NVNUFGUjN9cFhiT0Mtd3ttcVA+Cno1XlUtQEskQ25LQCk9VHFyWGY0YWpVa2dFMk1EM0VsTWxH KlBYMGZFWj9iKHEraCtDdEJaezEhUCk4PEMtWHxmQgpnIzRgeyMtVFpuKE9xPypQZEJIJkNpSVd1 fl58I3llR2o3eGMwM1FCOWxLPW4hCgpkZWx0YSA0Mwp6Y21WK2AwTSE1THtSSHMmMWg5ezVsYj4l NHYrWmtXOWd8SXAyKHRyPDRoRk1wa2tUUXVvM2RQOXc/UHBCc1YmfCEKQjZUdHVnCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1NjcmlwdHMvY29weS11c2VyLWludGVyZmFjZS1y ZXNvdXJjZXMucGwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50 ZXJmYWNlLXJlc291cmNlcy5wbAppbmRleCAyNzU1MTUwLi4zZDI2YjFmIDEwMDc1NQotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50ZXJmYWNlLXJlc291cmNl cy5wbAorKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvU2NyaXB0cy9jb3B5LXVzZXItaW50ZXJm YWNlLXJlc291cmNlcy5wbApAQCAtOTQsNiArOTQsNyBAQCBteSAkaW5zcGVjdG9yTGljZW5zZSA9 IDw8J0VPRic7CiAgKiBDb3B5cmlnaHQgKEMpIDIwMTQtMjAxNSBTYWFtIEJhcmF0aSA8c2FhbWJh cmF0aTFAZ21haWwuY29tPgogICogQ29weXJpZ2h0IChDKSAyMDE0IEFudG9pbmUgUXVpbnQKICAq IENvcHlyaWdodCAoQykgMjAxNSBUb2JpYXMgUmVpc3MgPHRvYmkrd2Via2l0QGJhc2Vjb2RlLmRl PgorICogQ29weXJpZ2h0IChDKSAyMDE1LTIwMTYgRGV2aW4gUm91c3NvIDxkY3JvdXNzbyt3ZWJr aXRAZ21haWwuY29tPi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlv biBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAq IG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcg Y29uZGl0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvSW1hZ2VzL0FuaW1hdGlvblBsYXlTdGF0ZVBhdXNlZC5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvQW5pbWF0aW9uUGxheVN0YXRlUGF1c2VkLnN2Zwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4yZTA2YmJhCi0tLSAvZGV2L251bGwK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL0FuaW1hdGlv blBsYXlTdGF0ZVBhdXNlZC5zdmcKQEAgLTAsMCArMSw3IEBACis8P3htbCB2ZXJzaW9uPSIxLjAi IGVuY29kaW5nPSJ1dGYtOCI/PgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxNSBBcHBsZSBJbmMuIEFs bCByaWdodHMgcmVzZXJ2ZWQuIC0tPgorPCEtLSBDb3B5cmlnaHQgwqkgMjAxNiBEZXZpbiBSb3Vz c28gPGRjcm91c3NvK3dlYmtpdEBnbWFpbC5jb20+LiBBbGwgcmlnaHRzIHJlc2VydmVkLiAtLT4K KzxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBpZD0icm9vdCIgdmVyc2lv bj0iMS4xIiB2aWV3Qm94PSIwIDAgMTYgMTYiPgorICAgIDxyZWN0IGZpbGw9ImN1cnJlbnRDb2xv ciIgc3Ryb2tlPSJub25lIiB4PSIyLjUiIHk9IjIuNSIgd2lkdGg9IjMiIGhlaWdodD0iMTAiLz4K KyAgICA8cmVjdCBmaWxsPSJjdXJyZW50Q29sb3IiIHN0cm9rZT0ibm9uZSIgeD0iOS41IiB5PSIy LjUiIHdpZHRoPSIzIiBoZWlnaHQ9IjEwIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9BbmltYXRpb25QbGF5U3RhdGVSdW5u aW5nLnN2ZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0ltYWdlcy9Bbmlt YXRpb25QbGF5U3RhdGVSdW5uaW5nLnN2ZwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwLi5kMjExM2Y5Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvSW1hZ2VzL0FuaW1hdGlvblBsYXlTdGF0ZVJ1bm5pbmcuc3ZnCkBAIC0wLDAg KzEsNSBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KKzwhLS0gQ29w eXJpZ2h0IMKpIDIwMTYgRGV2aW4gUm91c3NvIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPi4g QWxsIHJpZ2h0cyByZXNlcnZlZC4gLS0+Cis8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8y MDAwL3N2ZyIgaWQ9InJvb3QiIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDE2IDE2Ij4KKyAg ICA8cGF0aCBmaWxsPSJjdXJyZW50Q29sb3IiIHN0cm9rZT0ibm9uZSIgZD0iTSA0LjUgMi41IEwg NC41IDEyLjUgTCAxMi41IDcuNSBaIi8+Cis8L3N2Zz4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbAppbmRleCBmMjZlOGNjLi5iZTg5NWMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBAIC01ODQsNiAr NTg0LDcgQEAKICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9WaXN1YWxTdHlsZVByb3BlcnR5 RWRpdG9yLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVC YWNrZ3JvdW5kUGlja2VyLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlz dWFsU3R5bGVCYXNpY0lucHV0LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3Mv VmlzdWFsU3R5bGVDb2xvclBpY2tlci5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZp ZXdzL1Zpc3VhbFN0eWxlQ29tbWFTZXBhcmF0ZWRLZXl3b3JkRWRpdG9yLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iVmlld3MvVmlzdWFsU3R5bGVGb250RmFtaWx5TGlzdEVkaXRvci5q cyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUJhc2ljSW5wdXQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHlsZUJhc2ljSW5wdXQuanMKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWY2M2RmNAotLS0gL2Rldi9udWxsCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlQmFzaWNJ bnB1dC5qcwpAQCAtMCwwICsxLDY0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE2IERldmlu IFJvdXNzbyA8ZGNyb3Vzc28rd2Via2l0QGdtYWlsLmNvbT4uIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMu IEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUg SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBB UFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVD VCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNF UVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVN RU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFU QSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVT RUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFD VCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RI RVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgorICovCisKK1dlYkluc3BlY3Rvci5WaXN1YWxTdHlsZUJhc2ljSW5wdXQgPSBjbGFzcyBW aXN1YWxTdHlsZUJhc2ljSW5wdXQgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVQcm9w ZXJ0eUVkaXRvcgoreworICAgIGNvbnN0cnVjdG9yKHByb3BlcnR5TmFtZXMsIHRleHQsIHBsYWNl aG9sZGVyLCBsYXlvdXRSZXZlcnNlZCkKKyAgICB7CisgICAgICAgIHN1cGVyKHByb3BlcnR5TmFt ZXMsIHRleHQsIG51bGwsIG51bGwsICJiYXNpYy1pbnB1dCIsIGxheW91dFJldmVyc2VkKTsKKwor ICAgICAgICB0aGlzLl9pbnB1dEVsZW1lbnQgPSB0aGlzLmNvbnRlbnRFbGVtZW50LmNyZWF0ZUNo aWxkKCJpbnB1dCIpOworICAgICAgICB0aGlzLl9pbnB1dEVsZW1lbnQuc3BlbGxjaGVjayA9IGZh bHNlOworICAgICAgICB0aGlzLl9pbnB1dEVsZW1lbnQuc2V0QXR0cmlidXRlKCJwbGFjZWhvbGRl ciIsIHBsYWNlaG9sZGVyIHx8ICIiKTsKKyAgICAgICAgdGhpcy5faW5wdXRFbGVtZW50LmFkZEV2 ZW50TGlzdGVuZXIoImlucHV0IiwgdGhpcy5faGFuZGxlSW5wdXRFbGVtZW50SW5wdXQuYmluZCh0 aGlzKSk7CisgICAgfQorCisgICAgLy8gUHVibGljCisKKyAgICBnZXQgdmFsdWUoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX2lucHV0RWxlbWVudC52YWx1ZSB8fCBudWxsOworICAgIH0K KworICAgIHNldCB2YWx1ZSh2YWx1ZSkKKyAgICB7CisgICAgICAgIGlmICh2YWx1ZSAmJiB2YWx1 ZSA9PT0gdGhpcy52YWx1ZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9p bnB1dEVsZW1lbnQudmFsdWUgPSB2YWx1ZSB8fCAiIjsKKyAgICB9CisKKyAgICBnZXQgc3ludGhl c2l6ZWRWYWx1ZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy52YWx1ZTsKKyAgICB9CisK KyAgICAvLyBQcml2YXRlCisKKyAgICBfaGFuZGxlSW5wdXRFbGVtZW50SW5wdXQoZXZlbnQpCisg ICAgeworICAgICAgICB0aGlzLl92YWx1ZURpZENoYW5nZSgpOworICAgIH0KK307CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IDJkNzgxODQuLjU0YTVlYzQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC05NCwxMSArOTQsMTIg QEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5 bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKICAgICAgICAgdGhpcy5fc2VjdGlvbnMuYmFja2dy b3VuZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24oImJhY2tncm91bmQiLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIkJhY2tncm91bmQiKSwgW3RoaXMuX2dyb3Vwcy5iYWNrZ3JvdW5k U3R5bGUuc2VjdGlvbiwgdGhpcy5fZ3JvdXBzLmJvcmRlci5zZWN0aW9uLCB0aGlzLl9ncm91cHMu b3V0bGluZS5zZWN0aW9uLCB0aGlzLl9ncm91cHMuYm94U2hhZG93LnNlY3Rpb24sIHRoaXMuX2dy b3Vwcy5saXN0U3R5bGUuc2VjdGlvbl0pOwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fc2VjdGlvbnMuYmFja2dyb3VuZC5lbGVtZW50KTsKIAotICAgICAgICAvLyBBbmlt YXRpb24gU2VjdGlvbgorICAgICAgICAvLyBFZmZlY3RzIFNlY3Rpb24KICAgICAgICAgdGhpcy5f Z2VuZXJhdGVTZWN0aW9uKCJ0cmFuc2l0aW9uIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUcmFu c2l0aW9uIikpOworICAgICAgICB0aGlzLl9nZW5lcmF0ZVNlY3Rpb24oImFuaW1hdGlvbiIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQW5pbWF0aW9uIikpOwogCi0gICAgICAgIHRoaXMuX3NlY3Rp b25zLmFuaW1hdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb24oImFuaW1hdGlv biIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQW5pbWF0aW9uIiksIFt0aGlzLl9ncm91cHMudHJh bnNpdGlvbi5zZWN0aW9uXSk7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9zZWN0aW9ucy5hbmltYXRpb24uZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3NlY3Rpb25zLmVm ZmVjdHMgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uKCJlZmZlY3RzIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJFZmZlY3RzIiksIFt0aGlzLl9ncm91cHMudHJhbnNpdGlvbi5zZWN0 aW9uLCB0aGlzLl9ncm91cHMuYW5pbWF0aW9uLnNlY3Rpb25dKTsKKyAgICAgICAgdGhpcy5lbGVt ZW50LmFwcGVuZENoaWxkKHRoaXMuX3NlY3Rpb25zLmVmZmVjdHMuZWxlbWVudCk7CiAgICAgfQog CiAgICAgLy8gUHVibGljCkBAIC0xMTMzLDYgKzExMzQsNTUgQEAgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5k cyBXZWIKICAgICAgICAgdGhpcy5fcG9wdWxhdGVTZWN0aW9uKGdyb3VwLCBbdHJhbnNpdGlvbkdy b3VwXSk7CiAgICAgfQogCisgICAgX3BvcHVsYXRlQW5pbWF0aW9uU2VjdGlvbigpCisgICAgewor ICAgICAgICBsZXQgZ3JvdXAgPSB0aGlzLl9ncm91cHMuYW5pbWF0aW9uOworICAgICAgICBsZXQg cHJvcGVydGllcyA9IGdyb3VwLnByb3BlcnRpZXM7CisKKyAgICAgICAgbGV0IGFuaW1hdGlvbk5h bWVSb3cgPSBuZXcgV2ViSW5zcGVjdG9yLkRldGFpbHNTZWN0aW9uUm93OworCisgICAgICAgIHBy b3BlcnRpZXMuYW5pbWF0aW9uTmFtZSA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVCYXNp Y0lucHV0KCJhbmltYXRpb24tbmFtZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTmFtZSIpLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkVudGVyIHRoZSBuYW1lIG9mIGEgS2V5ZnJhbWUiKSk7CisK KyAgICAgICAgYW5pbWF0aW9uTmFtZVJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMu YW5pbWF0aW9uTmFtZS5lbGVtZW50KTsKKworICAgICAgICBsZXQgYW5pbWF0aW9uVGltaW5nUm93 ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0 aWVzLmFuaW1hdGlvblRpbWluZyA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVUaW1pbmdF ZGl0b3IoImFuaW1hdGlvbi10aW1pbmctZnVuY3Rpb24iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlRpbWluZyIpLCBbIkxpbmVhciIsICJFYXNlIiwgIkVhc2UgSW4iLCAiRWFzZSBPdXQiLCAiRWFz ZSBJbiBPdXQiXSk7CisgICAgICAgIHByb3BlcnRpZXMuYW5pbWF0aW9uSXRlcmF0aW9uQ291bnQg PSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3goImFuaW1hdGlvbi1p dGVyYXRpb24tY291bnQiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkl0ZXJhdGlvbnMiKSwgdGhp cy5fa2V5d29yZHMuZGVmYXVsdHMuY29uY2F0KFsiSW5maW5pdGUiXSksIG51bGwpOworCisgICAg ICAgIGFuaW1hdGlvblRpbWluZ1Jvdy5lbGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYW5p bWF0aW9uVGltaW5nLmVsZW1lbnQpOworICAgICAgICBhbmltYXRpb25UaW1pbmdSb3cuZWxlbWVu dC5hcHBlbmRDaGlsZChwcm9wZXJ0aWVzLmFuaW1hdGlvbkl0ZXJhdGlvbkNvdW50LmVsZW1lbnQp OworCisgICAgICAgIGxldCBhbmltYXRpb25EdXJhdGlvblJvdyA9IG5ldyBXZWJJbnNwZWN0b3Iu RGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAgICAgbGV0IGFuaW1hdGlvblRpbWVLZXl3b3JkcyA9 IFsicyIsICJtcyJdOworICAgICAgICBwcm9wZXJ0aWVzLmFuaW1hdGlvbkR1cmF0aW9uID0gbmV3 IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZU51bWJlcklucHV0Qm94KCJhbmltYXRpb24tZHVyYXRp b24iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkR1cmF0aW9uIiksIG51bGwsIGFuaW1hdGlvblRp bWVLZXl3b3Jkcyk7CisgICAgICAgIHByb3BlcnRpZXMuYW5pbWF0aW9uRGVsYXkgPSBuZXcgV2Vi SW5zcGVjdG9yLlZpc3VhbFN0eWxlTnVtYmVySW5wdXRCb3goImFuaW1hdGlvbi1kZWxheSIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiRGVsYXkiKSwgbnVsbCwgYW5pbWF0aW9uVGltZUtleXdvcmRz KTsKKworICAgICAgICBhbmltYXRpb25EdXJhdGlvblJvdy5lbGVtZW50LmFwcGVuZENoaWxkKHBy b3BlcnRpZXMuYW5pbWF0aW9uRHVyYXRpb24uZWxlbWVudCk7CisgICAgICAgIGFuaW1hdGlvbkR1 cmF0aW9uUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGllcy5hbmltYXRpb25EZWxheS5l bGVtZW50KTsKKworICAgICAgICBsZXQgYW5pbWF0aW9uRGlyZWN0aW9uUm93ID0gbmV3IFdlYklu c3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsKKworICAgICAgICBwcm9wZXJ0aWVzLmFuaW1hdGlv bkRpcmVjdGlvbiA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlja2VyKCJh bmltYXRpb24tZGlyZWN0aW9uIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEaXJlY3Rpb24iKSwg eworICAgICAgICAgICAgYmFzaWM6IHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIk5v cm1hbCIsICJSZXZlcnNlIl0pLAorICAgICAgICAgICAgYWR2YW5jZWQ6IFsiQWx0ZXJuYXRlIiwg IkFsdGVybmF0ZSBSZXZlcnNlIl0KKyAgICAgICAgfSk7CisgICAgICAgIHByb3BlcnRpZXMuYW5p bWF0aW9uRmlsbE1vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlS2V5d29yZFBpY2tl cigiYW5pbWF0aW9uLWZpbGwtbW9kZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRmlsbCBNb2Rl IiksIHRoaXMuX2tleXdvcmRzLmRlZmF1bHRzLmNvbmNhdChbIk5vbmUiLCAiRm9yd2FyZHMiLCAi QmFja3dhcmRzIiwgIkJvdGgiXSkpOworCisgICAgICAgIGFuaW1hdGlvbkRpcmVjdGlvblJvdy5l bGVtZW50LmFwcGVuZENoaWxkKHByb3BlcnRpZXMuYW5pbWF0aW9uRGlyZWN0aW9uLmVsZW1lbnQp OworICAgICAgICBhbmltYXRpb25EaXJlY3Rpb25Sb3cuZWxlbWVudC5hcHBlbmRDaGlsZChwcm9w ZXJ0aWVzLmFuaW1hdGlvbkZpbGxNb2RlLmVsZW1lbnQpOworCisgICAgICAgIGxldCBhbmltYXRp b25TdGF0ZVJvdyA9IG5ldyBXZWJJbnNwZWN0b3IuRGV0YWlsc1NlY3Rpb25Sb3c7CisKKyAgICAg ICAgcHJvcGVydGllcy5hbmltYXRpb25QbGF5U3RhdGUgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3Vh bFN0eWxlS2V5d29yZEljb25MaXN0KCJhbmltYXRpb24tcGxheS1zdGF0ZSIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiU3RhdGUiKSwgWyJSdW5uaW5nIiwgIlBhdXNlZCIsICJJbml0aWFsIl0pOwor CisgICAgICAgIGFuaW1hdGlvblN0YXRlUm93LmVsZW1lbnQuYXBwZW5kQ2hpbGQocHJvcGVydGll cy5hbmltYXRpb25QbGF5U3RhdGUuZWxlbWVudCk7CisKKyAgICAgICAgbGV0IGFuaW1hdGlvbkdy b3VwID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvbkdyb3VwKFthbmltYXRpb25OYW1l Um93LCBhbmltYXRpb25UaW1pbmdSb3csIGFuaW1hdGlvbkR1cmF0aW9uUm93LCBhbmltYXRpb25E aXJlY3Rpb25Sb3csIGFuaW1hdGlvblN0YXRlUm93XSk7CisgICAgICAgIHRoaXMuX3BvcHVsYXRl U2VjdGlvbihncm91cCwgW2FuaW1hdGlvbkdyb3VwXSk7CisgICAgfQorCiAgICAgX25vUmVtYWlu aW5nQ29tbWFTZXBhcmF0ZWRFZGl0b3JJdGVtcyhwcm9wZXJ0eUNvbWJpbmVyLCBwcm9wZXJ0eUVk aXRvcnMpCiAgICAgewogICAgICAgICBpZiAoIXByb3BlcnR5Q29tYmluZXIgfHwgIXByb3BlcnR5 RWRpdG9ycykK