112685 2013-03-19 05:12:01 -0700 Web Inspector: rename TimelineOverviewWindow to OverviewGrid.Window and fix names for constants. 2013-03-19 05:57:25 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112577 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 858184 0 loislo 2013-03-19 05:12:01 -0700 It is the second bug from meta bug: extract OverviewGrid from TimelineOverviewPane. It renames internal components of OverviewGrid. WebInspector.TimelineOverviewWindow -> WebInspector.OverviewGrid.Window WebInspector.TimelineOverviewWindow.WindowSelector -> WebInspector.OverviewGrid.WindowSelector and moves constants from WebInspector.TimelineOverviewWindow namespace to WebInspector.OverviewGrid namespace 858186 1 193799 loislo 2013-03-19 05:20:13 -0700 Created attachment 193799 Patch 858192 2 193799 yurys 2013-03-19 05:33:25 -0700 Comment on attachment 193799 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193799&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:475 > + * @param {string} prefix styleClassPrefix? 858202 3 loislo 2013-03-19 05:57:25 -0700 Committed r146200: <http://trac.webkit.org/changeset/146200> 193799 2013-03-19 05:20:13 -0700 2013-03-19 05:33:25 -0700 Patch bug-112685-20130319161603.patch text/plain 15341 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjN2RkZjk0NTQ2ZGJk MjllZDU1ZWZjOWIzMDk2ZjBhYTk0ZGViZi4uNTQ5NzNjNmI4ODE4NjEyNTJkMjg2OTFkMmFlNmFj MGIyZGFmYjUxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDEzLTAzLTE5ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVj dG9yOiByZW5hbWUgVGltZWxpbmVPdmVydmlld1dpbmRvdyB0byBPdmVydmlld0dyaWQuV2luZG93 IGFuZCBmaXggbmFtZXMgZm9yIGNvbnN0YW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIHRoZSBzZWNvbmQgcGF0Y2ggd2hpY2ggZXh0cmFj dHMgT3ZlcnZpZXdHcmlkIGZyb20gVGltZWxpbmVPdmVydmlld1BhbmUuCisgICAgICAgIEl0IHJl bmFtZXMgaW50ZXJuYWwgY29tcG9uZW50cyBvZiBPdmVydmlld0dyaWQuCisgICAgICAgIFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93IC0+IFdlYkluc3BlY3Rvci5PdmVydmlld0dy aWQuV2luZG93CisgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93Lldp bmRvd1NlbGVjdG9yIC0+IFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93U2VsZWN0b3IK KworICAgICAgICBhbmQgbW92ZXMgY29uc3RhbnRzIGZyb20gV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdXaW5kb3cgbmFtZXNwYWNlIHRvIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQgbmFt ZXNwYWNlCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQ YW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk92ZXJ2aWV3R3JpZC5XaW5kb3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3Jp ZC5XaW5kb3cucHJvdG90eXBlLl9zdGFydFdpbmRvd1NlbGVjdG9yRHJhZ2dpbmcpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5XaW5kb3cucHJvdG90eXBlLl9lbmRXaW5kb3dT ZWxlY3RvckRyYWdnaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuV2lu ZG93LnByb3RvdHlwZS5fc3RhcnRXaW5kb3dEcmFnZ2luZyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuT3ZlcnZpZXdHcmlkLldpbmRvdy5wcm90b3R5cGUuX3dpbmRvd0RyYWdnaW5nKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93LnByb3RvdHlwZS5fbW92ZVdpbmRv dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLldpbmRvdy5wcm90b3R5cGUu X3Jlc2l6ZVdpbmRvd1JpZ2h0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQu V2luZG93LnByb3RvdHlwZS5fc2V0V2luZG93UG9zaXRpb24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk92ZXJ2aWV3R3JpZC5XaW5kb3cucHJvdG90eXBlLl9vbk1vdXNlV2hlZWwpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5XaW5kb3cucHJvdG90eXBlLl96b29tKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93U2VsZWN0b3IpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5XaW5kb3dTZWxlY3Rvci5wcm90b3R5cGUuX2Ny ZWF0ZVNlbGVjdG9yRWxlbWVudCk6CisKKzIwMTMtMDMtMTkgIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgX3RpbWVs aW5lR3JpZCAmJiBfdGltZWxpbmVPdmVydmlld1dpbmRvdyBmcm9tIFRpbWVsaW5lT3ZlcnZpZXdQ YW5lIGludG8gYSBuZXcgY2xhc3MgT3ZlcnZpZXdHcmlkLgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyNTg0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmlu ZGV4IDA0NjliNTNkZjNlMDk2NGY0ODQ3YjdiYWJhNDY1ZTJjZmVjODkxMGMuLjVlNTRlYjU3YzY2 ZDAyZGExOGVjMjMyNGYwZWI2NzI1ZmVjNTQ5NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAt OTYsMTEgKzk2LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSA9IGZ1bmN0 aW9uKG1vZGVsKQogCiAgICAgbW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNb2RlbC5FdmVudHMuUmVjb3JkQWRkZWQsIHRoaXMuX29uUmVjb3JkQWRkZWQsIHRoaXMp OwogICAgIG1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWwu RXZlbnRzLlJlY29yZHNDbGVhcmVkLCB0aGlzLl9yZXNldCwgdGhpcyk7Ci0gICAgdGhpcy5fb3Zl cnZpZXdHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdX aW5kb3cuRXZlbnRzLldpbmRvd0NoYW5nZWQsIHRoaXMuX29uV2luZG93Q2hhbmdlZCwgdGhpcyk7 CisgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3R3JpZC5FdmVudHMuV2luZG93Q2hhbmdlZCwgdGhpcy5fb25XaW5kb3dDaGFuZ2VkLCB0 aGlzKTsKIH0KIAogLyoqCiAgKiBAY29uc3RydWN0b3IKKyAqIEBwYXJhbSB7c3RyaW5nfSBwcmVm aXgKICAqLwogV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZCA9IGZ1bmN0aW9uKHByZWZpeCkKIHsK QEAgLTExNSw3ICsxMTYsNyBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkID0gZnVuY3Rpb24o cHJlZml4KQogCiAgICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX2dyaWQuZWxlbWVu dCk7CiAKLSAgICB0aGlzLl93aW5kb3cgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdXaW5kb3codGhpcy5lbGVtZW50LCB0aGlzLl9ncmlkLmRpdmlkZXJzTGFiZWxCYXJFbGVtZW50 KTsKKyAgICB0aGlzLl93aW5kb3cgPSBuZXcgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5XaW5k b3codGhpcy5lbGVtZW50LCB0aGlzLl9ncmlkLmRpdmlkZXJzTGFiZWxCYXJFbGVtZW50LCBwcmVm aXgpOwogfQogCiBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZSA9IHsKQEAgLTIy MiwxMSArMjIzLDExIEBAIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlID0gewog fQogCiAKLVdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6 ZSA9IDEyOworV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5NaW5TZWxlY3RhYmxlU2l6ZSA9IDEy OwogCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuV2luZG93U2Nyb2xsU3BlZWRG YWN0b3IgPSAuMzsKK1dlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuV2luZG93U2Nyb2xsU3BlZWRG YWN0b3IgPSAuMzsKIAotV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJP ZmZzZXQgPSAzLjU7IC8vIGhhbGYgcGl4ZWwgYmVjYXVzZSBvZmZzZXQgdmFsdWVzIGFyZSBub3Qg cm91bmRlZCBidXQgY2VpbGVkCitXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLlJlc2l6ZXJPZmZz ZXQgPSAzLjU7IC8vIGhhbGYgcGl4ZWwgYmVjYXVzZSBvZmZzZXQgdmFsdWVzIGFyZSBub3Qgcm91 bmRlZCBidXQgY2VpbGVkCiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2Rl ID0gewogICAgIEV2ZW50czogIkV2ZW50cyIsCkBAIC00NzEsMTEgKzQ3MiwxMyBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogICogQGV4dGVuZHMge1dl Ykluc3BlY3Rvci5PYmplY3R9CiAgKiBAcGFyYW0ge0VsZW1lbnR9IHBhcmVudEVsZW1lbnQKICAq IEBwYXJhbSB7RWxlbWVudH0gZGl2aWRlcnNMYWJlbEJhckVsZW1lbnQKKyAqIEBwYXJhbSB7c3Ry aW5nfSBwcmVmaXgKICAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cgPSBm dW5jdGlvbihwYXJlbnRFbGVtZW50LCBkaXZpZGVyc0xhYmVsQmFyRWxlbWVudCkKK1dlYkluc3Bl Y3Rvci5PdmVydmlld0dyaWQuV2luZG93ID0gZnVuY3Rpb24ocGFyZW50RWxlbWVudCwgZGl2aWRl cnNMYWJlbEJhckVsZW1lbnQsIHByZWZpeCkKIHsKICAgICB0aGlzLl9wYXJlbnRFbGVtZW50ID0g cGFyZW50RWxlbWVudDsKICAgICB0aGlzLl9kaXZpZGVyc0xhYmVsQmFyRWxlbWVudCA9IGRpdmlk ZXJzTGFiZWxCYXJFbGVtZW50OworICAgIHRoaXMuX3ByZWZpeCA9IHByZWZpeDsKIAogICAgIFdl Ykluc3BlY3Rvci5pbnN0YWxsRHJhZ0hhbmRsZSh0aGlzLl9wYXJlbnRFbGVtZW50LCB0aGlzLl9z dGFydFdpbmRvd1NlbGVjdG9yRHJhZ2dpbmcuYmluZCh0aGlzKSwgdGhpcy5fd2luZG93U2VsZWN0 b3JEcmFnZ2luZy5iaW5kKHRoaXMpLCB0aGlzLl9lbmRXaW5kb3dTZWxlY3RvckRyYWdnaW5nLmJp bmQodGhpcyksICJldy1yZXNpemUiKTsKICAgICBXZWJJbnNwZWN0b3IuaW5zdGFsbERyYWdIYW5k bGUodGhpcy5fZGl2aWRlcnNMYWJlbEJhckVsZW1lbnQsIHRoaXMuX3N0YXJ0V2luZG93RHJhZ2dp bmcuYmluZCh0aGlzKSwgdGhpcy5fd2luZG93RHJhZ2dpbmcuYmluZCh0aGlzKSwgdGhpcy5fZW5k V2luZG93RHJhZ2dpbmcuYmluZCh0aGlzKSwgImV3LXJlc2l6ZSIpOwpAQCAtNDg3LDM1ICs0OTAs MzUgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cgPSBmdW5jdGlvbihwYXJl bnRFbGVtZW50LCBkaXZpZGVyc0xhYmVsQmFyRWwKICAgICB0aGlzLl9wYXJlbnRFbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImRibGNsaWNrIiwgdGhpcy5fcmVzaXplV2luZG93TWF4aW11bS5iaW5k KHRoaXMpLCB0cnVlKTsKIAogICAgIHRoaXMuX292ZXJ2aWV3V2luZG93RWxlbWVudCA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAgIHRoaXMuX292ZXJ2aWV3V2luZG93RWxlbWVu dC5jbGFzc05hbWUgPSAidGltZWxpbmUtb3ZlcnZpZXctd2luZG93IjsKKyAgICB0aGlzLl9vdmVy dmlld1dpbmRvd0VsZW1lbnQuY2xhc3NOYW1lID0gcHJlZml4ICsgIi1vdmVydmlldy13aW5kb3ci OwogICAgIHBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fb3ZlcnZpZXdXaW5kb3dFbGVt ZW50KTsKIAogICAgIHRoaXMuX292ZXJ2aWV3V2luZG93Qm9yZGVyc0VsZW1lbnQgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9vdmVydmlld1dpbmRvd0JvcmRlcnNF bGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmlldy13aW5kb3ctcnVsZXJzIjsKKyAg ICB0aGlzLl9vdmVydmlld1dpbmRvd0JvcmRlcnNFbGVtZW50LmNsYXNzTmFtZSA9IHByZWZpeCAr ICItb3ZlcnZpZXctd2luZG93LXJ1bGVycyI7CiAgICAgcGFyZW50RWxlbWVudC5hcHBlbmRDaGls ZCh0aGlzLl9vdmVydmlld1dpbmRvd0JvcmRlcnNFbGVtZW50KTsKIAogICAgIHZhciBvdmVydmll d0RpdmlkZXJzQmFja2dyb3VuZCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwotICAg IG92ZXJ2aWV3RGl2aWRlcnNCYWNrZ3JvdW5kLmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1vdmVydmll dy1kaXZpZGVycy1iYWNrZ3JvdW5kIjsKKyAgICBvdmVydmlld0RpdmlkZXJzQmFja2dyb3VuZC5j bGFzc05hbWUgPSBwcmVmaXggKyAiLW92ZXJ2aWV3LWRpdmlkZXJzLWJhY2tncm91bmQiOwogICAg IHBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQob3ZlcnZpZXdEaXZpZGVyc0JhY2tncm91bmQpOwog CiAgICAgdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKLSAgICB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5jbGFzc05hbWUgPSAidGltZWxpbmUt d2luZG93LXJlc2l6ZXIiOworICAgIHRoaXMuX2xlZnRSZXNpemVFbGVtZW50LmNsYXNzTmFtZSA9 IHByZWZpeCArICItd2luZG93LXJlc2l6ZXIiOwogICAgIHRoaXMuX2xlZnRSZXNpemVFbGVtZW50 LnN0eWxlLmxlZnQgPSAwOwogICAgIHBhcmVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbGVm dFJlc2l6ZUVsZW1lbnQpOwogICAgIFdlYkluc3BlY3Rvci5pbnN0YWxsRHJhZ0hhbmRsZSh0aGlz Ll9sZWZ0UmVzaXplRWxlbWVudCwgbnVsbCwgdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnREcmFnZ2lu Zy5iaW5kKHRoaXMpLCBudWxsLCAiZXctcmVzaXplIik7CiAKICAgICB0aGlzLl9yaWdodFJlc2l6 ZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl9yaWdo dFJlc2l6ZUVsZW1lbnQuY2xhc3NOYW1lID0gInRpbWVsaW5lLXdpbmRvdy1yZXNpemVyIHRpbWVs aW5lLXdpbmRvdy1yZXNpemVyLXJpZ2h0IjsKKyAgICB0aGlzLl9yaWdodFJlc2l6ZUVsZW1lbnQu Y2xhc3NOYW1lID0gcHJlZml4ICsgIi13aW5kb3ctcmVzaXplciAiICsgcHJlZml4ICsgIi13aW5k b3ctcmVzaXplci1yaWdodCI7CiAgICAgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50LnN0eWxlLnJp Z2h0ID0gMDsKICAgICBwYXJlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3JpZ2h0UmVzaXpl RWxlbWVudCk7CiAgICAgV2ViSW5zcGVjdG9yLmluc3RhbGxEcmFnSGFuZGxlKHRoaXMuX3JpZ2h0 UmVzaXplRWxlbWVudCwgbnVsbCwgdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50RHJhZ2dpbmcuYmlu ZCh0aGlzKSwgbnVsbCwgImV3LXJlc2l6ZSIpOwogfQogCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1dpbmRvdy5FdmVudHMgPSB7CitXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLkV2ZW50 cyA9IHsKICAgICBXaW5kb3dDaGFuZ2VkOiAiV2luZG93Q2hhbmdlZCIKIH0KIAotV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlID0geworV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3R3JpZC5XaW5kb3cucHJvdG90eXBlID0gewogICAgIHJlc2V0OiBmdW5jdGlvbigpCiAg ICAgewogICAgICAgICB0aGlzLndpbmRvd0xlZnQgPSAwLjA7CkBAIC01NTQsNyArNTU3LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlID0gewogICAgIF9z dGFydFdpbmRvd1NlbGVjdG9yRHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAg ICAgdmFyIHBvc2l0aW9uID0gZXZlbnQucGFnZVggLSB0aGlzLl9wYXJlbnRFbGVtZW50Lm9mZnNl dExlZnQ7Ci0gICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93U2VsZWN0b3IgPSBuZXcgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLldpbmRvd1NlbGVjdG9yKHRoaXMuX3BhcmVudEVs ZW1lbnQsIHBvc2l0aW9uKTsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dTZWxlY3RvciA9 IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLldpbmRvd1NlbGVjdG9yKHRoaXMuX3BhcmVu dEVsZW1lbnQsIHBvc2l0aW9uLCB0aGlzLl9wcmVmaXgpOwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9LAogCkBAIC01NzYsMTMgKzU3OSwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1dpbmRvdy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9vdmVydmlld1dp bmRvd1NlbGVjdG9yOwogICAgICAgICBpZiAod2luZG93LmVuZCA9PT0gd2luZG93LnN0YXJ0KSB7 IC8vIENsaWNrLCBub3QgZHJhZy4KICAgICAgICAgICAgIHZhciBtaWRkbGUgPSB3aW5kb3cuZW5k OwotICAgICAgICAgICAgd2luZG93LnN0YXJ0ID0gTWF0aC5tYXgoMCwgbWlkZGxlIC0gV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNlbGVjdGFibGVTaXplIC8gMik7Ci0gICAg ICAgICAgICB3aW5kb3cuZW5kID0gTWF0aC5taW4odGhpcy5fcGFyZW50RWxlbWVudC5jbGllbnRX aWR0aCwgbWlkZGxlICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNlbGVj dGFibGVTaXplIC8gMik7Ci0gICAgICAgIH0gZWxzZSBpZiAod2luZG93LmVuZCAtIHdpbmRvdy5z dGFydCA8IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6 ZSkgewotICAgICAgICAgICAgaWYgKHRoaXMuX3BhcmVudEVsZW1lbnQuY2xpZW50V2lkdGggLSB3 aW5kb3cuZW5kID4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNlbGVjdGFi bGVTaXplKQotICAgICAgICAgICAgICAgIHdpbmRvdy5lbmQgPSB3aW5kb3cuc3RhcnQgKyBXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTWluU2VsZWN0YWJsZVNpemU7CisgICAgICAg ICAgICB3aW5kb3cuc3RhcnQgPSBNYXRoLm1heCgwLCBtaWRkbGUgLSBXZWJJbnNwZWN0b3IuT3Zl cnZpZXdHcmlkLk1pblNlbGVjdGFibGVTaXplIC8gMik7CisgICAgICAgICAgICB3aW5kb3cuZW5k ID0gTWF0aC5taW4odGhpcy5fcGFyZW50RWxlbWVudC5jbGllbnRXaWR0aCwgbWlkZGxlICsgV2Vi SW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5NaW5TZWxlY3RhYmxlU2l6ZSAvIDIpOworICAgICAgICB9 IGVsc2UgaWYgKHdpbmRvdy5lbmQgLSB3aW5kb3cuc3RhcnQgPCBXZWJJbnNwZWN0b3IuT3ZlcnZp ZXdHcmlkLk1pblNlbGVjdGFibGVTaXplKSB7CisgICAgICAgICAgICBpZiAodGhpcy5fcGFyZW50 RWxlbWVudC5jbGllbnRXaWR0aCAtIHdpbmRvdy5lbmQgPiBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdH cmlkLk1pblNlbGVjdGFibGVTaXplKQorICAgICAgICAgICAgICAgIHdpbmRvdy5lbmQgPSB3aW5k b3cuc3RhcnQgKyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLk1pblNlbGVjdGFibGVTaXplOwog ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHdpbmRvdy5zdGFydCA9IHdpbmRvdy5l bmQgLSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTWluU2VsZWN0YWJsZVNpemU7 CisgICAgICAgICAgICAgICAgd2luZG93LnN0YXJ0ID0gd2luZG93LmVuZCAtIFdlYkluc3BlY3Rv ci5PdmVydmlld0dyaWQuTWluU2VsZWN0YWJsZVNpemU7CiAgICAgICAgIH0KICAgICAgICAgdGhp cy5fc2V0V2luZG93UG9zaXRpb24od2luZG93LnN0YXJ0LCB3aW5kb3cuZW5kKTsKICAgICB9LApA QCAtNTkzLDcgKzU5Niw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LnBy b3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfc3RhcnRXaW5kb3dEcmFnZ2luZzogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewotICAgICAgICB2YXIgd2luZG93TGVmdCA9IHRoaXMuX2xlZnRSZXNpemVF bGVtZW50Lm9mZnNldExlZnQgKyBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuUmVz aXplck9mZnNldDsKKyAgICAgICAgdmFyIHdpbmRvd0xlZnQgPSB0aGlzLl9sZWZ0UmVzaXplRWxl bWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5SZXNpemVyT2Zmc2V0 OwogICAgICAgICB0aGlzLl9kcmFnT2Zmc2V0ID0gd2luZG93TGVmdCAtIGV2ZW50LnBhZ2VYOwog ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9LApAQCAtNjAzLDcgKzYwNiw3IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBf d2luZG93RHJhZ2dpbmc6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHdpbmRv d0xlZnQgPSB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQ7CisgICAgICAgIHZhciB3aW5kb3dM ZWZ0ID0gdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5P dmVydmlld0dyaWQuUmVzaXplck9mZnNldDsKICAgICAgICAgdmFyIHN0YXJ0ID0gdGhpcy5fZHJh Z09mZnNldCArIGV2ZW50LnBhZ2VYOwogICAgICAgICB0aGlzLl9tb3ZlV2luZG93KHN0YXJ0KTsK ICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKQEAgLTYyMiw4ICs2MjUsOCBAQCBXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUgPSB7CiAgICAgICovCiAg ICAgX21vdmVXaW5kb3c6IGZ1bmN0aW9uKHN0YXJ0KQogICAgIHsKLSAgICAgICAgdmFyIHdpbmRv d0xlZnQgPSB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQ7Ci0gICAgICAgIHZhciB3aW5kb3dS aWdodCA9IHRoaXMuX3JpZ2h0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQ7CisgICAgICAgIHZhciB3aW5kb3dM ZWZ0ID0gdGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5P dmVydmlld0dyaWQuUmVzaXplck9mZnNldDsKKyAgICAgICAgdmFyIHdpbmRvd1JpZ2h0ID0gdGhp cy5fcmlnaHRSZXNpemVFbGVtZW50Lm9mZnNldExlZnQgKyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdH cmlkLlJlc2l6ZXJPZmZzZXQ7CiAgICAgICAgIHZhciB3aW5kb3dTaXplID0gd2luZG93UmlnaHQg LSB3aW5kb3dMZWZ0OwogICAgICAgICB2YXIgZW5kID0gc3RhcnQgKyB3aW5kb3dTaXplOwogCkBA IC02NjAsOCArNjYzLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cucHJv dG90eXBlID0gewogICAgICAgICAvLyBHbHVlIHRvIGVkZ2UuCiAgICAgICAgIGlmIChlbmQgPiB0 aGlzLl9wYXJlbnRFbGVtZW50LmNsaWVudFdpZHRoIC0gMTApCiAgICAgICAgICAgICBlbmQgPSB0 aGlzLl9wYXJlbnRFbGVtZW50LmNsaWVudFdpZHRoOwotICAgICAgICBlbHNlIGlmIChlbmQgPCB0 aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdQYW5lLk1pblNlbGVjdGFibGVTaXplKQotICAgICAgICAgICAgZW5kID0gdGhpcy5f bGVmdFJlc2l6ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6ZTsKKyAgICAgICAgZWxzZSBpZiAoZW5kIDwgdGhpcy5f bGVmdFJlc2l6ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQu TWluU2VsZWN0YWJsZVNpemUpCisgICAgICAgICAgICBlbmQgPSB0aGlzLl9sZWZ0UmVzaXplRWxl bWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5NaW5TZWxlY3RhYmxl U2l6ZTsKICAgICAgICAgdGhpcy5fc2V0V2luZG93UG9zaXRpb24obnVsbCwgZW5kKTsKICAgICB9 LAogCkBAIC03MDAsNyArNzAzLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5k b3cucHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93 RWxlbWVudC5zdHlsZS53aWR0aCA9ICh0aGlzLndpbmRvd1JpZ2h0IC0gdGhpcy53aW5kb3dMZWZ0 KSAqIDEwMCArICIlIjsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3dCb3JkZXJzRWxlbWVu dC5zdHlsZS5yaWdodCA9ICgxIC0gdGhpcy53aW5kb3dSaWdodCArIDIgKiBydWxlckFkanVzdG1l bnQpICogMTAwICsgIiUiOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5FdmVudHMuV2luZG93Q2hhbmdlZCk7 CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5PdmVy dmlld0dyaWQuRXZlbnRzLldpbmRvd0NoYW5nZWQpOwogICAgIH0sCiAKICAgICAvKioKQEAgLTcx Niw4ICs3MTksOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5 cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl96b29tKE1hdGgucG93KHpvb21GYWN0b3IsIC1ldmVu dC53aGVlbERlbHRhWSAqIG1vdXNlV2hlZWxab29tU3BlZWQpLCByZWZlcmVuY2VQb2ludCk7CiAg ICAgICAgIH0KICAgICAgICAgaWYgKHR5cGVvZiBldmVudC53aGVlbERlbHRhWCA9PT0gIm51bWJl ciIgJiYgZXZlbnQud2hlZWxEZWx0YVgpIHsKLSAgICAgICAgICAgIHZhciB3aW5kb3dMZWZ0ID0g dGhpcy5fbGVmdFJlc2l6ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3UGFuZS5SZXNpemVyT2Zmc2V0OwotICAgICAgICAgICAgdmFyIHN0YXJ0ID0gd2lu ZG93TGVmdCAtIE1hdGgucm91bmQoZXZlbnQud2hlZWxEZWx0YVggKiBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUuV2luZG93U2Nyb2xsU3BlZWRGYWN0b3IpOworICAgICAgICAgICAg dmFyIHdpbmRvd0xlZnQgPSB0aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2Vi SW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5SZXNpemVyT2Zmc2V0OworICAgICAgICAgICAgdmFyIHN0 YXJ0ID0gd2luZG93TGVmdCAtIE1hdGgucm91bmQoZXZlbnQud2hlZWxEZWx0YVggKiBXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdHcmlkLldpbmRvd1Njcm9sbFNwZWVkRmFjdG9yKTsKICAgICAgICAgICAg IHRoaXMuX21vdmVXaW5kb3coc3RhcnQpOwogICAgICAgICAgICAgZXZlbnQucHJldmVudERlZmF1 bHQoKTsKICAgICAgICAgfQpAQCAtNzI5LDExICs3MzIsMTEgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXdXaW5kb3cucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF96b29tOiBmdW5j dGlvbihmYWN0b3IsIHJlZmVyZW5jZVBvaW50KQogICAgIHsKLSAgICAgICAgdmFyIGxlZnQgPSB0 aGlzLl9sZWZ0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQ7Ci0gICAgICAgIHZhciByaWdodCA9IHRoaXMuX3Jp Z2h0UmVzaXplRWxlbWVudC5vZmZzZXRMZWZ0ICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdQYW5lLlJlc2l6ZXJPZmZzZXQ7CisgICAgICAgIHZhciBsZWZ0ID0gdGhpcy5fbGVmdFJlc2l6 ZUVsZW1lbnQub2Zmc2V0TGVmdCArIFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQuUmVzaXplck9m ZnNldDsKKyAgICAgICAgdmFyIHJpZ2h0ID0gdGhpcy5fcmlnaHRSZXNpemVFbGVtZW50Lm9mZnNl dExlZnQgKyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLlJlc2l6ZXJPZmZzZXQ7CiAKICAgICAg ICAgdmFyIGRlbHRhID0gZmFjdG9yICogKHJpZ2h0IC0gbGVmdCk7Ci0gICAgICAgIGlmIChmYWN0 b3IgPCAxICYmIGRlbHRhIDwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1pblNl bGVjdGFibGVTaXplKQorICAgICAgICBpZiAoZmFjdG9yIDwgMSAmJiBkZWx0YSA8IFdlYkluc3Bl Y3Rvci5PdmVydmlld0dyaWQuTWluU2VsZWN0YWJsZVNpemUpCiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIHZhciBtYXggPSB0aGlzLl9wYXJlbnRFbGVtZW50LmNsaWVudFdpZHRoOwogICAg ICAgICBsZWZ0ID0gTWF0aC5tYXgoMCwgTWF0aC5taW4obWF4IC0gZGVsdGEsIHJlZmVyZW5jZVBv aW50ICsgKGxlZnQgLSByZWZlcmVuY2VQb2ludCkgKiBmYWN0b3IpKTsKQEAgLTgxNSwyMyArODE4 LDI1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5cGUg PSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0cmluZ30gcHJlZml4CiAg Ki8KLVdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5XaW5kb3dTZWxlY3RvciA9IGZ1 bmN0aW9uKHBhcmVudCwgcG9zaXRpb24pCitXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLldpbmRv d1NlbGVjdG9yID0gZnVuY3Rpb24ocGFyZW50LCBwb3NpdGlvbiwgcHJlZml4KQogeworICAgIHRo aXMuX3ByZWZpeCA9IHByZWZpeDsKICAgICB0aGlzLl9zdGFydFBvc2l0aW9uID0gcG9zaXRpb247 CiAgICAgdGhpcy5fd2lkdGggPSBwYXJlbnQub2Zmc2V0V2lkdGg7CiAgICAgdGhpcy5fd2luZG93 U2VsZWN0b3IgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICB0aGlzLl93aW5k b3dTZWxlY3Rvci5jbGFzc05hbWUgPSAidGltZWxpbmUtd2luZG93LXNlbGVjdG9yIjsKKyAgICB0 aGlzLl93aW5kb3dTZWxlY3Rvci5jbGFzc05hbWUgPSBwcmVmaXggKyAiLXdpbmRvdy1zZWxlY3Rv ciI7CiAgICAgdGhpcy5fd2luZG93U2VsZWN0b3Iuc3R5bGUubGVmdCA9IHRoaXMuX3N0YXJ0UG9z aXRpb24gKyAicHgiOwogICAgIHRoaXMuX3dpbmRvd1NlbGVjdG9yLnN0eWxlLnJpZ2h0ID0gdGhp cy5fd2lkdGggLSB0aGlzLl9zdGFydFBvc2l0aW9uICsgICsgInB4IjsKICAgICBwYXJlbnQuYXBw ZW5kQ2hpbGQodGhpcy5fd2luZG93U2VsZWN0b3IpOwogfQogCi1XZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUuV2luZG93U2VsZWN0b3IucHJvdG90eXBlID0geworV2ViSW5zcGVjdG9y Lk92ZXJ2aWV3R3JpZC5XaW5kb3dTZWxlY3Rvci5wcm90b3R5cGUgPSB7CiAgICAgX2NyZWF0ZVNl bGVjdG9yRWxlbWVudDogZnVuY3Rpb24ocGFyZW50LCBsZWZ0LCB3aWR0aCwgaGVpZ2h0KQogICAg IHsKICAgICAgICAgdmFyIHNlbGVjdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgICAgICBzZWxlY3RvckVsZW1lbnQuY2xhc3NOYW1lID0gInRpbWVsaW5lLXdp bmRvdy1zZWxlY3RvciI7CisgICAgICAgIHNlbGVjdG9yRWxlbWVudC5jbGFzc05hbWUgPSB0aGlz Ll9wcmVmaXggKyAiLXdpbmRvdy1zZWxlY3RvciI7CiAgICAgICAgIHNlbGVjdG9yRWxlbWVudC5z dHlsZS5sZWZ0ID0gbGVmdCArICJweCI7CiAgICAgICAgIHNlbGVjdG9yRWxlbWVudC5zdHlsZS53 aWR0aCA9IHdpZHRoICsgInB4IjsKICAgICAgICAgc2VsZWN0b3JFbGVtZW50LnN0eWxlLnRvcCA9 ICIwcHgiOwo=