192189 2018-11-29 15:06:59 -0800 Web Inspector: Canvas: add singular localized string for "Record first %s frames" 2018-12-05 21:32:18 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 190856 175485 1 hi hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1483219 0 hi 2018-11-29 15:06:59 -0800 When the auto-capture frame count is 1, "Record first 1 frames" is grammatically weird. It should be "Record first 1 frame". 1483224 1 356071 hi 2018-11-29 15:09:59 -0800 Created attachment 356071 Patch 1483225 2 hi 2018-11-29 15:10:19 -0800 <rdar://problem/46274398> 1484447 3 356071 joepeck 2018-12-03 12:35:54 -0800 Comment on attachment 356071 Patch r=me 1484455 4 356071 commit-queue 2018-12-03 12:49:34 -0800 Comment on attachment 356071 Patch Rejecting attachment 356071 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 356071, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=356071&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=192189&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 356071 from bug 192189. Fetching: https://bugs.webkit.org/attachment.cgi?id=356071 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Joseph Pecoraro']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Source/WebInspectorUI/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js Hunk #1 FAILED at 356. Hunk #2 succeeded at 700 (offset -1 lines). 1 out of 2 hunks FAILED -- saving rejects to file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js.rej patching file Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js patching file Source/WebInspectorUI/UserInterface/Views/CheckboxNavigationItem.js Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Joseph Pecoraro']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/10252149 1484576 5 356425 hi 2018-12-03 15:44:28 -0800 Created attachment 356425 Patch 1484595 6 356425 commit-queue 2018-12-03 16:15:29 -0800 Comment on attachment 356425 Patch Clearing flags on attachment: 356425 Committed r238829: <https://trac.webkit.org/changeset/238829> 1484596 7 commit-queue 2018-12-03 16:15:30 -0800 All reviewed patches have been landed. Closing bug. 356071 2018-11-29 15:09:59 -0800 2018-12-03 15:44:27 -0800 Patch bug-192189-20181129150958.patch text/plain 9867 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDAwYWFmNTQ3YzViM2IzMWE5MjRmNmI5MWY2MzAx M2M5MzI5NmVlY2QuLjY4Y2U3M2MzNjM3MGRjZThkOGQ3MjYwNmI5YTJlZjM0NWU2NTVhZDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTExLTI5ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD YW52YXM6IGFkZCBzaW5ndWxhciBsb2NhbGl6ZWQgc3RyaW5nIGZvciAiUmVjb3JkIGZpcnN0ICVz IGZyYW1lcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MjE4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldyk6CisgICAgICAgIChXSS5DYW52YXNP dmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFt ZUNvdW50KToKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBl Ll91cGRhdGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUNoZWNrYm94TGFiZWwpOiBBZGRlZC4KKyAgICAg ICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBlLl9oYW5kbGVSZWNvcmRp bmdBdXRvQ2FwdHVyZUlucHV0KToKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZp ZXcucHJvdG90eXBlLl9oYW5kbGVDYW52YXNSZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRD aGFuZ2VkKToKKyAgICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcucHJvdG90eXBl LmluaXRpYWxMYXlvdXQpOiBEZWxldGVkLgorICAgICAgICBEcml2ZS1ieTogdXBkYXRlIHRoZSBh dXRvLWNhcHR1cmUgbmF2aWdhdGlvbiBpdGVtIHdoZW4gdGhlIHZpZXcgaXMgZmlyc3QgY3JlYXRl ZCBzbyB0aGVyZSBpcworICAgICAgICBubyBmbGFzaGluZyBvZiBpbiB0aGUgbmF2aWdhdGlvbiBi YXIgKGJlZm9yZSBgaW5pdGlhbExheW91dGAgaXMgY2FsbGVkKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbS5qczoKKyAgICAgICAgKFdJLkNo ZWNrYm94TmF2aWdhdGlvbkl0ZW0pOgorICAgICAgICAoV0kuQ2hlY2tib3hOYXZpZ2F0aW9uSXRl bS5wcm90b3R5cGUuc2V0IGxhYmVsKTogQWRkZWQuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanM6CisKIDIwMTgtMTEtMjggIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdS RVNTSU9OKD8pOiBhbGwgIlNob3cgKiIgZGV2ZWxvcCBtZW51IGl0ZW1zIGNhdXNlIHRoZSBwYWdl IHRvIGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAxNzhmYjM2M2Yw Y2QyYjY4M2E1MWExYWRkMTRjYjEzMmU3Y2Q5ZTI0Li42NjRmMzI3Njc5Mzg0ZjNmNmU1OGMwZWMx MTE1Y2ViYmI1Mjg2OTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxp emF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTM1 Niw3ICszNTYsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgRXZlbnQgTGlzdGVuZXIiXSA9 ICJFbmFibGUgRXZlbnQgTGlzdGVuZXIiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIExheWVy cyBUYWIiXSA9ICJFbmFibGUgTGF5ZXJzIFRhYiI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUg TmV3IFRhYiBCYXIiXSA9ICJFbmFibGUgTmV3IFRhYiBCYXIiOwogbG9jYWxpemVkU3RyaW5nc1si RW5hYmxlIFByb2dyYW0iXSA9ICJFbmFibGUgUHJvZ3JhbSI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJF bmFibGUgU2VsZWN0aW9uIG9mIE11bHRpcGxlIFByb3BlcnRpZXMiXSA9ICJFbmFibGUgU2VsZWN0 aW9uIG9mIE11bHRpcGxlIFByb3BlcnRpZXMiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIGFs bCBicmVha3BvaW50cyAoJXMpIl0gPSAiRW5hYmxlIGFsbCBicmVha3BvaW50cyAoJXMpIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkVuYWJsZSBicmVha3BvaW50cyJdID0gIkVuYWJsZSBicmVha3BvaW50 cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbmFibGUgcGFpbnQgZmxhc2hpbmciXSA9ICJFbmFibGUg cGFpbnQgZmxhc2hpbmciOwpAQCAtNzAyLDYgKzcwMSw3IEBAIGxvY2FsaXplZFN0cmluZ3NbIlJh bmdlIElzc3VlIl0gPSAiUmFuZ2UgSXNzdWUiOwogbG9jYWxpemVkU3RyaW5nc1siUmVhZG9ubHki XSA9ICJSZWFkb25seSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZWFzb25zIGZvciBjb21wb3NpdGlu ZyJdID0gIlJlYXNvbnMgZm9yIGNvbXBvc2l0aW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlYXNv bnMgZm9yIGNvbXBvc2l0aW5nOiJdID0gIlJlYXNvbnMgZm9yIGNvbXBvc2l0aW5nOiI7Citsb2Nh bGl6ZWRTdHJpbmdzWyJSZWNvcmQgZmlyc3QgJXMgZnJhbWUiXSA9ICJSZWNvcmQgZmlyc3QgJXMg ZnJhbWUiOwogbG9jYWxpemVkU3RyaW5nc1siUmVjb3JkIGZpcnN0ICVzIGZyYW1lcyJdID0gIlJl Y29yZCBmaXJzdCAlcyBmcmFtZXMiOwogbG9jYWxpemVkU3RyaW5nc1siUmVjb3JkaW5nIl0gPSAi UmVjb3JkaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlY29yZGluZyAlZCJdID0gIlJlY29yZGlu ZyAlZCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcwppbmRleCAx YjBhMDBiN2E1ZjY0NGRmMWVhZTc2MWE4ZGRkNGY4ZjZiYmY4ZGQxLi42NzE3ODY2MDRmMzI5NjU2 YzNkNmE4YjZhNDczMjRiNWM0ODA4N2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3 Q29udGVudFZpZXcuanMKQEAgLTUxLDE1ICs1MSwxNCBAQCBXSS5DYW52YXNPdmVydmlld0NvbnRl bnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbGxl YwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRF bGVtZW50LnZhbHVlID0gV0kuc2V0dGluZ3MuY2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFt ZUNvdW50LnZhbHVlOwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFt ZUNvdW50SW5wdXRFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImlucHV0IiwgdGhpcy5faGFuZGxl UmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dC5iaW5kKHRoaXMpKTsKIAotICAgICAgICAgICAgbGV0 IGxhYmVsID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpOwotICAgICAgICAgICAg U3RyaW5nLmZvcm1hdChXSS5VSVN0cmluZygiUmVjb3JkIGZpcnN0ICVzIGZyYW1lcyIpLCBbdGhp cy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50XSwgU3RyaW5nLnN0 YW5kYXJkRm9ybWF0dGVycywgbGFiZWwsIChhLCBiKSA9PiB7Ci0gICAgICAgICAgICAgICAgYS5h cHBlbmQoYik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGE7Ci0gICAgICAgICAgICB9KTsKLQor ICAgICAgICAgICAgY29uc3QgbGFiZWwgPSBudWxsOwogICAgICAgICAgICAgdGhpcy5fcmVjb3Jk aW5nQXV0b0NhcHR1cmVOYXZpZ2F0aW9uSXRlbSA9IG5ldyBXSS5DaGVja2JveE5hdmlnYXRpb25J dGVtKCJjYW52YXMtcmVjb3JkaW5nLWF1dG8tY2FwdHVyZSIsIGxhYmVsLCAhIVdJLnNldHRpbmdz LmNhbnZhc1JlY29yZGluZ0F1dG9DYXB0dXJlRW5hYmxlZC52YWx1ZSk7CiAgICAgICAgICAgICB0 aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZU5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0 eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAgICAgICAgICAg ICB0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZU5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVu ZXIoV0kuQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbS5FdmVudC5DaGVja2VkRGlkQ2hhbmdlLCB0aGlz Ll9oYW5kbGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUNoZWNrZWREaWRDaGFuZ2UsIHRoaXMpOworCisg ICAgICAgICAgICBsZXQgZnJhbWVDb3VudCA9IHRoaXMuX3VwZGF0ZVJlY29yZGluZ0F1dG9DYXB0 dXJlSW5wdXRFbGVtZW50U2l6ZSgpOworICAgICAgICAgICAgdGhpcy5fc2V0UmVjb3JkaW5nQXV0 b0NhcHR1cmVGcmFtZUNvdW50KGZyYW1lQ291bnQpOworICAgICAgICAgICAgdGhpcy5fdXBkYXRl UmVjb3JkaW5nQXV0b0NhcHR1cmVDaGVja2JveExhYmVsKGZyYW1lQ291bnQpOwogICAgICAgICB9 CiAKICAgICAgICAgdGhpcy5faW1wb3J0QnV0dG9uTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQnV0 dG9uTmF2aWdhdGlvbkl0ZW0oImltcG9ydC1yZWNvcmRpbmciLCBXSS5VSVN0cmluZygiSW1wb3J0 IiksICJJbWFnZXMvSW1wb3J0LnN2ZyIsIDE1LCAxNSk7CkBAIC05OCwxNiArOTcsNiBAQCBXSS5D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbGxlYwogCiAgICAgLy8gUHJvdGVjdGVkCiAKLSAgICBpbml0aWFsTGF5 b3V0KCkKLSAgICB7Ci0gICAgICAgIHN1cGVyLmluaXRpYWxMYXlvdXQoKTsKLQotICAgICAgICBp ZiAoV0kuQ2FudmFzTWFuYWdlci5zdXBwb3J0c1JlY29yZGluZ0F1dG9DYXB0dXJlKCkpIHsKLSAg ICAgICAgICAgIHRoaXMuX3VwZGF0ZVJlY29yZGluZ0F1dG9DYXB0dXJlSW5wdXRFbGVtZW50U2l6 ZSgpOwotICAgICAgICAgICAgdGhpcy5fc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 KCk7Ci0gICAgICAgIH0KLSAgICB9Ci0KICAgICBjb250ZW50Vmlld0FkZGVkKGNvbnRlbnRWaWV3 KQogICAgIHsKICAgICAgICAgY29udGVudFZpZXcuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJt b3VzZWVudGVyIiwgdGhpcy5fY29udGVudFZpZXdNb3VzZUVudGVyKTsKQEAgLTE5OCw5ICsxODcs MTEgQEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3 Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgV0kuZG9tTWFuYWdlci5oaWRl RE9NTm9kZUhpZ2hsaWdodCgpOwogICAgIH0KIAotICAgIF9zZXRSZWNvcmRpbmdBdXRvQ2FwdHVy ZUZyYW1lQ291bnQoKQorICAgIF9zZXRSZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQoZnJh bWVDb3VudCkKICAgICB7Ci0gICAgICAgIGxldCBmcmFtZUNvdW50ID0gcGFyc2VJbnQodGhpcy5f cmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnZhbHVlKTsKKyAgICAg ICAgaWYgKGlzTmFOKGZyYW1lQ291bnQpKQorICAgICAgICAgICAgZnJhbWVDb3VudCA9IHBhcnNl SW50KHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1 ZSk7CisKICAgICAgICAgY29uc29sZS5hc3NlcnQoIWlzTmFOKGZyYW1lQ291bnQpICYmIGZyYW1l Q291bnQgPj0gMCk7CiAKICAgICAgICAgaWYgKHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlTmF2 aWdhdGlvbkl0ZW0uY2hlY2tlZCkKQEAgLTIxMSw2ICsyMDIsMzAgQEAgV0kuQ2FudmFzT3ZlcnZp ZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db2xsZWMKICAgICAgICAgV0kuY2FudmFzTWFuYWdlci5zZXRSZWNvcmRpbmdBdXRvQ2FwdHVy ZUZyYW1lQ291bnQoZW5hYmxlZCwgZnJhbWVDb3VudCk7CiAgICAgfQogCisgICAgX3VwZGF0ZVJl Y29yZGluZ0F1dG9DYXB0dXJlQ2hlY2tib3hMYWJlbChmcmFtZUNvdW50KQorICAgIHsKKyAgICAg ICAgaWYgKGlzTmFOKGZyYW1lQ291bnQpKQorICAgICAgICAgICAgZnJhbWVDb3VudCA9IHBhcnNl SW50KHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1 ZSk7CisKKyAgICAgICAgbGV0IGxhYmVsID0gZnJhbWVDb3VudCA9PT0gMSA/IFdJLlVJU3RyaW5n KCJSZWNvcmQgZmlyc3QgJXMgZnJhbWUiKSA6IFdJLlVJU3RyaW5nKCJSZWNvcmQgZmlyc3QgJXMg ZnJhbWVzIik7CisKKyAgICAgICAgbGV0IHNlbGVjdGlvblN0YXJ0ID0gdGhpcy5fcmVjb3JkaW5n QXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnNlbGVjdGlvblN0YXJ0OworICAgICAg ICBsZXQgc2VsZWN0aW9uRW5kID0gdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 SW5wdXRFbGVtZW50LnNlbGVjdGlvbkVuZDsKKyAgICAgICAgbGV0IGRpcmVjdGlvbiA9IHRoaXMu X3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC5kaXJlY3Rpb247CisK KyAgICAgICAgbGV0IGZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgp OworICAgICAgICBTdHJpbmcuZm9ybWF0KGxhYmVsLCBbdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1 cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50XSwgU3RyaW5nLnN0YW5kYXJkRm9ybWF0dGVycywgZnJh Z21lbnQsIChhLCBiKSA9PiB7CisgICAgICAgICAgICBhLmFwcGVuZChiKTsKKyAgICAgICAgICAg IHJldHVybiBhOworICAgICAgICB9KTsKKworICAgICAgICB0aGlzLl9yZWNvcmRpbmdBdXRvQ2Fw dHVyZU5hdmlnYXRpb25JdGVtLmxhYmVsID0gZnJhZ21lbnQ7CisKKyAgICAgICAgdGhpcy5fcmVj b3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnNlbGVjdGlvblN0YXJ0ID0g c2VsZWN0aW9uU3RhcnQ7CisgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVD b3VudElucHV0RWxlbWVudC5zZWxlY3Rpb25FbmQgPSBzZWxlY3Rpb25FbmQ7CisgICAgICAgIHRo aXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC5kaXJlY3Rpb24g PSBkaXJlY3Rpb247CisgICAgfQorCiAgICAgX3VwZGF0ZVJlY29yZGluZ0F1dG9DYXB0dXJlSW5w dXRFbGVtZW50U2l6ZSgpCiAgICAgewogICAgICAgICBsZXQgZnJhbWVDb3VudCA9IHBhcnNlSW50 KHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1ZSk7 CkBAIC0yNDAsNyArMjU1LDcgQEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNz IENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgbGV0 IGZyYW1lQ291bnQgPSB0aGlzLl91cGRhdGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0RWxlbWVu dFNpemUoKTsKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVOYXZpZ2F0aW9uSXRl bS5jaGVja2VkID0gISFmcmFtZUNvdW50OwogCi0gICAgICAgIHRoaXMuX3NldFJlY29yZGluZ0F1 dG9DYXB0dXJlRnJhbWVDb3VudCgpOworICAgICAgICB0aGlzLl9zZXRSZWNvcmRpbmdBdXRvQ2Fw dHVyZUZyYW1lQ291bnQoZnJhbWVDb3VudCk7CiAgICAgfQogCiAgICAgX2hhbmRsZVJlY29yZGlu Z0F1dG9DYXB0dXJlQ2hlY2tlZERpZENoYW5nZShldmVudCkKQEAgLTI1Niw2ICsyNzEsOCBAQCBX SS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50 VmlldyBleHRlbmRzIFdJLkNvbGxlYwogICAgIF9oYW5kbGVDYW52YXNSZWNvcmRpbmdBdXRvQ2Fw dHVyZUZyYW1lQ291bnRDaGFuZ2VkKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fcmVjb3Jk aW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnZhbHVlID0gV0kuc2V0dGluZ3Mu Y2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50LnZhbHVlOworCisgICAgICAgIHRo aXMuX3VwZGF0ZVJlY29yZGluZ0F1dG9DYXB0dXJlQ2hlY2tib3hMYWJlbChXSS5zZXR0aW5ncy5j YW52YXNSZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQudmFsdWUpOwogICAgIH0KIAogICAg IF9oYW5kbGVJbXBvcnRCdXR0b25OYXZpZ2F0aW9uSXRlbUNsaWNrZWQoZXZlbnQpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DaGVja2JveE5h dmlnYXRpb25JdGVtLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbS5qcwppbmRleCBjODlhOWQzMTI2Y2M2YjA3ZmIxMGQz N2MzMTFiNWIxMGRkM2M3NWU0Li42ZGE5MTA2YjcxOWU0Y2UwZWE1ODdmNGJiMDBjZGU2ODhhYzYw YWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9DaGVja2JveE5hdmlnYXRpb25JdGVtLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NoZWNrYm94TmF2aWdhdGlvbkl0ZW0uanMKQEAgLTM3LDkgKzM3 LDEwIEBAIFdJLkNoZWNrYm94TmF2aWdhdGlvbkl0ZW0gPSBjbGFzcyBDaGVja2JveE5hdmlnYXRp b25JdGVtIGV4dGVuZHMgV0kuTmF2aWdhdGlvbkl0CiAKICAgICAgICAgdGhpcy5fY2hlY2tib3hM YWJlbCA9IHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJs YWJlbCIpKTsKICAgICAgICAgdGhpcy5fY2hlY2tib3hMYWJlbC5jbGFzc05hbWUgPSAidG9nZ2xl IjsKLSAgICAgICAgdGhpcy5fY2hlY2tib3hMYWJlbC5hcHBlbmQobGFiZWwpOwogICAgICAgICB0 aGlzLl9jaGVja2JveExhYmVsLnNldEF0dHJpYnV0ZSgiZm9yIiwgdGhpcy5fY2hlY2tib3hFbGVt ZW50LmlkKTsKICAgICAgICAgdGhpcy5fY2hlY2tib3hMYWJlbC5hZGRFdmVudExpc3RlbmVyKCJj bGljayIsIHRoaXMuX2hhbmRsZUxhYmVsQ2xpY2suYmluZCh0aGlzKSk7CisKKyAgICAgICAgdGhp cy5sYWJlbCA9IGxhYmVsOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpAQCAtNTQsNiArNTUsMTQg QEAgV0kuQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbSA9IGNsYXNzIENoZWNrYm94TmF2aWdhdGlvbkl0 ZW0gZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uSXQKICAgICAgICAgdGhpcy5fY2hlY2tib3hFbGVtZW50 LmNoZWNrZWQgPSBmbGFnOwogICAgIH0KIAorICAgIHNldCBsYWJlbChsYWJlbCkKKyAgICB7Cisg ICAgICAgIHRoaXMuX2NoZWNrYm94TGFiZWwucmVtb3ZlQ2hpbGRyZW4oKTsKKworICAgICAgICBp ZiAobGFiZWwpOworICAgICAgICAgICAgdGhpcy5fY2hlY2tib3hMYWJlbC5hcHBlbmQobGFiZWwp OworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgZ2V0IGFkZGl0aW9uYWxDbGFzc05h bWVzKCkK 356425 2018-12-03 15:44:28 -0800 2018-12-03 16:15:29 -0800 Patch bug-192189-20181203154427.patch text/plain 9340 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGQ2MDNhN2VhMTZlMTI5ZjhkYjFjNmQwMWYxYjU5 NjdiYmQzM2M5OWMuLjVhYWM0NDgwZmMyMzFjY2MyZmNkZDBjYjhjZTQ4ZWUyZjMwOTMyOGMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTEyLTAzICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBD YW52YXM6IGFkZCBzaW5ndWxhciBsb2NhbGl6ZWQgc3RyaW5nIGZvciAiUmVjb3JkIGZpcnN0ICVz IGZyYW1lcyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MjE4OQorCisgICAgICAgIFJldmlld2VkIGJ5IEpvc2VwaCBQZWNvcmFyby4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcpOgorICAgICAgICAoV0kuQ2FudmFz T3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX3NldFJlY29yZGluZ0F1dG9DYXB0dXJlRnJh bWVDb3VudCk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlw ZS5fdXBkYXRlUmVjb3JkaW5nQXV0b0NhcHR1cmVDaGVja2JveExhYmVsKTogQWRkZWQuCisgICAg ICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlUmVjb3Jk aW5nQXV0b0NhcHR1cmVJbnB1dCk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRW aWV3LnByb3RvdHlwZS5faGFuZGxlQ2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 Q2hhbmdlZCk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlw ZS5pbml0aWFsTGF5b3V0KTogRGVsZXRlZC4KKyAgICAgICAgRHJpdmUtYnk6IHVwZGF0ZSB0aGUg YXV0by1jYXB0dXJlIG5hdmlnYXRpb24gaXRlbSB3aGVuIHRoZSB2aWV3IGlzIGZpcnN0IGNyZWF0 ZWQgc28gdGhlcmUgaXMKKyAgICAgICAgbm8gZmxhc2hpbmcgb2YgaW4gdGhlIG5hdmlnYXRpb24g YmFyIChiZWZvcmUgYGluaXRpYWxMYXlvdXRgIGlzIGNhbGxlZCkuCisKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL0NoZWNrYm94TmF2aWdhdGlvbkl0ZW0uanM6CisgICAgICAgIChXSS5D aGVja2JveE5hdmlnYXRpb25JdGVtKToKKyAgICAgICAgKFdJLkNoZWNrYm94TmF2aWdhdGlvbkl0 ZW0ucHJvdG90eXBlLnNldCBsYWJlbCk6IEFkZGVkLgorCisgICAgICAgICogTG9jYWxpemF0aW9u cy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorCiAyMDE4LTEyLTAzICBNYXR0IEJha2Vy ICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNT SU9OKHIyMzg1OTkpOiBNdWx0aXBsZSBTZWxlY3Rpb246IHJlc3RvcmluZyBzZWxlY3Rpb24gd2hl biBvcGVuaW5nIFdlYkluc3BlY3RvciBwdXRzIHRoZSBUcmVlRWxlbWVudCBpbnRvIGEgcGVybWFu ZW50IHNlbGVjdGVkIHN0YXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9j YWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA0 YzdmNzg2NzlmNTllMjM1YmNkMzQzNDMxMTI1OTJjMzM5ZTQ1ZjcxLi5lNjkxZThkMWZiNmJlZDVh NjA1MWM3ZDVmYjU4YmMzOTg3YmZmMzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anMKQEAgLTcwMSw2ICs3MDEsNyBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJSYW5nZSBJc3N1ZSJdID0g IlJhbmdlIElzc3VlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlYWRvbmx5Il0gPSAiUmVhZG9ubHki OwogbG9jYWxpemVkU3RyaW5nc1siUmVhc29ucyBmb3IgY29tcG9zaXRpbmciXSA9ICJSZWFzb25z IGZvciBjb21wb3NpdGluZyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJSZWFzb25zIGZvciBjb21wb3Np dGluZzoiXSA9ICJSZWFzb25zIGZvciBjb21wb3NpdGluZzoiOworbG9jYWxpemVkU3RyaW5nc1si UmVjb3JkIGZpcnN0ICVzIGZyYW1lIl0gPSAiUmVjb3JkIGZpcnN0ICVzIGZyYW1lIjsKIGxvY2Fs aXplZFN0cmluZ3NbIlJlY29yZCBmaXJzdCAlcyBmcmFtZXMiXSA9ICJSZWNvcmQgZmlyc3QgJXMg ZnJhbWVzIjsKIGxvY2FsaXplZFN0cmluZ3NbIlJlY29yZGluZyJdID0gIlJlY29yZGluZyI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJSZWNvcmRpbmcgJWQiXSA9ICJSZWNvcmRpbmcgJWQiOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3Zl cnZpZXdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcuanMKaW5kZXggMWIwYTAwYjdhNWY2NDRk ZjFlYWU3NjFhOGRkZDRmOGY2YmJmOGRkMS4uNjcxNzg2NjA0ZjMyOTY1NmMzZDZhOGI2YTQ3MzI0 YjVjNDgwODdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3Lmpz CkBAIC01MSwxNSArNTEsMTQgQEAgV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNz IENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgICAg IHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1ZSA9 IFdJLnNldHRpbmdzLmNhbnZhc1JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudC52YWx1ZTsK ICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJpbnB1dCIsIHRoaXMuX2hhbmRsZVJlY29yZGluZ0F1dG9D YXB0dXJlSW5wdXQuYmluZCh0aGlzKSk7CiAKLSAgICAgICAgICAgIGxldCBsYWJlbCA9IGRvY3Vt ZW50LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKLSAgICAgICAgICAgIFN0cmluZy5mb3JtYXQo V0kuVUlTdHJpbmcoIlJlY29yZCBmaXJzdCAlcyBmcmFtZXMiKSwgW3RoaXMuX3JlY29yZGluZ0F1 dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudF0sIFN0cmluZy5zdGFuZGFyZEZvcm1hdHRl cnMsIGxhYmVsLCAoYSwgYikgPT4gewotICAgICAgICAgICAgICAgIGEuYXBwZW5kKGIpOwotICAg ICAgICAgICAgICAgIHJldHVybiBhOwotICAgICAgICAgICAgfSk7Ci0KKyAgICAgICAgICAgIGNv bnN0IGxhYmVsID0gbnVsbDsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJl TmF2aWdhdGlvbkl0ZW0gPSBuZXcgV0kuQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbSgiY2FudmFzLXJl Y29yZGluZy1hdXRvLWNhcHR1cmUiLCBsYWJlbCwgISFXSS5zZXR0aW5ncy5jYW52YXNSZWNvcmRp bmdBdXRvQ2FwdHVyZUVuYWJsZWQudmFsdWUpOwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5n QXV0b0NhcHR1cmVOYXZpZ2F0aW9uSXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0 aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogICAgICAgICAgICAgdGhpcy5fcmVjb3Jk aW5nQXV0b0NhcHR1cmVOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdJLkNoZWNrYm94 TmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2hlY2tlZERpZENoYW5nZSwgdGhpcy5faGFuZGxlUmVjb3Jk aW5nQXV0b0NhcHR1cmVDaGVja2VkRGlkQ2hhbmdlLCB0aGlzKTsKKworICAgICAgICAgICAgbGV0 IGZyYW1lQ291bnQgPSB0aGlzLl91cGRhdGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0RWxlbWVu dFNpemUoKTsKKyAgICAgICAgICAgIHRoaXMuX3NldFJlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVD b3VudChmcmFtZUNvdW50KTsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZVJlY29yZGluZ0F1dG9D YXB0dXJlQ2hlY2tib3hMYWJlbChmcmFtZUNvdW50KTsKICAgICAgICAgfQogCiAgICAgICAgIHRo aXMuX2ltcG9ydEJ1dHRvbk5hdmlnYXRpb25JdGVtID0gbmV3IFdJLkJ1dHRvbk5hdmlnYXRpb25J dGVtKCJpbXBvcnQtcmVjb3JkaW5nIiwgV0kuVUlTdHJpbmcoIkltcG9ydCIpLCAiSW1hZ2VzL0lt cG9ydC5zdmciLCAxNSwgMTUpOwpAQCAtOTgsMTYgKzk3LDYgQEAgV0kuQ2FudmFzT3ZlcnZpZXdD b250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5D b2xsZWMKIAogICAgIC8vIFByb3RlY3RlZAogCi0gICAgaW5pdGlhbExheW91dCgpCi0gICAgewot ICAgICAgICBzdXBlci5pbml0aWFsTGF5b3V0KCk7Ci0KLSAgICAgICAgaWYgKFdJLkNhbnZhc01h bmFnZXIuc3VwcG9ydHNSZWNvcmRpbmdBdXRvQ2FwdHVyZSgpKSB7Ci0gICAgICAgICAgICB0aGlz Ll91cGRhdGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0RWxlbWVudFNpemUoKTsKLSAgICAgICAg ICAgIHRoaXMuX3NldFJlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudCgpOwotICAgICAgICB9 Ci0gICAgfQotCiAgICAgY29udGVudFZpZXdBZGRlZChjb250ZW50VmlldykKICAgICB7CiAgICAg ICAgIGNvbnRlbnRWaWV3LmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VlbnRlciIsIHRo aXMuX2NvbnRlbnRWaWV3TW91c2VFbnRlcik7CkBAIC0xOTgsOSArMTg3LDExIEBAIFdJLkNhbnZh c092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgIFdJLmRvbU1hbmFnZXIuaGlkZURPTU5vZGVIaWdobGln aHQoKTsKICAgICB9CiAKLSAgICBfc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50KCkK KyAgICBfc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50KGZyYW1lQ291bnQpCiAgICAg ewotICAgICAgICBsZXQgZnJhbWVDb3VudCA9IHBhcnNlSW50KHRoaXMuX3JlY29yZGluZ0F1dG9D YXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1ZSk7CisgICAgICAgIGlmIChpc05hTihm cmFtZUNvdW50KSkKKyAgICAgICAgICAgIGZyYW1lQ291bnQgPSBwYXJzZUludCh0aGlzLl9yZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQudmFsdWUpOworCiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KCFpc05hTihmcmFtZUNvdW50KSAmJiBmcmFtZUNvdW50ID49IDApOwog CiAgICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZU5hdmlnYXRpb25JdGVtLmNo ZWNrZWQpCkBAIC0yMTEsNiArMjAyLDMwIEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcg PSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAg ICAgIFdJLmNhbnZhc01hbmFnZXIuc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50KGVu YWJsZWQsIGZyYW1lQ291bnQpOwogICAgIH0KIAorICAgIF91cGRhdGVSZWNvcmRpbmdBdXRvQ2Fw dHVyZUNoZWNrYm94TGFiZWwoZnJhbWVDb3VudCkKKyAgICB7CisgICAgICAgIGlmIChpc05hTihm cmFtZUNvdW50KSkKKyAgICAgICAgICAgIGZyYW1lQ291bnQgPSBwYXJzZUludCh0aGlzLl9yZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQudmFsdWUpOworCisgICAgICAg IGxldCBsYWJlbCA9IGZyYW1lQ291bnQgPT09IDEgPyBXSS5VSVN0cmluZygiUmVjb3JkIGZpcnN0 ICVzIGZyYW1lIikgOiBXSS5VSVN0cmluZygiUmVjb3JkIGZpcnN0ICVzIGZyYW1lcyIpOworCisg ICAgICAgIGxldCBzZWxlY3Rpb25TdGFydCA9IHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJh bWVDb3VudElucHV0RWxlbWVudC5zZWxlY3Rpb25TdGFydDsKKyAgICAgICAgbGV0IHNlbGVjdGlv bkVuZCA9IHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC5z ZWxlY3Rpb25FbmQ7CisgICAgICAgIGxldCBkaXJlY3Rpb24gPSB0aGlzLl9yZWNvcmRpbmdBdXRv Q2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQuZGlyZWN0aW9uOworCisgICAgICAgIGxldCBm cmFnbWVudCA9IGRvY3VtZW50LmNyZWF0ZURvY3VtZW50RnJhZ21lbnQoKTsKKyAgICAgICAgU3Ry aW5nLmZvcm1hdChsYWJlbCwgW3RoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElu cHV0RWxlbWVudF0sIFN0cmluZy5zdGFuZGFyZEZvcm1hdHRlcnMsIGZyYWdtZW50LCAoYSwgYikg PT4geworICAgICAgICAgICAgYS5hcHBlbmQoYik7CisgICAgICAgICAgICByZXR1cm4gYTsKKyAg ICAgICAgfSk7CisKKyAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVOYXZpZ2F0aW9u SXRlbS5sYWJlbCA9IGZyYWdtZW50OworCisgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0 dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC5zZWxlY3Rpb25TdGFydCA9IHNlbGVjdGlvblN0YXJ0 OworICAgICAgICB0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1l bnQuc2VsZWN0aW9uRW5kID0gc2VsZWN0aW9uRW5kOworICAgICAgICB0aGlzLl9yZWNvcmRpbmdB dXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQuZGlyZWN0aW9uID0gZGlyZWN0aW9uOwor ICAgIH0KKwogICAgIF91cGRhdGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0RWxlbWVudFNpemUo KQogICAgIHsKICAgICAgICAgbGV0IGZyYW1lQ291bnQgPSBwYXJzZUludCh0aGlzLl9yZWNvcmRp bmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQudmFsdWUpOwpAQCAtMjQwLDcgKzI1 NSw3IEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmll d0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgIGxldCBmcmFtZUNvdW50ID0g dGhpcy5fdXBkYXRlUmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dEVsZW1lbnRTaXplKCk7CiAgICAg ICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlTmF2aWdhdGlvbkl0ZW0uY2hlY2tlZCA9ICEh ZnJhbWVDb3VudDsKIAotICAgICAgICB0aGlzLl9zZXRSZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1l Q291bnQoKTsKKyAgICAgICAgdGhpcy5fc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 KGZyYW1lQ291bnQpOwogICAgIH0KIAogICAgIF9oYW5kbGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUNo ZWNrZWREaWRDaGFuZ2UoZXZlbnQpCkBAIC0yNTYsNiArMjcxLDggQEAgV0kuQ2FudmFzT3ZlcnZp ZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db2xsZWMKICAgICBfaGFuZGxlQ2FudmFzUmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 Q2hhbmdlZChldmVudCkKICAgICB7CiAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJl RnJhbWVDb3VudElucHV0RWxlbWVudC52YWx1ZSA9IFdJLnNldHRpbmdzLmNhbnZhc1JlY29yZGlu Z0F1dG9DYXB0dXJlRnJhbWVDb3VudC52YWx1ZTsKKworICAgICAgICB0aGlzLl91cGRhdGVSZWNv cmRpbmdBdXRvQ2FwdHVyZUNoZWNrYm94TGFiZWwoV0kuc2V0dGluZ3MuY2FudmFzUmVjb3JkaW5n QXV0b0NhcHR1cmVGcmFtZUNvdW50LnZhbHVlKTsKICAgICB9CiAKICAgICBfaGFuZGxlSW1wb3J0 QnV0dG9uTmF2aWdhdGlvbkl0ZW1DbGlja2VkKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NoZWNrYm94TmF2 aWdhdGlvbkl0ZW0uanMKaW5kZXggYzg5YTlkMzEyNmNjNmIwN2ZiMTBkMzdjMzExYjViMTBkZDNj NzVlNC4uNmRhOTEwNmI3MTllNGNlMGVhNTg3ZjRiYjAwY2RlNjg4YWM2MGFjYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2hlY2tib3hOYXZp Z2F0aW9uSXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9DaGVja2JveE5hdmlnYXRpb25JdGVtLmpzCkBAIC0zNyw5ICszNywxMCBAQCBXSS5DaGVj a2JveE5hdmlnYXRpb25JdGVtID0gY2xhc3MgQ2hlY2tib3hOYXZpZ2F0aW9uSXRlbSBleHRlbmRz IFdJLk5hdmlnYXRpb25JdAogCiAgICAgICAgIHRoaXMuX2NoZWNrYm94TGFiZWwgPSB0aGlzLmVs ZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgibGFiZWwiKSk7CiAgICAg ICAgIHRoaXMuX2NoZWNrYm94TGFiZWwuY2xhc3NOYW1lID0gInRvZ2dsZSI7Ci0gICAgICAgIHRo aXMuX2NoZWNrYm94TGFiZWwuYXBwZW5kKGxhYmVsKTsKICAgICAgICAgdGhpcy5fY2hlY2tib3hM YWJlbC5zZXRBdHRyaWJ1dGUoImZvciIsIHRoaXMuX2NoZWNrYm94RWxlbWVudC5pZCk7CiAgICAg ICAgIHRoaXMuX2NoZWNrYm94TGFiZWwuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9o YW5kbGVMYWJlbENsaWNrLmJpbmQodGhpcykpOworCisgICAgICAgIHRoaXMubGFiZWwgPSBsYWJl bDsKICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTU0LDYgKzU1LDE0IEBAIFdJLkNoZWNrYm94 TmF2aWdhdGlvbkl0ZW0gPSBjbGFzcyBDaGVja2JveE5hdmlnYXRpb25JdGVtIGV4dGVuZHMgV0ku TmF2aWdhdGlvbkl0CiAgICAgICAgIHRoaXMuX2NoZWNrYm94RWxlbWVudC5jaGVja2VkID0gZmxh ZzsKICAgICB9CiAKKyAgICBzZXQgbGFiZWwobGFiZWwpCisgICAgeworICAgICAgICB0aGlzLl9j aGVja2JveExhYmVsLnJlbW92ZUNoaWxkcmVuKCk7CisKKyAgICAgICAgaWYgKGxhYmVsKTsKKyAg ICAgICAgICAgIHRoaXMuX2NoZWNrYm94TGFiZWwuYXBwZW5kKGxhYmVsKTsKKyAgICB9CisKICAg ICAvLyBQcm90ZWN0ZWQKIAogICAgIGdldCBhZGRpdGlvbmFsQ2xhc3NOYW1lcygpCg==