112584 2013-03-18 09:26:29 -0700 Web Inspector: move _timelineGrid && _timelineOverviewWindow from TimelineOverviewPane into a new class OverviewGrid 2013-03-19 04:48:56 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 112594 112577 1 loislo loislo apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 857194 0 loislo 2013-03-18 09:26:29 -0700 EOM 857200 1 193581 loislo 2013-03-18 09:33:00 -0700 Created attachment 193581 Patch 857206 2 193581 pfeldman 2013-03-18 09:37:49 -0700 Comment on attachment 193581 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193581&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:81 > + this._overviewGrid.grid.element.insertBefore(this._heapGraph.element, this._overviewGrid.grid.itemsGraphsElement); You should expose insertBefore on overview grid for now. > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:120 > + get grid() Don't use getters please. > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:140 > + updateDividers: function(calculator) Annotate please. 857230 3 193590 loislo 2013-03-18 09:59:49 -0700 Created attachment 193590 Patch 857241 4 193590 pfeldman 2013-03-18 10:11:04 -0700 Comment on attachment 193590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193590&action=review > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:-98 > - this._overviewGrid.itemsGraphsElement.appendChild(this._categoryStrips.element); appendAfter... > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:120 > + itemsGraphsElement: function() Hide this one. > Source/WebCore/inspector/front-end/TimelineOverviewPane.js:162 > + addEventDividers: function(dividers) Is this used? 857256 5 loislo 2013-03-18 10:19:23 -0700 Committed r146079: <http://trac.webkit.org/changeset/146079> 857263 6 193590 loislo 2013-03-18 10:21:43 -0700 Comment on attachment 193590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193590&action=review >> Source/WebCore/inspector/front-end/TimelineOverviewPane.js:-98 >> - this._overviewGrid.itemsGraphsElement.appendChild(this._categoryStrips.element); > > appendAfter... We are not adding a child after itemsGraphsElement. We are inserting a child into it. >> Source/WebCore/inspector/front-end/TimelineOverviewPane.js:162 >> + addEventDividers: function(dividers) > > Is this used? The code which is using the method hasn't been changed 857300 7 webkit.review.bot 2013-03-18 10:52:28 -0700 Re-opened since this is blocked by bug 112594 858169 8 loislo 2013-03-19 04:48:56 -0700 Committed r146199: <http://trac.webkit.org/changeset/146199> 193581 2013-03-18 09:33:00 -0700 2013-03-18 09:59:43 -0700 Patch bug-112584-20130318202851.patch text/plain 11479 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI5OGYwZGM4NzE5OWNm NjJlMjljNmIzZjRkZmFjNDRkZGU1OTgxZi4uODRmMDkzZDMxZTg0NDI0MzhhNzkwMWQ3MWE0OGY5 YmI4MTQwOWMzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTE4ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBtb3ZlIF90aW1lbGluZUdyaWQgJiYgX3RpbWVsaW5lT3ZlcnZpZXdXaW5kb3cgZnJvbSBU aW1lbGluZU92ZXJ2aWV3UGFuZSBpbnRvIGEgbmV3IGNsYXNzIE92ZXJ2aWV3R3JpZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjU4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIHRoZSBmaXJz dCBwYXRoIGluIHRoZSBzZXQuCisgICAgICAgIFRoZSBlbmQgZ29hbCBpcyB0byBleHRyYWN0IE92 ZXJ2aWV3R3JpZCB3aXRoIHdpbmRvdyBzZWxlY3RvcnMKKyAgICAgICAgaW50byBhIHNlcGFyYXRl IGNsYXNzIGluIHNlcGFyYXRlIGZpbGUgYW5kIHJldXNlIGl0IGluIENQVSBGbGFtZUNoYXJ0Lgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmll d0dyaWQucHJvdG90eXBlLmdldCBncmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmll d0dyaWQucHJvdG90eXBlLmdldCBjbGllbnRXaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu T3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zaG93SXRlbXNHcmFwaHNFbGVtZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLmhpZGVJdGVtc0dyYXBoc0VsZW1l bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUudXBkYXRl RGl2aWRlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUu YWRkRXZlbnREaXZpZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnBy b3RvdHlwZS5yZW1vdmVFdmVudERpdmlkZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVy dmlld0dyaWQucHJvdG90eXBlLnNldFdpbmRvd1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5PdmVydmlld0dyaWQucHJvdG90eXBlLmdldCB3aW5kb3dMZWZ0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLmdldCB3aW5kb3dSaWdodCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3cpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUuYWRkRXZlbnRMaXN0ZW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLnNl dE1vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3Rv dHlwZS5fc2V0RnJhbWVNb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUucHJvdG90eXBlLnNpZGViYXJSZXNpemVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuem9vbVRvRnJhbWUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fcmVzZXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS53 aW5kb3dMZWZ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUud2luZG93UmlnaHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLnByb3RvdHlwZS5fdXBkYXRlV2luZG93KToKKwogMjAxMy0wMy0xOCAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjE0NjAzNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IGE0NDQzZThm YjY2MTYwZmI5NDE5ODJkNGJiZDdjMDhhMTUxMDE0MzAuLjAyOWRmMTY5M2RkYjliYWYzYzZjOGNh YmZhNDMzMzNkODYwOWI3NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtNzQsNDAgKzc0LDEy OSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUgPSBmdW5jdGlvbihtb2RlbCkK ICAgICAKICAgICB0aGlzLl9vdmVydmlld0l0ZW1zW3RoaXMuX2N1cnJlbnRNb2RlXS5yZXZlYWxB bmRTZWxlY3QoZmFsc2UpOwogCi0gICAgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIgPSB0aGlzLmVs ZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJmaWxsIik7Ci0gICAgdGhpcy5fb3ZlcnZpZXdDb250 YWluZXIuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctY29udGFpbmVyIjsKLQotICAgIHRoaXMuX292 ZXJ2aWV3R3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkKCk7Ci0gICAgdGhpcy5f b3ZlcnZpZXdHcmlkLmVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctZ3JpZCI7Ci0gICAg dGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5pZCA9ICJ0aW1lbGluZS1vdmVy dmlldy10aW1lbGluZXMiOwotCi0gICAgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIuYXBwZW5kQ2hp bGQodGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQpOworICAgIHRoaXMuX292ZXJ2aWV3R3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKCJ0aW1lbGluZSIpOwogCiAgICAgdGhpcy5f aGVhcEdyYXBoID0gbmV3IFdlYkluc3BlY3Rvci5IZWFwR3JhcGgodGhpcy5fbW9kZWwpOwogICAg IHRoaXMuX2hlYXBHcmFwaC5lbGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LW1lbW9yeSI7 Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2hlYXBH cmFwaC5lbGVtZW50LCB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50KTsKLQot ICAgIHRoaXMuX292ZXJ2aWV3V2luZG93ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3V2luZG93KHRoaXMuX292ZXJ2aWV3Q29udGFpbmVyLCB0aGlzLl9vdmVydmlld0dyaWQuZGl2 aWRlcnNMYWJlbEJhckVsZW1lbnQpOwotICAgIHRoaXMuX292ZXJ2aWV3V2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cuRXZlbnRzLldpbmRv d0NoYW5nZWQsIHRoaXMuX29uV2luZG93Q2hhbmdlZCwgdGhpcyk7CisgICAgdGhpcy5fb3ZlcnZp ZXdHcmlkLmdyaWQuZWxlbWVudC5pbnNlcnRCZWZvcmUodGhpcy5faGVhcEdyYXBoLmVsZW1lbnQs IHRoaXMuX292ZXJ2aWV3R3JpZC5ncmlkLml0ZW1zR3JhcGhzRWxlbWVudCk7CiAKICAgICB2YXIg c2VwYXJhdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgIHNl cGFyYXRvckVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctc2VwYXJhdG9yIjsKICAgICB0 aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VwYXJhdG9yRWxlbWVudCk7CiAKICAgICB0aGlzLl9j YXRlZ29yeVN0cmlwcyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeVN0cmlwcyh0 aGlzLl9tb2RlbCk7Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9jYXRlZ29yeVN0cmlwcy5lbGVtZW50KTsKKyAgICB0aGlzLl9vdmVy dmlld0dyaWQuZ3JpZC5pdGVtc0dyYXBoc0VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY2F0ZWdv cnlTdHJpcHMuZWxlbWVudCk7CiAgCiAgICAgdmFyIGNhdGVnb3JpZXMgPSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVzKCk7CiAgICAgZm9yICh2YXIgY2F0 ZWdvcnkgaW4gY2F0ZWdvcmllcykKICAgICAgICAgY2F0ZWdvcmllc1tjYXRlZ29yeV0uYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeS5FdmVudHMuVmlzaWJpbGl0 eUNoYW5nZWQsIHRoaXMuX29uQ2F0ZWdvcnlWaXNpYmlsaXR5Q2hhbmdlZCwgdGhpcyk7CiAKLSAg ICB0aGlzLl9vdmVydmlld0dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRvcCgwLCAwKTsKICAgICB0 aGlzLl9vdmVydmlld0NhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZp ZXdDYWxjdWxhdG9yKCk7CiAKICAgICBtb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5fb25SZWNvcmRBZGRlZCwg dGhpcyk7CiAgICAgbW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVN b2RlbC5FdmVudHMuUmVjb3Jkc0NsZWFyZWQsIHRoaXMuX3Jlc2V0LCB0aGlzKTsKKyAgICB0aGlz Ll9vdmVydmlld0dyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlk LkV2ZW50cy5XaW5kb3dDaGFuZ2VkLCB0aGlzLl9vbldpbmRvd0NoYW5nZWQsIHRoaXMpOwogfQog CisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCitXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkID0g ZnVuY3Rpb24ocHJlZml4KQoreworICAgIHRoaXMuZWxlbWVudCA9IHRoaXMuZWxlbWVudC5jcmVh dGVDaGlsZCgiZGl2IiwgImZpbGwiKTsKKyAgICB0aGlzLmVsZW1lbnQuaWQgPSBwcmVmaXggKyAi LW92ZXJ2aWV3LWNvbnRhaW5lciI7CisKKyAgICB0aGlzLl9ncmlkID0gbmV3IFdlYkluc3BlY3Rv ci5UaW1lbGluZUdyaWQoKTsKKyAgICB0aGlzLl9ncmlkLmVsZW1lbnQuaWQgPSBwcmVmaXggKyAi LW92ZXJ2aWV3LWdyaWQiOworICAgIHRoaXMuX2dyaWQuaXRlbXNHcmFwaHNFbGVtZW50LmlkID0g cHJlZml4ICsgIi1vdmVydmlldy10aW1lbGluZXMiOworICAgIHRoaXMuX2dyaWQuc2V0U2Nyb2xs QW5kRGl2aWRlclRvcCgwLCAwKTsKKworICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlz Ll9ncmlkLmVsZW1lbnQpOworCisgICAgdGhpcy5fd2luZG93ID0gbmV3IFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3V2luZG93KHRoaXMuZWxlbWVudCwgdGhpcy5fZ3JpZC5kaXZpZGVyc0xh YmVsQmFyRWxlbWVudCk7Cit9CisKK1dlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBl ID0geworICAgIGdldCBncmlkKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9ncmlkOwor ICAgIH0sCisKKyAgICBnZXQgY2xpZW50V2lkdGgoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRo aXMuZWxlbWVudC5jbGllbnRXaWR0aDsKKyAgICB9LAorCisgICAgc2hvd0l0ZW1zR3JhcGhzRWxl bWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZ3JpZC5pdGVtc0dyYXBoc0Vs ZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgfSwKKworICAgIGhpZGVJdGVt c0dyYXBoc0VsZW1lbnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2dyaWQuaXRl bXNHcmFwaHNFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgIH0sCisKKyAgICB1 cGRhdGVEaXZpZGVyczogZnVuY3Rpb24oY2FsY3VsYXRvcikKKyAgICB7CisgICAgICAgIHRoaXMu X2dyaWQudXBkYXRlRGl2aWRlcnMoY2FsY3VsYXRvcik7CisgICAgfSwKKworICAgIGFkZEV2ZW50 RGl2aWRlcnM6IGZ1bmN0aW9uKGRpdmlkZXJzKQorICAgIHsKKyAgICAgICAgdGhpcy5fZ3JpZC5h ZGRFdmVudERpdmlkZXJzKGRpdmlkZXJzKTsKKyAgICB9LAorCisgICAgcmVtb3ZlRXZlbnREaXZp ZGVyczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZ3JpZC5yZW1vdmVFdmVudERp dmlkZXJzKCk7CisgICAgfSwKKyAgICAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0gez9udW1iZXJ9 IHN0YXJ0CisgICAgICogQHBhcmFtIHs/bnVtYmVyfSBlbmQKKyAgICAgKi8KKyAgICBzZXRXaW5k b3dQb3NpdGlvbjogZnVuY3Rpb24oc3RhcnQsIGVuZCkKKyAgICB7CisgICAgICAgIHRoaXMuX3dp bmRvdy5fc2V0V2luZG93UG9zaXRpb24oc3RhcnQsIGVuZCk7CisgICAgfSwKKworICAgIHJlc2V0 OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl93aW5kb3cucmVzZXQoKTsKKyAgICB9 LAorCisgICAgZ2V0IHdpbmRvd0xlZnQoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3dp bmRvdy53aW5kb3dMZWZ0OworICAgIH0sCisKKyAgICBnZXQgd2luZG93UmlnaHQoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX3dpbmRvdy53aW5kb3dSaWdodDsKKyAgICB9LAorCisgICAg LyoqCisgICAgICogQHBhcmFtIHtudW1iZXJ9IGxlZnQKKyAgICAgKiBAcGFyYW0ge251bWJlcn0g cmlnaHQKKyAgICAgKi8KKyAgICBzZXRXaW5kb3c6IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KQorICAg IHsKKyAgICAgICAgdGhpcy5fd2luZG93Ll9zZXRXaW5kb3cobGVmdCwgcmlnaHQpOworICAgIH0s CisgICAgCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJpbmd9IGV2ZW50VHlwZQorICAgICAq IEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkV2ZW50KX0gbGlzdGVuZXIKKyAgICAgKiBA cGFyYW0ge09iamVjdD19IHRoaXNPYmplY3QKKyAgICAgKi8KKyAgICBhZGRFdmVudExpc3RlbmVy OiBmdW5jdGlvbihldmVudFR5cGUsIGxpc3RlbmVyLCB0aGlzT2JqZWN0KQorICAgIHsKKyAgICAg ICAgdGhpcy5fd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoZXZlbnRUeXBlLCBsaXN0ZW5lciwgdGhp c09iamVjdCk7CisgICAgfQorfQorCisKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFu ZS5NaW5TZWxlY3RhYmxlU2l6ZSA9IDEyOwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmll d1BhbmUuV2luZG93U2Nyb2xsU3BlZWRGYWN0b3IgPSAuMzsKQEAgLTE0NywxMCArMjM2LDEwIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLkV2ZW50czoK ICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1vZGUu RnJhbWVzOgogICAgICAgICAgICAgICAgIHRoaXMuX2hlYXBHcmFwaC5oaWRlKCk7Ci0gICAgICAg ICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5yZW1vdmVTdHls ZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2hv d0l0ZW1zR3JhcGhzRWxlbWVudCgpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuTW9kZS5NZW1vcnk6Ci0g ICAgICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5hZGRT dHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAgICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQu aGlkZUl0ZW1zR3JhcGhzRWxlbWVudCgpOwogICAgICAgICAgICAgICAgIHRoaXMuX2hlYXBHcmFw aC5zaG93KCk7CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fb3ZlcnZpZXdJdGVtc1t0aGlzLl9j dXJyZW50TW9kZV0ucmV2ZWFsQW5kU2VsZWN0KGZhbHNlKTsKQEAgLTE2NCwxMSArMjUzLDExIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIGlmIChlbmFibGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9m cmFtZU92ZXJ2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcodGhp cy5fbW9kZWwpOwotICAgICAgICAgICAgdGhpcy5fZnJhbWVPdmVydmlldy5zaG93KHRoaXMuX292 ZXJ2aWV3Q29udGFpbmVyKTsKKyAgICAgICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcuc2hvdyh0 aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAg ICB0aGlzLl9mcmFtZU92ZXJ2aWV3LmRldGFjaCgpOwogICAgICAgICAgICAgdGhpcy5fZnJhbWVP dmVydmlldyA9IG51bGw7Ci0gICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFw aHNFbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5f b3ZlcnZpZXdHcmlkLnNob3dJdGVtc0dyYXBoc0VsZW1lbnQoKTsKICAgICAgICAgICAgIHRoaXMu X2NhdGVnb3J5U3RyaXBzLnVwZGF0ZSgpOwogICAgICAgICB9CiAgICAgfSwKQEAgLTE4NSw3ICsy NzQsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewog CiAgICAgICAgIHRoaXMuX3VwZGF0ZVdpbmRvdygpOwogICAgICAgICB0aGlzLl9vdmVydmlld0Nh bGN1bGF0b3Iuc2V0V2luZG93KHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCksIHRoaXMu X21vZGVsLm1heGltdW1SZWNvcmRUaW1lKCkpOwotICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1 bGF0b3Iuc2V0RGlzcGxheVdpbmRvdygwLCB0aGlzLl9vdmVydmlld0NvbnRhaW5lci5jbGllbnRX aWR0aCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3Q2FsY3VsYXRvci5zZXREaXNwbGF5V2luZG93 KDAsIHRoaXMuX292ZXJ2aWV3R3JpZC5jbGllbnRXaWR0aCk7CiAKICAgICAgICAgaWYgKHRoaXMu X2hlYXBHcmFwaC52aXNpYmxlKQogICAgICAgICAgICAgdGhpcy5faGVhcEdyYXBoLnVwZGF0ZSgp OwpAQCAtMjIxLDcgKzMxMCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAgICAgICovCiAgICAgc2lkZWJhclJlc2l6ZWQ6IGZ1bmN0aW9uKHdpZHRo KQogICAgIHsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIuc3R5bGUubGVmdCA9IHdp ZHRoICsgInB4IjsKKyAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQuc3R5bGUubGVm dCA9IHdpZHRoICsgInB4IjsKICAgICAgICAgdGhpcy5fdG9wUGFuZVNpZGViYXJFbGVtZW50LnN0 eWxlLndpZHRoID0gd2lkdGggKyAicHgiOwogICAgICAgICB0aGlzLl91cGRhdGUoKTsKICAgICB9 LApAQCAtMjQ0LDcgKzMzMyw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghd2luZG93KQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIHRoaXMuX292ZXJ2aWV3V2luZG93Ll9zZXRXaW5kb3dQb3NpdGlvbih3aW5kb3cu c3RhcnQsIHdpbmRvdy5lbmQpOworICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0V2luZG93 UG9zaXRpb24od2luZG93LnN0YXJ0LCB3aW5kb3cuZW5kKTsKICAgICB9LAogCiAgICAgX29uUmVj b3JkQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQpAQCAtMjY0LDEwICszNTMsMTAgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRo aXMuX3dpbmRvd1N0YXJ0VGltZSA9IDA7CiAgICAgICAgIHRoaXMuX3dpbmRvd0VuZFRpbWUgPSBJ bmZpbml0eTsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3cucmVzZXQoKTsKICAgICAgICAg dGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9yLnJlc2V0KCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3 R3JpZC5yZXNldCgpOwogICAgICAgICB0aGlzLl9ldmVudERpdmlkZXJzID0gW107Ci0gICAgICAg IHRoaXMuX292ZXJ2aWV3R3JpZC51cGRhdGVEaXZpZGVycyh0aGlzLl9vdmVydmlld0NhbGN1bGF0 b3IpOworICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuZ3JpZC51cGRhdGVEaXZpZGVycyh0aGlz Ll9vdmVydmlld0NhbGN1bGF0b3IpOwogICAgICAgICBpZiAodGhpcy5fZnJhbWVPdmVydmlldykK ICAgICAgICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcucmVzZXQoKTsKICAgICAgICAgdGhpcy5f dXBkYXRlKCk7CkBAIC0yODUsMTIgKzM3NCwxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1BhbmUucHJvdG90eXBlID0gewogCiAgICAgd2luZG93TGVmdDogZnVuY3Rpb24oKQogICAg IHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX292ZXJ2aWV3V2luZG93LndpbmRvd0xlZnQ7CisgICAg ICAgIHJldHVybiB0aGlzLl9vdmVydmlld0dyaWQud2luZG93TGVmdDsKICAgICB9LAogCiAgICAg d2luZG93UmlnaHQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9vdmVy dmlld1dpbmRvdy53aW5kb3dSaWdodDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX292ZXJ2aWV3R3Jp ZC53aW5kb3dSaWdodDsKICAgICB9LAogCiAgICAgX29uV2luZG93Q2hhbmdlZDogZnVuY3Rpb24o KQpAQCAtMzI4LDcgKzQxNyw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBsZWZ0ID0gdGhpcy5fd2luZG93U3RhcnRUaW1lID8g KHRoaXMuX3dpbmRvd1N0YXJ0VGltZSAtIG9mZnNldCkgLyB0aW1lU3BhbiA6IDA7CiAgICAgICAg IHZhciByaWdodCA9IHRoaXMuX3dpbmRvd0VuZFRpbWUgPCBJbmZpbml0eSA/ICh0aGlzLl93aW5k b3dFbmRUaW1lIC0gb2Zmc2V0KSAvIHRpbWVTcGFuIDogMTsKICAgICAgICAgdGhpcy5faWdub3Jl V2luZG93Q2hhbmdlZEV2ZW50ID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fb3ZlcnZpZXdXaW5kb3cu X3NldFdpbmRvdyhsZWZ0LCByaWdodCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5zZXRX aW5kb3cobGVmdCwgcmlnaHQpOwogICAgICAgICB0aGlzLl9pZ25vcmVXaW5kb3dDaGFuZ2VkRXZl bnQgPSBmYWxzZTsKICAgICB9LAogCg== 193590 2013-03-18 09:59:49 -0700 2013-03-18 10:21:43 -0700 Patch bug-112584-20130318205541.patch text/plain 11830 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI5OGYwZGM4NzE5OWNm NjJlMjljNmIzZjRkZmFjNDRkZGU1OTgxZi4uODRmMDkzZDMxZTg0NDI0MzhhNzkwMWQ3MWE0OGY5 YmI4MTQwOWMzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTE4ICBJbHlh IFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBtb3ZlIF90aW1lbGluZUdyaWQgJiYgX3RpbWVsaW5lT3ZlcnZpZXdXaW5kb3cgZnJvbSBU aW1lbGluZU92ZXJ2aWV3UGFuZSBpbnRvIGEgbmV3IGNsYXNzIE92ZXJ2aWV3R3JpZC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjU4NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIHRoZSBmaXJz dCBwYXRoIGluIHRoZSBzZXQuCisgICAgICAgIFRoZSBlbmQgZ29hbCBpcyB0byBleHRyYWN0IE92 ZXJ2aWV3R3JpZCB3aXRoIHdpbmRvdyBzZWxlY3RvcnMKKyAgICAgICAgaW50byBhIHNlcGFyYXRl IGNsYXNzIGluIHNlcGFyYXRlIGZpbGUgYW5kIHJldXNlIGl0IGluIENQVSBGbGFtZUNoYXJ0Lgor CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZSk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmll d0dyaWQucHJvdG90eXBlLmdldCBncmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmll d0dyaWQucHJvdG90eXBlLmdldCBjbGllbnRXaWR0aCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu T3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zaG93SXRlbXNHcmFwaHNFbGVtZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLmhpZGVJdGVtc0dyYXBoc0VsZW1l bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUudXBkYXRl RGl2aWRlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUu YWRkRXZlbnREaXZpZGVycyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnBy b3RvdHlwZS5yZW1vdmVFdmVudERpdmlkZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVy dmlld0dyaWQucHJvdG90eXBlLnNldFdpbmRvd1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5PdmVydmlld0dyaWQucHJvdG90eXBlLmdldCB3aW5kb3dMZWZ0KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5PdmVydmlld0dyaWQucHJvdG90eXBlLmdldCB3aW5kb3dSaWdodCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5zZXRXaW5kb3cpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3R3JpZC5wcm90b3R5cGUuYWRkRXZlbnRMaXN0ZW5lcik6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLnNl dE1vZGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3Rv dHlwZS5fc2V0RnJhbWVNb2RlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5wcm90b3R5cGUuX3VwZGF0ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld1BhbmUucHJvdG90eXBlLnNpZGViYXJSZXNpemVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuem9vbVRvRnJhbWUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fcmVzZXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS53 aW5kb3dMZWZ0KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5w cm90b3R5cGUud2luZG93UmlnaHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLnByb3RvdHlwZS5fdXBkYXRlV2luZG93KToKKwogMjAxMy0wMy0xOCAgU2hlcmlm ZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjE0NjAzNS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCmluZGV4IGE0NDQzZThm YjY2MTYwZmI5NDE5ODJkNGJiZDdjMDhhMTUxMDE0MzAuLjA0NGY1NjliODc1Y2ZjZjU5ZDA3ZWM0 NjVhMDRkMGRjZmM4YzhlMjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwpAQCAtNzQsNDAgKzc0LDE1 MiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUgPSBmdW5jdGlvbihtb2RlbCkK ICAgICAKICAgICB0aGlzLl9vdmVydmlld0l0ZW1zW3RoaXMuX2N1cnJlbnRNb2RlXS5yZXZlYWxB bmRTZWxlY3QoZmFsc2UpOwogCi0gICAgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIgPSB0aGlzLmVs ZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJmaWxsIik7Ci0gICAgdGhpcy5fb3ZlcnZpZXdDb250 YWluZXIuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctY29udGFpbmVyIjsKLQotICAgIHRoaXMuX292 ZXJ2aWV3R3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkKCk7Ci0gICAgdGhpcy5f b3ZlcnZpZXdHcmlkLmVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXctZ3JpZCI7Ci0gICAg dGhpcy5fb3ZlcnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5pZCA9ICJ0aW1lbGluZS1vdmVy dmlldy10aW1lbGluZXMiOwotCi0gICAgdGhpcy5fb3ZlcnZpZXdDb250YWluZXIuYXBwZW5kQ2hp bGQodGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQpOworICAgIHRoaXMuX292ZXJ2aWV3R3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdHcmlkKCJ0aW1lbGluZSIpOwogCiAgICAgdGhpcy5f aGVhcEdyYXBoID0gbmV3IFdlYkluc3BlY3Rvci5IZWFwR3JhcGgodGhpcy5fbW9kZWwpOwogICAg IHRoaXMuX2hlYXBHcmFwaC5lbGVtZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LW1lbW9yeSI7 Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2hlYXBH cmFwaC5lbGVtZW50LCB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50KTsKLQot ICAgIHRoaXMuX292ZXJ2aWV3V2luZG93ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3V2luZG93KHRoaXMuX292ZXJ2aWV3Q29udGFpbmVyLCB0aGlzLl9vdmVydmlld0dyaWQuZGl2 aWRlcnNMYWJlbEJhckVsZW1lbnQpOwotICAgIHRoaXMuX292ZXJ2aWV3V2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cuRXZlbnRzLldpbmRv d0NoYW5nZWQsIHRoaXMuX29uV2luZG93Q2hhbmdlZCwgdGhpcyk7CisgICAgdGhpcy5fb3ZlcnZp ZXdHcmlkLmluc2VydEJlZm9yZUl0ZW1zR3JhcGhzRWxlbWVudCh0aGlzLl9oZWFwR3JhcGguZWxl bWVudCk7CiAKICAgICB2YXIgc2VwYXJhdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwogICAgIHNlcGFyYXRvckVsZW1lbnQuaWQgPSAidGltZWxpbmUtb3ZlcnZpZXct c2VwYXJhdG9yIjsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQoc2VwYXJhdG9yRWxlbWVu dCk7CiAKICAgICB0aGlzLl9jYXRlZ29yeVN0cmlwcyA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxp bmVDYXRlZ29yeVN0cmlwcyh0aGlzLl9tb2RlbCk7Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0 ZW1zR3JhcGhzRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jYXRlZ29yeVN0cmlwcy5lbGVtZW50 KTsKKyAgICB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50KCkuYXBwZW5kQ2hp bGQodGhpcy5fY2F0ZWdvcnlTdHJpcHMuZWxlbWVudCk7CiAgCiAgICAgdmFyIGNhdGVnb3JpZXMg PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVzKCk7CiAg ICAgZm9yICh2YXIgY2F0ZWdvcnkgaW4gY2F0ZWdvcmllcykKICAgICAgICAgY2F0ZWdvcmllc1tj YXRlZ29yeV0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeS5F dmVudHMuVmlzaWJpbGl0eUNoYW5nZWQsIHRoaXMuX29uQ2F0ZWdvcnlWaXNpYmlsaXR5Q2hhbmdl ZCwgdGhpcyk7CiAKLSAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRv cCgwLCAwKTsKICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IgPSBuZXcgV2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdDYWxjdWxhdG9yKCk7CiAKICAgICBtb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLkV2ZW50cy5SZWNvcmRBZGRlZCwgdGhpcy5f b25SZWNvcmRBZGRlZCwgdGhpcyk7CiAgICAgbW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVGltZWxpbmVNb2RlbC5FdmVudHMuUmVjb3Jkc0NsZWFyZWQsIHRoaXMuX3Jlc2V0LCB0 aGlzKTsKKyAgICB0aGlzLl9vdmVydmlld0dyaWQuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuT3ZlcnZpZXdHcmlkLkV2ZW50cy5XaW5kb3dDaGFuZ2VkLCB0aGlzLl9vbldpbmRvd0NoYW5n ZWQsIHRoaXMpOwogfQogCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICovCitXZWJJbnNwZWN0b3Iu T3ZlcnZpZXdHcmlkID0gZnVuY3Rpb24ocHJlZml4KQoreworICAgIHRoaXMuZWxlbWVudCA9IHRo aXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgImZpbGwiKTsKKyAgICB0aGlzLmVsZW1lbnQu aWQgPSBwcmVmaXggKyAiLW92ZXJ2aWV3LWNvbnRhaW5lciI7CisKKyAgICB0aGlzLl9ncmlkID0g bmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQoKTsKKyAgICB0aGlzLl9ncmlkLmVsZW1lbnQu aWQgPSBwcmVmaXggKyAiLW92ZXJ2aWV3LWdyaWQiOworICAgIHRoaXMuX2dyaWQuaXRlbXNHcmFw aHNFbGVtZW50LmlkID0gcHJlZml4ICsgIi1vdmVydmlldy10aW1lbGluZXMiOworICAgIHRoaXMu X2dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRvcCgwLCAwKTsKKworICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9ncmlkLmVsZW1lbnQpOworCisgICAgdGhpcy5fd2luZG93ID0gbmV3 IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93KHRoaXMuZWxlbWVudCwgdGhpcy5f Z3JpZC5kaXZpZGVyc0xhYmVsQmFyRWxlbWVudCk7Cit9CisKK1dlYkluc3BlY3Rvci5PdmVydmll d0dyaWQucHJvdG90eXBlID0geworICAgIGl0ZW1zR3JhcGhzRWxlbWVudDogZnVuY3Rpb24oKQor ICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2dyaWQuaXRlbXNHcmFwaHNFbGVtZW50OworICAg IH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyFOb2RlfSBjaGlsZAorICAgICAqLworICAg IGluc2VydEJlZm9yZUl0ZW1zR3JhcGhzRWxlbWVudDogZnVuY3Rpb24oY2hpbGQpCisgICAgewor ICAgICAgICB0aGlzLl9ncmlkLmVsZW1lbnQuaW5zZXJ0QmVmb3JlKGNoaWxkLCB0aGlzLl9ncmlk Lml0ZW1zR3JhcGhzRWxlbWVudCk7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4g e251bWJlcn0KKyAgICAgKi8KKyAgICBjbGllbnRXaWR0aDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aDsKKyAgICB9LAorCisgICAgc2hv d0l0ZW1zR3JhcGhzRWxlbWVudDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fZ3Jp ZC5pdGVtc0dyYXBoc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CisgICAgfSwK KworICAgIGhpZGVJdGVtc0dyYXBoc0VsZW1lbnQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IHRoaXMuX2dyaWQuaXRlbXNHcmFwaHNFbGVtZW50LmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwor ICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld0NhbGN1bGF0b3J9IGNhbGN1bGF0b3IKKyAgICAgKi8KKyAgICB1cGRhdGVEaXZpZGVy czogZnVuY3Rpb24oY2FsY3VsYXRvcikKKyAgICB7CisgICAgICAgIHRoaXMuX2dyaWQudXBkYXRl RGl2aWRlcnMoY2FsY3VsYXRvcik7CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEBwYXJhbSB7 IUFycmF5LjxFbGVtZW50Pn0gZGl2aWRlcnMKKyAgICAgKi8KKyAgICBhZGRFdmVudERpdmlkZXJz OiBmdW5jdGlvbihkaXZpZGVycykKKyAgICB7CisgICAgICAgIHRoaXMuX2dyaWQuYWRkRXZlbnRE aXZpZGVycyhkaXZpZGVycyk7CisgICAgfSwKKworICAgIHJlbW92ZUV2ZW50RGl2aWRlcnM6IGZ1 bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX2dyaWQucmVtb3ZlRXZlbnREaXZpZGVycygp OworICAgIH0sCisgICAgCisgICAgLyoqCisgICAgICogQHBhcmFtIHs/bnVtYmVyfSBzdGFydAor ICAgICAqIEBwYXJhbSB7P251bWJlcn0gZW5kCisgICAgICovCisgICAgc2V0V2luZG93UG9zaXRp b246IGZ1bmN0aW9uKHN0YXJ0LCBlbmQpCisgICAgeworICAgICAgICB0aGlzLl93aW5kb3cuX3Nl dFdpbmRvd1Bvc2l0aW9uKHN0YXJ0LCBlbmQpOworICAgIH0sCisKKyAgICByZXNldDogZnVuY3Rp b24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fd2luZG93LnJlc2V0KCk7CisgICAgfSwKKworICAg IC8qKgorICAgICAqIEByZXR1cm4ge251bWJlcn0KKyAgICAgKi8KKyAgICB3aW5kb3dMZWZ0OiBm dW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fd2luZG93LndpbmRvd0xlZnQ7 CisgICAgfSwKKworICAgIC8qKgorICAgICAqIEByZXR1cm4ge251bWJlcn0KKyAgICAgKi8KKyAg ICB3aW5kb3dSaWdodDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3dp bmRvdy53aW5kb3dSaWdodDsKKyAgICB9LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHtudW1i ZXJ9IGxlZnQKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gcmlnaHQKKyAgICAgKi8KKyAgICBzZXRX aW5kb3c6IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KQorICAgIHsKKyAgICAgICAgdGhpcy5fd2luZG93 Ll9zZXRXaW5kb3cobGVmdCwgcmlnaHQpOworICAgIH0sCisgICAgCisgICAgLyoqCisgICAgICog QHBhcmFtIHtzdHJpbmd9IGV2ZW50VHlwZQorICAgICAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5z cGVjdG9yLkV2ZW50KX0gbGlzdGVuZXIKKyAgICAgKiBAcGFyYW0ge09iamVjdD19IHRoaXNPYmpl Y3QKKyAgICAgKi8KKyAgICBhZGRFdmVudExpc3RlbmVyOiBmdW5jdGlvbihldmVudFR5cGUsIGxp c3RlbmVyLCB0aGlzT2JqZWN0KQorICAgIHsKKyAgICAgICAgdGhpcy5fd2luZG93LmFkZEV2ZW50 TGlzdGVuZXIoZXZlbnRUeXBlLCBsaXN0ZW5lciwgdGhpc09iamVjdCk7CisgICAgfQorfQorCisK IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5NaW5TZWxlY3RhYmxlU2l6ZSA9IDEy OwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuV2luZG93U2Nyb2xsU3BlZWRG YWN0b3IgPSAuMzsKQEAgLTE0NywxMCArMjU5LDEwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLkV2ZW50czoKICAgICAgICAgICAgIGNhc2UgV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLk1vZGUuRnJhbWVzOgogICAgICAgICAgICAgICAg IHRoaXMuX2hlYXBHcmFwaC5oaWRlKCk7Ci0gICAgICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdH cmlkLml0ZW1zR3JhcGhzRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAgICAg ICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2hvd0l0ZW1zR3JhcGhzRWxlbWVudCgpOwog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUuTW9kZS5NZW1vcnk6Ci0gICAgICAgICAgICAgICAgdGhpcy5fb3Zl cnZpZXdHcmlkLml0ZW1zR3JhcGhzRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJoaWRkZW4iKTsKKyAg ICAgICAgICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuaGlkZUl0ZW1zR3JhcGhzRWxlbWVudCgp OwogICAgICAgICAgICAgICAgIHRoaXMuX2hlYXBHcmFwaC5zaG93KCk7CiAgICAgICAgIH0KICAg ICAgICAgdGhpcy5fb3ZlcnZpZXdJdGVtc1t0aGlzLl9jdXJyZW50TW9kZV0ucmV2ZWFsQW5kU2Vs ZWN0KGZhbHNlKTsKQEAgLTE2NCwxMSArMjc2LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92 ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGlm IChlbmFibGVkKSB7CiAgICAgICAgICAgICB0aGlzLl9mcmFtZU92ZXJ2aWV3ID0gbmV3IFdlYklu c3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcodGhpcy5fbW9kZWwpOwotICAgICAgICAgICAg dGhpcy5fZnJhbWVPdmVydmlldy5zaG93KHRoaXMuX292ZXJ2aWV3Q29udGFpbmVyKTsKKyAgICAg ICAgICAgIHRoaXMuX2ZyYW1lT3ZlcnZpZXcuc2hvdyh0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVu dCk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICB0aGlzLl9mcmFtZU92ZXJ2aWV3LmRl dGFjaCgpOwogICAgICAgICAgICAgdGhpcy5fZnJhbWVPdmVydmlldyA9IG51bGw7Ci0gICAgICAg ICAgICB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50LnJlbW92ZVN0eWxlQ2xh c3MoImhpZGRlbiIpOworICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLnNob3dJdGVtc0dy YXBoc0VsZW1lbnQoKTsKICAgICAgICAgICAgIHRoaXMuX2NhdGVnb3J5U3RyaXBzLnVwZGF0ZSgp OwogICAgICAgICB9CiAgICAgfSwKQEAgLTE4NSw3ICsyOTcsNyBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX3VwZGF0ZVdp bmRvdygpOwogICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3Iuc2V0V2luZG93KHRoaXMu X21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCksIHRoaXMuX21vZGVsLm1heGltdW1SZWNvcmRUaW1l KCkpOwotICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3Iuc2V0RGlzcGxheVdpbmRvdygw LCB0aGlzLl9vdmVydmlld0NvbnRhaW5lci5jbGllbnRXaWR0aCk7CisgICAgICAgIHRoaXMuX292 ZXJ2aWV3Q2FsY3VsYXRvci5zZXREaXNwbGF5V2luZG93KDAsIHRoaXMuX292ZXJ2aWV3R3JpZC5j bGllbnRXaWR0aCgpKTsKIAogICAgICAgICBpZiAodGhpcy5faGVhcEdyYXBoLnZpc2libGUpCiAg ICAgICAgICAgICB0aGlzLl9oZWFwR3JhcGgudXBkYXRlKCk7CkBAIC0yMjEsNyArMzMzLDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBzaWRlYmFyUmVzaXplZDogZnVuY3Rpb24od2lkdGgpCiAgICAgewotICAgICAgICB0aGlz Ll9vdmVydmlld0NvbnRhaW5lci5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOworICAgICAgICB0 aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudC5zdHlsZS5sZWZ0ID0gd2lkdGggKyAicHgiOwogICAg ICAgICB0aGlzLl90b3BQYW5lU2lkZWJhckVsZW1lbnQuc3R5bGUud2lkdGggPSB3aWR0aCArICJw eCI7CiAgICAgICAgIHRoaXMuX3VwZGF0ZSgpOwogICAgIH0sCkBAIC0yNDQsNyArMzU2LDcgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAg aWYgKCF3aW5kb3cpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fb3ZlcnZp ZXdXaW5kb3cuX3NldFdpbmRvd1Bvc2l0aW9uKHdpbmRvdy5zdGFydCwgd2luZG93LmVuZCk7Cisg ICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5zZXRXaW5kb3dQb3NpdGlvbih3aW5kb3cuc3RhcnQs IHdpbmRvdy5lbmQpOwogICAgIH0sCiAKICAgICBfb25SZWNvcmRBZGRlZDogZnVuY3Rpb24oZXZl bnQpCkBAIC0yNjQsOCArMzc2LDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5l LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHRoaXMuX3dpbmRvd1N0YXJ0VGltZSA9IDA7 CiAgICAgICAgIHRoaXMuX3dpbmRvd0VuZFRpbWUgPSBJbmZpbml0eTsKLSAgICAgICAgdGhpcy5f b3ZlcnZpZXdXaW5kb3cucmVzZXQoKTsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdDYWxjdWxhdG9y LnJlc2V0KCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5yZXNldCgpOwogICAgICAgICB0 aGlzLl9ldmVudERpdmlkZXJzID0gW107CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC51cGRh dGVEaXZpZGVycyh0aGlzLl9vdmVydmlld0NhbGN1bGF0b3IpOwogICAgICAgICBpZiAodGhpcy5f ZnJhbWVPdmVydmlldykKQEAgLTI4NSwxMiArMzk3LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAKICAgICB3aW5kb3dMZWZ0OiBmdW5jdGlvbigp CiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fb3ZlcnZpZXdXaW5kb3cud2luZG93TGVmdDsK KyAgICAgICAgcmV0dXJuIHRoaXMuX292ZXJ2aWV3R3JpZC53aW5kb3dMZWZ0KCk7CiAgICAgfSwK IAogICAgIHdpbmRvd1JpZ2h0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICByZXR1cm4gdGhp cy5fb3ZlcnZpZXdXaW5kb3cud2luZG93UmlnaHQ7CisgICAgICAgIHJldHVybiB0aGlzLl9vdmVy dmlld0dyaWQud2luZG93UmlnaHQoKTsKICAgICB9LAogCiAgICAgX29uV2luZG93Q2hhbmdlZDog ZnVuY3Rpb24oKQpAQCAtMzI4LDcgKzQ0MCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBsZWZ0ID0gdGhpcy5fd2luZG93U3Rh cnRUaW1lID8gKHRoaXMuX3dpbmRvd1N0YXJ0VGltZSAtIG9mZnNldCkgLyB0aW1lU3BhbiA6IDA7 CiAgICAgICAgIHZhciByaWdodCA9IHRoaXMuX3dpbmRvd0VuZFRpbWUgPCBJbmZpbml0eSA/ICh0 aGlzLl93aW5kb3dFbmRUaW1lIC0gb2Zmc2V0KSAvIHRpbWVTcGFuIDogMTsKICAgICAgICAgdGhp cy5faWdub3JlV2luZG93Q2hhbmdlZEV2ZW50ID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fb3ZlcnZp ZXdXaW5kb3cuX3NldFdpbmRvdyhsZWZ0LCByaWdodCk7CisgICAgICAgIHRoaXMuX292ZXJ2aWV3 R3JpZC5zZXRXaW5kb3cobGVmdCwgcmlnaHQpOwogICAgICAgICB0aGlzLl9pZ25vcmVXaW5kb3dD aGFuZ2VkRXZlbnQgPSBmYWxzZTsKICAgICB9LAogCg==