173437 2017-06-15 14:20:19 -0700 Web Inspector: Add small delay before showing the progress spinner when loading resources 2017-06-30 14:57:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 hi hi commit-queue inspector-bugzilla-changes joepeck nvasilyev oldest_to_newest 1319705 0 hi 2017-06-15 14:20:19 -0700 For small and quickly loading files, it is annoying to see the IndeterminateProgressSpinner briefly appear before being removed almost immediately. 1319734 1 313014 hi 2017-06-15 15:04:28 -0700 Created attachment 313014 Patch 1319746 2 313014 joepeck 2017-06-15 15:37:25 -0700 Comment on attachment 313014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313014&action=review > Source/WebInspectorUI/ChangeLog:13 > + Delay the creation of the spinner for 100ms. If the content is available before then, just > + clear the timeout and the spinner will never be created/shown. I know I suggested 100ms, but lets try to arrive at this with more data. What is the average amount of time it takes for the frontend to load an image when inspecting (1) locally and (2) remotely. Testing with your Mac Retina laptop should good. I can get you an iOS device to test with. Once we have that average / bucketed histogram we can provide justification for this currently magic value. 1319779 3 313027 hi 2017-06-15 16:59:00 -0700 Created attachment 313027 Patch 1320767 4 313027 nvasilyev 2017-06-19 12:01:00 -0700 Comment on attachment 313027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313027&action=review > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:50 > + console.time("Resource"); This shouldn't be in the patch. 1324512 5 313027 joepeck 2017-06-30 13:57:58 -0700 Comment on attachment 313027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313027&action=review r=me > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:40 > + // Append a spinner while waiting for contentAvailable. The subclasses are responsible Nit: "The subclasses are" => "Subclasses are" You can also say in the comment "... by calling removeLoadingIndicator". > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:46 > + }, 50); Lets make this 100 to match the ChangeLog. 1324527 6 314288 hi 2017-06-30 14:15:22 -0700 Created attachment 314288 Patch 1324560 7 314288 commit-queue 2017-06-30 14:57:13 -0700 Comment on attachment 314288 Patch Clearing flags on attachment: 314288 Committed r219017: <http://trac.webkit.org/changeset/219017> 1324561 8 commit-queue 2017-06-30 14:57:14 -0700 All reviewed patches have been landed. Closing bug. 313014 2017-06-15 15:04:28 -0700 2017-06-15 16:59:00 -0700 Patch 173437.diff text/plain 3066 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDgyODFhZmU5YjdmLi45MmVkY2NmOTMxOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMDYtMTUgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBzbWFsbCBkZWxheSBiZWZvcmUgc2hvd2luZyB0aGUgcHJvZ3Jlc3Mgc3Bpbm5lciB3aGVuIGxv YWRpbmcgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzM0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fY29udGVudEF2YWlsYWJsZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUuX2hh c0NvbnRlbnQpOgorICAgICAgICBEZWxheSB0aGUgY3JlYXRpb24gb2YgdGhlIHNwaW5uZXIgZm9y IDEwMG1zLiAgSWYgdGhlIGNvbnRlbnQgaXMgYXZhaWxhYmxlIGJlZm9yZSB0aGVuLCBqdXN0Cisg ICAgICAgIGNsZWFyIHRoZSB0aW1lb3V0IGFuZCB0aGUgc3Bpbm5lciB3aWxsIG5ldmVyIGJlIGNy ZWF0ZWQvc2hvd24uCisKIDIwMTctMDYtMTUgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTZWFyY2ggaGlnaGxpZ2h0IGRvZXNu J3Qgc2hvdyB1cCBpbiByZXNvdXJjZXMgd2hlbiBwYXVzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRl bnRWaWV3LmpzCmluZGV4IGJjZjI0YWFkNTUyLi5iZjcxN2ZhNjg4MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZUNvbnRlbnRWaWV3LmpzCkBAIC0zNiwxMCArMzYsMTQgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5z cGVjdG8KIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChzdHlsZUNsYXNzTmFt ZSwgInJlc291cmNlIik7CiAKLSAgICAgICAgLy8gQXBwZW5kIGEgc3Bpbm5lciB3aGlsZSB3YWl0 aW5nIGZvciBjb250ZW50QXZhaWxhYmxlLiBUaGUgc3ViY2xhc3NlcyBhcmUgcmVzcG9uc2libGUg Zm9yIHJlbW92aW5nCi0gICAgICAgIC8vIHRoZSBzcGlubmVyIGJlZm9yZSBzaG93aW5nIHRoZSBy ZXNvdXJjZSBjb250ZW50LgotICAgICAgICB2YXIgc3Bpbm5lciA9IG5ldyBXZWJJbnNwZWN0b3Iu SW5kZXRlcm1pbmF0ZVByb2dyZXNzU3Bpbm5lcjsKLSAgICAgICAgdGhpcy5lbGVtZW50LmFwcGVu ZENoaWxkKHNwaW5uZXIuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3NwaW5uZXJUaW1lb3V0ID0g c2V0VGltZW91dCgoKSA9PiB7CisgICAgICAgICAgICAvLyBBcHBlbmQgYSBzcGlubmVyIHdoaWxl IHdhaXRpbmcgZm9yIGNvbnRlbnRBdmFpbGFibGUuIFRoZSBzdWJjbGFzc2VzIGFyZSByZXNwb25z aWJsZQorICAgICAgICAgICAgLy8gZm9yIHJlbW92aW5nIHRoZSBzcGlubmVyIGJlZm9yZSBzaG93 aW5nIHRoZSByZXNvdXJjZSBjb250ZW50LgorICAgICAgICAgICAgbGV0IHNwaW5uZXIgPSBuZXcg V2ViSW5zcGVjdG9yLkluZGV0ZXJtaW5hdGVQcm9ncmVzc1NwaW5uZXI7CisgICAgICAgICAgICB0 aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc3Bpbm5lci5lbGVtZW50KTsKKworICAgICAgICAgICAg dGhpcy5fc3Bpbm5lclRpbWVvdXQgPSB1bmRlZmluZWQ7CisgICAgICAgIH0sIDEwMCk7CiAKICAg ICAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5fbW91c2VX YXNDbGlja2VkLmJpbmQodGhpcyksIGZhbHNlKTsKIApAQCAtMTAxLDYgKzEwNSwxMSBAQCBXZWJJ bnNwZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcg ZXh0ZW5kcyBXZWJJbnNwZWN0bwogCiAgICAgX2NvbnRlbnRBdmFpbGFibGUocGFyYW1ldGVycykK ICAgICB7CisgICAgICAgIGlmICh0aGlzLl9zcGlubmVyVGltZW91dCkgeworICAgICAgICAgICAg Y2xlYXJUaW1lb3V0KHRoaXMuX3NwaW5uZXJUaW1lb3V0KTsKKyAgICAgICAgICAgIHRoaXMuX3Nw aW5uZXJUaW1lb3V0ID0gdW5kZWZpbmVkOworICAgICAgICB9CisKICAgICAgICAgaWYgKHBhcmFt ZXRlcnMuZXJyb3IpIHsKICAgICAgICAgICAgIHRoaXMuX2NvbnRlbnRFcnJvcihwYXJhbWV0ZXJz LmVycm9yKTsKICAgICAgICAgICAgIHJldHVybjsKQEAgLTEyNSw3ICsxMzQsNyBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcgZXh0 ZW5kcyBXZWJJbnNwZWN0bwogCiAgICAgX2hhc0NvbnRlbnQoKQogICAgIHsKLSAgICAgICAgcmV0 dXJuICF0aGlzLmVsZW1lbnQucXVlcnlTZWxlY3RvcigiLmluZGV0ZXJtaW5hdGUtcHJvZ3Jlc3Mt c3Bpbm5lciIpOworICAgICAgICByZXR1cm4gdGhpcy5lbGVtZW50Lmhhc0NoaWxkTm9kZXMoKSAm JiAhdGhpcy5lbGVtZW50LnF1ZXJ5U2VsZWN0b3IoIi5pbmRldGVybWluYXRlLXByb2dyZXNzLXNw aW5uZXIiKTsKICAgICB9CiAKICAgICBfaXNzdWVXYXNBZGRlZChldmVudCkK 313027 2017-06-15 16:59:00 -0700 2017-06-30 14:15:22 -0700 Patch 173437.diff text/plain 7534 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDgyODFhZmU5YjdmLi42YjFiYmY0MWMyNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTctMDYtMTUgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBzbWFsbCBkZWxheSBiZWZvcmUgc2hvd2luZyB0aGUgcHJvZ3Jlc3Mgc3Bpbm5lciB3aGVuIGxv YWRpbmcgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzM0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5yZW1vdmVMb2FkaW5nSW5kaWNh dG9yKTogQWRkZWQuCisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldy5w cm90b3R5cGUuX2NvbnRlbnRFcnJvcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuX2hhc0NvbnRlbnQpOgorICAgICAgICBEZWxheSB0aGUgY3Jl YXRpb24gb2YgdGhlIHNwaW5uZXIgZm9yIDEwMG1zLiAgSWYgdGhlIGNvbnRlbnQgaXMgYXZhaWxh YmxlIGJlZm9yZSB0aGVuLCBqdXN0CisgICAgICAgIGNsZWFyIHRoZSB0aW1lb3V0IGFuZCB0aGUg c3Bpbm5lciB3aWxsIG5ldmVyIGJlIGNyZWF0ZWQvc2hvd24uCisKKyAgICAgICAgV2UgbWVhc3Vy ZWQgYW4gYXZlcmFnZSBvZiAzNW1zIHRvIGxvYWQgYW5kIGRpc3BsYXkgaW1hZ2VzIHdpdGggc2xv dyBjYXNlcyBiZWluZyBhcm91bmQgNTVtcy4KKyAgICAgICAgMTAwbXMgd2FzIGNob3NlbiBmb3Ig dGhlIHRpbWVvdXQgdG8gZ2l2ZSBzb21lIHJvb20gdG8gYWxsb3cgZm9yIGFibm9ybWFsbHkgc2xv dyBsb2FkaW5nCisgICAgICAgIHdoaWxlIG5vdCBiZWluZyB0b28gbG9uZyBhcyB0byBiZSBvdXRy aWdodCBub3RpY2FibGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbnRSZXNv dXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZvbnRSZXNvdXJjZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5jb250ZW50QXZhaWxhYmxlKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5JbWFnZVJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmNvbnRlbnRBdmFpbGFi bGUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZpZXcucHJv dG90eXBlLl9jb250ZW50V2lsbFBvcHVsYXRlKToKKyAgICAgICAgQ2FsbHMgdGhlIG5ldyBwcm90 ZWN0ZWQgZnVuY3Rpb24gcmVtb3ZlTG9hZGluZ0luZGljYXRvciB0byBlbnN1cmUgdGhhdCB0aGUg c3Bpbm5lciAoYW5kIGFueQorICAgICAgICBvdGhlciBlbGVtZW50KSBpcyByZW1vdmVkLgorCisg ICAgICAgIFRoaXMgaXMgbmVjZXNzYXJ5IGJlY2F1c2UgVGV4dFJlc291cmNlQ29udGVudFZpZXcg ZWZmZWN0aXZlbHkgaGFzIHR3byBwaGFzZXMgb2YgbG9hZGluZyBpdHMKKyAgICAgICAgY29udGVu dDogZ2V0dGluZyB0aGUgY29udGVudCBhbmQgZm9ybWF0dGluZyBpdCBmb3IgZGlzcGxheS4gIFRo ZSBmaXJzdCBmb2xsb3dzIHRoZSBzYW1lIHBhdGgKKyAgICAgICAgYXMgdGhlIG90aGVyIFJlc291 cmNlQ29udGVudFZpZXcgc3ViY2xhc3NlcywgdGhlIHNlY29uZCB3YWl0cyBmb3IgdGhlIENvbnRl bnRXaWxsUG9wdWxhdGUKKyAgICAgICAgZXZlbnQgb24gU291cmNlQ29kZVRleHRFZGl0b3IgYmVm b3JlIGl0IGFjdHVhbGx5IGFkZHMgdGhlIGNvbnRlbnQgYXMgYSBzdWJ2aWV3LiAgSW4gdGhpcwor ICAgICAgICBjYXNlLCB0aGUgc3Bpbm5lciBzaG91bGQgb25seSBiZSByZW1vdmVkIHJpZ2h0IGJl Zm9yZSB0aGUgY29udGVudCBpcyBhY3R1YWxseSBhZGRlZCwgbm90CisgICAgICAgIG9uY2UgaXQn cyByZWFkeS4KKwogMjAxNy0wNi0xNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNlYXJjaCBoaWdobGlnaHQgZG9lc24ndCBz aG93IHVwIGluIHJlc291cmNlcyB3aGVuIHBhdXNlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Gb250UmVzb3VyY2VD b250ZW50Vmlldy5qcwppbmRleCA3NzQwNWY4MjI3NC4uZjZiZmQwZTk4YTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbnRSZXNvdXJjZUNv bnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC03Miw3ICs3Miw3IEBAIFdlYkluc3Bl Y3Rvci5Gb250UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIEZvbnRSZXNvdXJjZUNvbnRlbnRW aWV3IGV4dGVuZHMgV2ViCiAgICAgICAgIGlmICh0aGlzLl9zdHlsZUVsZW1lbnQgJiYgdGhpcy5f c3R5bGVFbGVtZW50LnBhcmVudE5vZGUpCiAgICAgICAgICAgICB0aGlzLl9zdHlsZUVsZW1lbnQu cGFyZW50Tm9kZS5yZW1vdmVDaGlsZCh0aGlzLl9zdHlsZUVsZW1lbnQpOwogCi0gICAgICAgIHRo aXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLnJlbW92ZUxvYWRpbmdJ bmRpY2F0b3IoKTsKIAogICAgICAgICB0aGlzLl9zdHlsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJzdHlsZSIpOwogICAgICAgICB0aGlzLl9zdHlsZUVsZW1lbnQudGV4dENvbnRl bnQgPSAiQGZvbnQtZmFjZSB7IGZvbnQtZmFtaWx5OiBcIiIgKyB1bmlxdWVGb250TmFtZSArICJc Ijsgc3JjOiB1cmwoIiArIHRoaXMuX2ZvbnRPYmplY3RVUkwgKyAiKSIgKyBmb3JtYXQgKyAiOyB9 IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCBjZDEyNWY2 YzExNi4uZDY5YzRiMGE5YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZp ZXcuanMKQEAgLTUzLDcgKzUzLDcgQEAgV2ViSW5zcGVjdG9yLkltYWdlUmVzb3VyY2VDb250ZW50 VmlldyA9IGNsYXNzIEltYWdlUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFcKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGls ZHJlbigpOworICAgICAgICB0aGlzLnJlbW92ZUxvYWRpbmdJbmRpY2F0b3IoKTsKIAogICAgICAg ICB0aGlzLl9pbWFnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbWciKTsKICAg ICAgICAgdGhpcy5faW1hZ2VFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCBmdW5jdGlv bigpIHsgVVJMLnJldm9rZU9iamVjdFVSTChvYmplY3RVUkwpOyB9KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJj ZUNvbnRlbnRWaWV3LmpzCmluZGV4IGJjZjI0YWFkNTUyLi5jNzlmNDE4ZGJhZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCkBAIC0zNiwxMyArMzYsMTggQEAgV2ViSW5zcGVjdG9y LlJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMg V2ViSW5zcGVjdG8KIAogICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChzdHlsZUNs YXNzTmFtZSwgInJlc291cmNlIik7CiAKLSAgICAgICAgLy8gQXBwZW5kIGEgc3Bpbm5lciB3aGls ZSB3YWl0aW5nIGZvciBjb250ZW50QXZhaWxhYmxlLiBUaGUgc3ViY2xhc3NlcyBhcmUgcmVzcG9u c2libGUgZm9yIHJlbW92aW5nCi0gICAgICAgIC8vIHRoZSBzcGlubmVyIGJlZm9yZSBzaG93aW5n IHRoZSByZXNvdXJjZSBjb250ZW50LgotICAgICAgICB2YXIgc3Bpbm5lciA9IG5ldyBXZWJJbnNw ZWN0b3IuSW5kZXRlcm1pbmF0ZVByb2dyZXNzU3Bpbm5lcjsKLSAgICAgICAgdGhpcy5lbGVtZW50 LmFwcGVuZENoaWxkKHNwaW5uZXIuZWxlbWVudCk7CisgICAgICAgIHRoaXMuX3NwaW5uZXJUaW1l b3V0ID0gc2V0VGltZW91dCgoKSA9PiB7CisgICAgICAgICAgICAvLyBBcHBlbmQgYSBzcGlubmVy IHdoaWxlIHdhaXRpbmcgZm9yIGNvbnRlbnRBdmFpbGFibGUuIFRoZSBzdWJjbGFzc2VzIGFyZSBy ZXNwb25zaWJsZQorICAgICAgICAgICAgLy8gZm9yIHJlbW92aW5nIHRoZSBzcGlubmVyIGJlZm9y ZSBzaG93aW5nIHRoZSByZXNvdXJjZSBjb250ZW50LgorICAgICAgICAgICAgbGV0IHNwaW5uZXIg PSBuZXcgV2ViSW5zcGVjdG9yLkluZGV0ZXJtaW5hdGVQcm9ncmVzc1NwaW5uZXI7CisgICAgICAg ICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc3Bpbm5lci5lbGVtZW50KTsKKworICAgICAg ICAgICAgdGhpcy5fc3Bpbm5lclRpbWVvdXQgPSB1bmRlZmluZWQ7CisgICAgICAgIH0sIDUwKTsK IAogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9t b3VzZVdhc0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCisgICAgICAgIGNvbnNvbGUudGlt ZSgiUmVzb3VyY2UiKTsKICAgICAgICAgLy8gUmVxdWVzdCBjb250ZW50IGxhc3Qgc28gdGhlIHNw aW5uZXIgd2lsbCBhbHdheXMgYmUgcmVtb3ZlZCBpbiBjYXNlIHRoZSBjb250ZW50IGlzIGltbWVk aWF0ZWx5IGF2YWlsYWJsZS4KICAgICAgICAgcmVzb3VyY2UucmVxdWVzdENvbnRlbnQoKS50aGVu KHRoaXMuX2NvbnRlbnRBdmFpbGFibGUuYmluZCh0aGlzKSkuY2F0Y2godGhpcy5zaG93R2VuZXJp Y0Vycm9yTWVzc2FnZS5iaW5kKHRoaXMpKTsKIApAQCAtOTcsNiArMTAyLDE4IEBAIFdlYkluc3Bl Y3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRl bmRzIFdlYkluc3BlY3RvCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuaXNzdWVNYW5hZ2VyLnJl bW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CiAgICAgfQogCisgICAgLy8gUHJv dGVjdGVkCisKKyAgICByZW1vdmVMb2FkaW5nSW5kaWNhdG9yKCkKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9zcGlubmVyVGltZW91dCkgeworICAgICAgICAgICAgY2xlYXJUaW1lb3V0KHRoaXMu X3NwaW5uZXJUaW1lb3V0KTsKKyAgICAgICAgICAgIHRoaXMuX3NwaW5uZXJUaW1lb3V0ID0gdW5k ZWZpbmVkOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CisgICAgfQorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX2NvbnRlbnRBdmFpbGFibGUocGFy YW1ldGVycykKQEAgLTExNyw3ICsxMzQsOCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50 VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogICAg ICAgICBpZiAodGhpcy5faGFzQ29udGVudCgpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAg ICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLnJlbW92ZUxv YWRpbmdJbmRpY2F0b3IoKTsKKwogICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoV2Vi SW5zcGVjdG9yLmNyZWF0ZU1lc3NhZ2VUZXh0VmlldyhlcnJvciwgdHJ1ZSkpOwogCiAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5SZXNvdXJjZUNvbnRl bnRWaWV3LkV2ZW50LkNvbnRlbnRFcnJvcik7CkBAIC0xMjUsNyArMTQzLDcgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVu ZHMgV2ViSW5zcGVjdG8KIAogICAgIF9oYXNDb250ZW50KCkKICAgICB7Ci0gICAgICAgIHJldHVy biAhdGhpcy5lbGVtZW50LnF1ZXJ5U2VsZWN0b3IoIi5pbmRldGVybWluYXRlLXByb2dyZXNzLXNw aW5uZXIiKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuZWxlbWVudC5oYXNDaGlsZE5vZGVzKCkgJiYg IXRoaXMuZWxlbWVudC5xdWVyeVNlbGVjdG9yKCIuaW5kZXRlcm1pbmF0ZS1wcm9ncmVzcy1zcGlu bmVyIik7CiAgICAgfQogCiAgICAgX2lzc3VlV2FzQWRkZWQoZXZlbnQpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rl eHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IDJkYWE1ODlmYjI2Li42Y2U5ZTU2ZTk2MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4 dFJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTE5MSw3ICsxOTEs OCBAQCBXZWJJbnNwZWN0b3IuVGV4dFJlc291cmNlQ29udGVudFZpZXcgPSBjbGFzcyBUZXh0UmVz b3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdlYgogICAgICAgICBpZiAodGhpcy5fdGV4dEVkaXRv ci5wYXJlbnRWaWV3ID09PSB0aGlzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRo aXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOworICAgICAgICB0aGlzLnJlbW92ZUxvYWRpbmdJ bmRpY2F0b3IoKTsKKwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fdGV4dEVkaXRvcik7 CiAgICAgfQogCg== 314288 2017-06-30 14:15:22 -0700 2017-06-30 14:57:13 -0700 Patch 173437.diff text/plain 7275 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGZlZGMzZDdkNzFjLi4zYmI2M2U2NTU2NyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTctMDYtMzAgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFk ZCBzbWFsbCBkZWxheSBiZWZvcmUgc2hvd2luZyB0aGUgcHJvZ3Jlc3Mgc3Bpbm5lciB3aGVuIGxv YWRpbmcgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzM0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVjb3Jhcm8uCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuUmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5cGUucmVtb3ZlTG9hZGluZ0luZGlj YXRvcik6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcu cHJvdG90eXBlLl9jb250ZW50RXJyb3IpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl Q29udGVudFZpZXcucHJvdG90eXBlLl9oYXNDb250ZW50KToKKyAgICAgICAgRGVsYXkgdGhlIGNy ZWF0aW9uIG9mIHRoZSBzcGlubmVyIGZvciAxMDBtcy4gIElmIHRoZSBjb250ZW50IGlzIGF2YWls YWJsZSBiZWZvcmUgdGhlbiwganVzdAorICAgICAgICBjbGVhciB0aGUgdGltZW91dCBhbmQgdGhl IHNwaW5uZXIgd2lsbCBuZXZlciBiZSBjcmVhdGVkL3Nob3duLgorCisgICAgICAgIFdlIG1lYXN1 cmVkIGFuIGF2ZXJhZ2Ugb2YgMzVtcyB0byBsb2FkIGFuZCBkaXNwbGF5IGltYWdlcyB3aXRoIHNs b3cgY2FzZXMgYmVpbmcgYXJvdW5kIDU1bXMuCisgICAgICAgIDEwMG1zIHdhcyBjaG9zZW4gZm9y IHRoZSB0aW1lb3V0IHRvIGdpdmUgc29tZSByb29tIHRvIGFsbG93IGZvciBhYm5vcm1hbGx5IHNs b3cgbG9hZGluZworICAgICAgICB3aGlsZSBub3QgYmVpbmcgdG9vIGxvbmcgYXMgdG8gYmUgb3V0 cmlnaHQgbm90aWNhYmxlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Gb250UmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Gb250UmVzb3VyY2VD b250ZW50Vmlldy5wcm90b3R5cGUuY29udGVudEF2YWlsYWJsZSk6CisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5jb250ZW50QXZhaWxh YmxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3LnBy b3RvdHlwZS5fY29udGVudFdpbGxQb3B1bGF0ZSk6CisgICAgICAgIENhbGxzIHRoZSBuZXcgcHJv dGVjdGVkIGZ1bmN0aW9uIHJlbW92ZUxvYWRpbmdJbmRpY2F0b3IgdG8gZW5zdXJlIHRoYXQgdGhl IHNwaW5uZXIgKGFuZCBhbnkKKyAgICAgICAgb3RoZXIgZWxlbWVudCkgaXMgcmVtb3ZlZC4KKwor ICAgICAgICBUaGlzIGlzIG5lY2Vzc2FyeSBiZWNhdXNlIFRleHRSZXNvdXJjZUNvbnRlbnRWaWV3 IGVmZmVjdGl2ZWx5IGhhcyB0d28gcGhhc2VzIG9mIGxvYWRpbmcgaXRzCisgICAgICAgIGNvbnRl bnQ6IGdldHRpbmcgdGhlIGNvbnRlbnQgYW5kIGZvcm1hdHRpbmcgaXQgZm9yIGRpc3BsYXkuICBU aGUgZmlyc3QgZm9sbG93cyB0aGUgc2FtZSBwYXRoCisgICAgICAgIGFzIHRoZSBvdGhlciBSZXNv dXJjZUNvbnRlbnRWaWV3IHN1YmNsYXNzZXMsIHRoZSBzZWNvbmQgd2FpdHMgZm9yIHRoZSBDb250 ZW50V2lsbFBvcHVsYXRlCisgICAgICAgIGV2ZW50IG9uIFNvdXJjZUNvZGVUZXh0RWRpdG9yIGJl Zm9yZSBpdCBhY3R1YWxseSBhZGRzIHRoZSBjb250ZW50IGFzIGEgc3Vidmlldy4gIEluIHRoaXMK KyAgICAgICAgY2FzZSwgdGhlIHNwaW5uZXIgc2hvdWxkIG9ubHkgYmUgcmVtb3ZlZCByaWdodCBi ZWZvcmUgdGhlIGNvbnRlbnQgaXMgYWN0dWFsbHkgYWRkZWQsIG5vdAorICAgICAgICBvbmNlIGl0 J3MgcmVhZHkuCisKIDIwMTctMDYtMjggIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3RydW1lbnQgYWN0aXZlIHBpeGVsIG1lbW9y eSB1c2VkIGJ5IGNhbnZhc2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Gb250UmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3Lmpz CmluZGV4IDc3NDA1ZjgyMjc0Li5mNmJmZDBlOThhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291 cmNlQ29udGVudFZpZXcuanMKQEAgLTcyLDcgKzcyLDcgQEAgV2ViSW5zcGVjdG9yLkZvbnRSZXNv dXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgRm9udFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBX ZWIKICAgICAgICAgaWYgKHRoaXMuX3N0eWxlRWxlbWVudCAmJiB0aGlzLl9zdHlsZUVsZW1lbnQu cGFyZW50Tm9kZSkKICAgICAgICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudC5wYXJlbnROb2RlLnJl bW92ZUNoaWxkKHRoaXMuX3N0eWxlRWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LnJl bW92ZUNoaWxkcmVuKCk7CisgICAgICAgIHRoaXMucmVtb3ZlTG9hZGluZ0luZGljYXRvcigpOwog CiAgICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInN0 eWxlIik7CiAgICAgICAgIHRoaXMuX3N0eWxlRWxlbWVudC50ZXh0Q29udGVudCA9ICJAZm9udC1m YWNlIHsgZm9udC1mYW1pbHk6IFwiIiArIHVuaXF1ZUZvbnROYW1lICsgIlwiOyBzcmM6IHVybCgi ICsgdGhpcy5fZm9udE9iamVjdFVSTCArICIpIiArIGZvcm1hdCArICI7IH0iOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJj ZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCmluZGV4IGE1NDFiODM5ZDIzLi45ZTBhNmM0 YWViMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtNTMs NyArNTMsNyBAQCBXZWJJbnNwZWN0b3IuSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3Mg SW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgVwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CisgICAg ICAgIHRoaXMucmVtb3ZlTG9hZGluZ0luZGljYXRvcigpOwogCiAgICAgICAgIHRoaXMuX2ltYWdl RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImltZyIpOwogICAgICAgICB0aGlzLl9p bWFnZUVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGZ1bmN0aW9uKCkgeyBVUkwucmV2 b2tlT2JqZWN0VVJMKG9iamVjdFVSTCk7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcu anMKaW5kZXggYmNmMjRhYWQ1NTIuLmY2MTAzOGJiYjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29u dGVudFZpZXcuanMKQEAgLTM2LDEwICszNiwxNCBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250 ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwog CiAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKHN0eWxlQ2xhc3NOYW1lLCAicmVz b3VyY2UiKTsKIAotICAgICAgICAvLyBBcHBlbmQgYSBzcGlubmVyIHdoaWxlIHdhaXRpbmcgZm9y IGNvbnRlbnRBdmFpbGFibGUuIFRoZSBzdWJjbGFzc2VzIGFyZSByZXNwb25zaWJsZSBmb3IgcmVt b3ZpbmcKLSAgICAgICAgLy8gdGhlIHNwaW5uZXIgYmVmb3JlIHNob3dpbmcgdGhlIHJlc291cmNl IGNvbnRlbnQuCi0gICAgICAgIHZhciBzcGlubmVyID0gbmV3IFdlYkluc3BlY3Rvci5JbmRldGVy bWluYXRlUHJvZ3Jlc3NTcGlubmVyOwotICAgICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQo c3Bpbm5lci5lbGVtZW50KTsKKyAgICAgICAgdGhpcy5fc3Bpbm5lclRpbWVvdXQgPSBzZXRUaW1l b3V0KCgpID0+IHsKKyAgICAgICAgICAgIC8vIEFwcGVuZCBhIHNwaW5uZXIgd2hpbGUgd2FpdGlu ZyBmb3IgY29udGVudEF2YWlsYWJsZS4gU3ViY2xhc3NlcyBhcmUgcmVzcG9uc2libGUgZm9yCisg ICAgICAgICAgICAvLyByZW1vdmluZyB0aGUgc3Bpbm5lciBiZWZvcmUgc2hvd2luZyB0aGUgcmVz b3VyY2UgY29udGVudCBieSBjYWxsaW5nIHJlbW92ZUxvYWRpbmdJbmRpY2F0b3IuCisgICAgICAg ICAgICBsZXQgc3Bpbm5lciA9IG5ldyBXZWJJbnNwZWN0b3IuSW5kZXRlcm1pbmF0ZVByb2dyZXNz U3Bpbm5lcjsKKyAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChzcGlubmVyLmVs ZW1lbnQpOworCisgICAgICAgICAgICB0aGlzLl9zcGlubmVyVGltZW91dCA9IHVuZGVmaW5lZDsK KyAgICAgICAgfSwgMTAwKTsKIAogICAgICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5l cigiY2xpY2siLCB0aGlzLl9tb3VzZVdhc0NsaWNrZWQuYmluZCh0aGlzKSwgZmFsc2UpOwogCkBA IC05Nyw2ICsxMDEsMTggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcgPSBjbGFz cyBSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG8KICAgICAgICAgICAgIFdl Ykluc3BlY3Rvci5pc3N1ZU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0 aGlzKTsKICAgICB9CiAKKyAgICAvLyBQcm90ZWN0ZWQKKworICAgIHJlbW92ZUxvYWRpbmdJbmRp Y2F0b3IoKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3NwaW5uZXJUaW1lb3V0KSB7CisgICAg ICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5fc3Bpbm5lclRpbWVvdXQpOworICAgICAgICAgICAg dGhpcy5fc3Bpbm5lclRpbWVvdXQgPSB1bmRlZmluZWQ7CisgICAgICAgIH0KKworICAgICAgICB0 aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAK ICAgICBfY29udGVudEF2YWlsYWJsZShwYXJhbWV0ZXJzKQpAQCAtMTE3LDcgKzEzMyw4IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50Vmll dyBleHRlbmRzIFdlYkluc3BlY3RvCiAgICAgICAgIGlmICh0aGlzLl9oYXNDb250ZW50KCkpCiAg ICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVu KCk7CisgICAgICAgIHRoaXMucmVtb3ZlTG9hZGluZ0luZGljYXRvcigpOworCiAgICAgICAgIHRo aXMuZWxlbWVudC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IuY3JlYXRlTWVzc2FnZVRleHRWaWV3 KGVycm9yLCB0cnVlKSk7CiAKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMo V2ViSW5zcGVjdG9yLlJlc291cmNlQ29udGVudFZpZXcuRXZlbnQuQ29udGVudEVycm9yKTsKQEAg LTEyNSw3ICsxNDIsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNz IFJlc291cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0bwogCiAgICAgX2hhc0NvbnRl bnQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuICF0aGlzLmVsZW1lbnQucXVlcnlTZWxlY3Rvcigi LmluZGV0ZXJtaW5hdGUtcHJvZ3Jlc3Mtc3Bpbm5lciIpOworICAgICAgICByZXR1cm4gdGhpcy5l bGVtZW50Lmhhc0NoaWxkTm9kZXMoKSAmJiAhdGhpcy5lbGVtZW50LnF1ZXJ5U2VsZWN0b3IoIi5p bmRldGVybWluYXRlLXByb2dyZXNzLXNwaW5uZXIiKTsKICAgICB9CiAKICAgICBfaXNzdWVXYXNB ZGRlZChldmVudCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXgg MmRhYTU4OWZiMjYuLjZjZTllNTZlOTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250 ZW50Vmlldy5qcwpAQCAtMTkxLDcgKzE5MSw4IEBAIFdlYkluc3BlY3Rvci5UZXh0UmVzb3VyY2VD b250ZW50VmlldyA9IGNsYXNzIFRleHRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV2ViCiAg ICAgICAgIGlmICh0aGlzLl90ZXh0RWRpdG9yLnBhcmVudFZpZXcgPT09IHRoaXMpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7Cisg ICAgICAgIHRoaXMucmVtb3ZlTG9hZGluZ0luZGljYXRvcigpOworCiAgICAgICAgIHRoaXMuYWRk U3Vidmlldyh0aGlzLl90ZXh0RWRpdG9yKTsKICAgICB9CiAK