126955 2014-01-13 19:23:41 -0800 Web Inspector: Filter the overview graph and sidebar based on time selection 2014-01-20 19:04:06 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 967615 0 timothy 2014-01-13 19:23:41 -0800 The graph and sidebar rows should be filtered by the time selection. 967616 1 webkit-bug-importer 2014-01-13 19:23:57 -0800 <rdar://problem/15811472> 967617 2 221096 timothy 2014-01-13 19:27:55 -0800 Created attachment 221096 Patch 967620 3 221097 timothy 2014-01-13 19:46:44 -0800 Created attachment 221097 Patch 967677 4 221097 joepeck 2014-01-13 23:02:04 -0800 Comment on attachment 221097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221097&action=review r=me > Source/WebInspectorUI/UserInterface/NavigationSidebarPanel.js:307 > + applyFiltersToTreeElement: function(treeElement, dontExpandOnMatch) I always prefer "doNotFoo" to "dontFoo". 970129 5 timothy 2014-01-20 19:04:06 -0800 https://trac.webkit.org/changeset/162414 221096 2014-01-13 19:27:55 -0800 2014-01-13 19:46:41 -0800 Patch bug-126955-20140113192754.patch text/plain 9011 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl ZDliZmIxZDJiNTEyZTk2ZWQ0MTIwZDNmNjc2ZWY0ZjA0NWE2OTQzLi4yODJlMGQxY2MzZGRkYTgz ZWYzNWE2Y2JhZWZhODkyYzI5MTQ3YTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNiBAQAogMjAxNC0wMS0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgRmlsdGVyIHRoZSBUaW1lbGluZSBvdmVydmlldyBncmFwaCBhbmQgc2lk ZWJhciBiYXNlZCBvbiB0aGUgY3VycmVudCB0aW1lIHNlbGVjdGlvbi4KKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2OTU1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL05hdmln YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5wcm90b3R5cGUudXBkYXRlRmlsdGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5oYXNDdXN0b21GaWx0ZXJzKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5tYXRj aFRyZWVFbGVtZW50QWdhaW5zdEN1c3RvbUZpbHRlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLmFwcGx5RmlsdGVyc1RvVHJlZUVsZW1l bnQubWF0Y2hUZXh0RmlsdGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLnByb3RvdHlwZS5hcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50KToKKyAgICAgICAg QWRkIHN1cHBvcnQgZm9yIGN1c3RvbSBmaWx0ZXJzIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUubWF0Y2hUcmVl RWxlbWVudEFnYWluc3RDdXN0b21GaWx0ZXJzLmNoZWNrVGltZUJvdW5kcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUubWF0Y2hUcmVlRWxlbWVu dEFnYWluc3RDdXN0b21GaWx0ZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAg IEZpbHRlciBrbm93biB0cmVlIGVsZW1lbnQgdHlwZXMgYnkgdGltZS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIg PiAucGFuZWwudGltZWxpbmUgPiAuZW1wdHktY29udGVudC1wbGFjZWhvbGRlcik6CisgICAgICAg IFBvc2l0aW9uIHRoZSBlbXB0eSBwbGFjZWhvbGRlciB3aXRoIHRoZSBjb250ZW50LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuaGFzQ3VzdG9tRmlsdGVy cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBl Lm1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVycyk6CisgICAgICAgIERlZmVyIGZp bHRlcmluZyB0byB0aGUgVGltZWxpbmVDb250ZW50Vmlldy4KKworMjAxNC0wMS0xMyAgVGltb3Ro eSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50IHN0YXRl IGNvb2tpZSBzdXBwb3J0IGZvciBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuCiAK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjkyMQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggYWIxZjNjMWQyMzVhMzc2YTc2NzRjOWU5Y2U3 ZTU1MTlmNGYyMmU5Yy4uZDE1MjQ3NGI5YTBiMmE3ZTVmMGMwMzY2NWQzNTA0MGZiODBmYzZhMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0yODcsOSArMjg3LDI2IEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAg IH0sCiAKKyAgICB1cGRhdGVGaWx0ZXI6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMu X3VwZGF0ZUZpbHRlcigpOworICAgIH0sCisKKyAgICBoYXNDdXN0b21GaWx0ZXJzOiBmdW5jdGlv bigpCisgICAgeworICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRl ZC4KKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0sCisKKyAgICBtYXRjaFRyZWVFbGVtZW50 QWdhaW5zdEN1c3RvbUZpbHRlcnM6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAg ICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyBpZiBuZWVkZWQuCisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0sCisKICAgICBhcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50OiBmdW5jdGlv bih0cmVlRWxlbWVudCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fZmlsdGVyQmFyLmhhc0Fj dGl2ZUZpbHRlcnMoKSkgeworICAgICAgICBpZiAoIXRoaXMuX2ZpbHRlckJhci5oYXNBY3RpdmVG aWx0ZXJzKCkgJiYgIXRoaXMuaGFzQ3VzdG9tRmlsdGVycygpKSB7CiAgICAgICAgICAgICAvLyBO byBmaWx0ZXJzLCBzbyBtYWtlIGV2ZXJ5dGhpbmcgdmlzaWJsZS4KICAgICAgICAgICAgIHRyZWVF bGVtZW50LmhpZGRlbiA9IGZhbHNlOwogCkBAIC0zMDIsMjYgKzMxOSwyMyBAQCBXZWJJbnNwZWN0 b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAotICAgICAgICAvLyBHZXQgdGhlIGZpbHRlcmFibGUgZGF0YSBmcm9t IHRoZSB0cmVlIGVsZW1lbnQuCi0gICAgICAgIHZhciBmaWx0ZXJhYmxlRGF0YSA9IHRyZWVFbGVt ZW50LmZpbHRlcmFibGVEYXRhOwotICAgICAgICBpZiAoIWZpbHRlcmFibGVEYXRhKQotICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB2YXIgZmlsdGVyYWJsZURhdGEgPSB0cmVlRWxlbWVudC5m aWx0ZXJhYmxlRGF0YSB8fCB7fTsKIAogICAgICAgICB2YXIgc2VsZiA9IHRoaXM7Ci0gICAgICAg IGZ1bmN0aW9uIG1hdGNoVGV4dEZpbHRlcihpbnB1dCkKKyAgICAgICAgZnVuY3Rpb24gbWF0Y2hU ZXh0RmlsdGVyKGlucHV0cykKICAgICAgICAgewotICAgICAgICAgICAgaWYgKCFzZWxmLl90ZXh0 RmlsdGVyUmVnZXgpCisgICAgICAgICAgICBpZiAoIWlucHV0cyB8fCAhc2VsZi5fdGV4dEZpbHRl clJlZ2V4KQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgICAgICAgICAvLyBD b252ZXJ0IHRvIGEgc2luZ2xlIGl0ZW0gYXJyYXkgaWYgbmVlZGVkLgotICAgICAgICAgICAgaWYg KCEoaW5wdXQgaW5zdGFuY2VvZiBBcnJheSkpCi0gICAgICAgICAgICAgICAgaW5wdXQgPSBbaW5w dXRdOworICAgICAgICAgICAgaWYgKCEoaW5wdXRzIGluc3RhbmNlb2YgQXJyYXkpKQorICAgICAg ICAgICAgICAgIGlucHV0cyA9IFtpbnB1dHNdOwogCiAgICAgICAgICAgICAvLyBMb29wIG92ZXIg YWxsIHRoZSBpbnB1dHMgYW5kIHRyeSB0byBtYXRjaCB0aGVtLgotICAgICAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBpbnB1dC5sZW5ndGg7ICsraSkgewotICAgICAgICAgICAgICAgIGlmICgh aW5wdXRbaV0pCisgICAgICAgICAgICBmb3IgKHZhciBpbnB1dCBvZiBpbnB1dHMpIHsKKyAgICAg ICAgICAgICAgICBpZiAoIWlucHV0KQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAg ICAgICAgICAgICAgICBpZiAoc2VsZi5fdGV4dEZpbHRlclJlZ2V4LnRlc3QoaW5wdXRbaV0pKQor ICAgICAgICAgICAgICAgIGlmIChzZWxmLl90ZXh0RmlsdGVyUmVnZXgudGVzdChpbnB1dCkpCiAg ICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQogCkBAIC0zNDgs NyArMzYyLDcgQEAgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgaWYgKG1hdGNoVGV4dEZp bHRlcihmaWx0ZXJhYmxlRGF0YS50ZXh0KSkgeworICAgICAgICBpZiAobWF0Y2hUZXh0RmlsdGVy KGZpbHRlcmFibGVEYXRhLnRleHQpICYmIHRoaXMubWF0Y2hUcmVlRWxlbWVudEFnYWluc3RDdXN0 b21GaWx0ZXJzKHRyZWVFbGVtZW50KSkgewogICAgICAgICAgICAgLy8gTWFrZSB0aGlzIGVsZW1l bnQgdmlzaWJsZSBzaW5jZSBpdCBtYXRjaGVzLgogICAgICAgICAgICAgbWFrZVZpc2libGUoKTsK ICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzCmluZGV4IDBkMjg0MWQ4Y2E1 MTQ2ZDdiNzNhYWMxNjA0MGZlNDc4NTczY2Y3OTIuLjc0YjY1MTIwM2JjZGViODdhM2MxNWJmNzI2 Njc1YWYzYmMzNmJkZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qcwpAQCAtMTQ5LDYgKzE0OSw0OSBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAg IHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcudXBkYXRlTGF5b3V0KCk7CiAgICAgfSwKIAorICAg IG1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVyczogZnVuY3Rpb24odHJlZUVsZW1l bnQpCisgICAgeworICAgICAgICB2YXIgc3RhcnRUaW1lID0gdGhpcy5fdGltZWxpbmVPdmVydmll dy5zZWxlY3Rpb25TdGFydFRpbWU7CisgICAgICAgIHZhciBlbmRUaW1lID0gdGhpcy5fdGltZWxp bmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNl bGVjdGlvbkR1cmF0aW9uOworICAgICAgICB2YXIgY3VycmVudFRpbWUgPSB0aGlzLl9jdXJyZW50 VGltZU1hcmtlci50aW1lOworCisgICAgICAgIGZ1bmN0aW9uIGNoZWNrVGltZUJvdW5kcyhpdGVt U3RhcnRUaW1lLCBpdGVtRW5kVGltZSkKKyAgICAgICAgeworICAgICAgICAgICAgY29uc29sZS5h c3NlcnQoIWlzTmFOKGl0ZW1TdGFydFRpbWUpKTsKKworICAgICAgICAgICAgaXRlbUVuZFRpbWUg PSBpdGVtRW5kVGltZSB8fCBjdXJyZW50VGltZTsKKworICAgICAgICAgICAgaWYgKGl0ZW1TdGFy dFRpbWUgPj0gc3RhcnRUaW1lICYmIGl0ZW1TdGFydFRpbWUgPD0gZW5kVGltZSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgICAgIGlmIChpdGVtRW5kVGltZSA+PSBzdGFy dFRpbWUgJiYgaXRlbUVuZFRpbWUgPD0gZW5kVGltZSkKKyAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgfQorCisgICAgICAgIGlm ICh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVFbGVtZW50 KSB7CisgICAgICAgICAgICB2YXIgcmVzb3VyY2UgPSB0cmVlRWxlbWVudC5yZXNvdXJjZTsKKyAg ICAgICAgICAgIHJldHVybiBjaGVja1RpbWVCb3VuZHMocmVzb3VyY2UucmVxdWVzdFNlbnRUaW1l c3RhbXAsIHJlc291cmNlLmZpbmlzaGVkT3JGYWlsZWRUaW1lc3RhbXApOworICAgICAgICB9CisK KyAgICAgICAgaWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVUaW1lbGluZVRyZWVFbGVtZW50KSB7CisgICAgICAgICAgICB2YXIgc291cmNlQ29kZVRpbWVs aW5lID0gdHJlZUVsZW1lbnQuc291cmNlQ29kZVRpbWVsaW5lOworCisgICAgICAgICAgICAvLyBE byBhIHF1aWNrIGNoZWNrIG9mIHRoZSB0aW1lbGluZSBib3VuZHMgYmVmb3JlIHdlIGNoZWNrIGVh Y2ggcmVjb3JkLgorICAgICAgICAgICAgaWYgKCFjaGVja1RpbWVCb3VuZHMoc291cmNlQ29kZVRp bWVsaW5lLnN0YXJ0VGltZSwgc291cmNlQ29kZVRpbWVsaW5lLmVuZFRpbWUpKQorICAgICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICAgICAgZm9yICh2YXIgcmVjb3JkIG9mIHNv dXJjZUNvZGVUaW1lbGluZS5yZWNvcmRzKSB7CisgICAgICAgICAgICAgICAgaWYgKGNoZWNrVGlt ZUJvdW5kcyhyZWNvcmQuc3RhcnRUaW1lLCByZWNvcmQuZW5kVGltZSkpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIH0KKworICAgICAgICBjb25zb2xlLmVycm9yKCJVbmtub3duIFRyZWVF bGVtZW50LCBjYW4ndCBmaWx0ZXIgYnkgdGltZS4iKTsKKyAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgfSwKKwogICAgIC8vIFByaXZhdGUKIAogICAgIF9wYXRoQ29tcG9uZW50U2VsZWN0ZWQ6IGZ1 bmN0aW9uKGV2ZW50KQpAQCAtMjczLDUgKzMxNiw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNv bnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmll dy56ZXJvVGltZSA9IHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcuc3RhcnRUaW1lOwogICAgICAgICB0 aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3LnN0YXJ0VGltZSA9IHRoaXMuX3RpbWVsaW5lT3ZlcnZp ZXcuc2VsZWN0aW9uU3RhcnRUaW1lOwogICAgICAgICB0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3 LmVuZFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSArIHRo aXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRpb247CisKKyAgICAgICAgV2ViSW5z cGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLnVwZGF0ZUZpbHRlcigpOwogICAgIH0KIH07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNp ZGViYXJQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1l bGluZVNpZGViYXJQYW5lbC5jc3MKaW5kZXggMzRiMjQ5MGJkNWVmMTMyOWFiZWI4MjY4MDk5MzE4 ZjczMjc3YzM4Yy4uNGJmN2ViYmMwZmNkN2FlYTEwYTFlZmEyODcyMzdhMTNlZTZmYzUzMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRl YmFyUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rp bWVsaW5lU2lkZWJhclBhbmVsLmNzcwpAQCAtOTUsNyArOTUsOCBAQAogICAgIG9wYWNpdHk6IDAu ODsKIH0KIAotLnNpZGViYXIgPiAucGFuZWwudGltZWxpbmUgPiAuY29udGVudCB7Cisuc2lkZWJh ciA+IC5wYW5lbC50aW1lbGluZSA+IC5jb250ZW50LAorLnNpZGViYXIgPiAucGFuZWwudGltZWxp bmUgPiAuZW1wdHktY29udGVudC1wbGFjZWhvbGRlciB7CiAgICAgdG9wOiAxNzVweDsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVT aWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1l bGluZVNpZGViYXJQYW5lbC5qcwppbmRleCAwNjJjNDhkM2ZkOGQ4ZWFhMjg1ODFmN2ExMDBkMzNj MjJhNTI5OWM2Li4wMmE1NWI2ZDNlNWMxZmU5ZjJkNWIwNDU0NjE4YzUxMGE0YWU2MWI3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGVi YXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1l bGluZVNpZGViYXJQYW5lbC5qcwpAQCAtMTYyLDYgKzE2MiwxOSBAQCBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuY29u dGVudEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRoaXMuX3RpbWVsaW5lQ29udGVudFZpZXcpOwog ICAgIH0sCiAKKyAgICBoYXNDdXN0b21GaWx0ZXJzOiBmdW5jdGlvbigpCisgICAgeworICAgICAg ICByZXR1cm4gdHJ1ZTsKKyAgICB9LAorCisgICAgbWF0Y2hUcmVlRWxlbWVudEFnYWluc3RDdXN0 b21GaWx0ZXJzOiBmdW5jdGlvbih0cmVlRWxlbWVudCkKKyAgICB7CisgICAgICAgIGlmICghdGhp cy5fdGltZWxpbmVDb250ZW50VmlldykKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAg ICAgIHJldHVybiB0aGlzLl90aW1lbGluZUNvbnRlbnRWaWV3Lm1hdGNoVHJlZUVsZW1lbnRBZ2Fp bnN0Q3VzdG9tRmlsdGVycyh0cmVlRWxlbWVudCk7CisgICAgfSwKKwogICAgIGNhblNob3dEaWZm ZXJlbnRDb250ZW50VmlldzogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuICF0aGlz LnJlc3RvcmluZ1N0YXRlIHx8ICF0aGlzLl9yZXN0b3JlZFNob3dpbmdUaW1lbGluZUNvbnRlbnRW aWV3Owo= 221097 2014-01-13 19:46:44 -0800 2014-01-13 23:02:04 -0800 Patch bug-126955-20140113194643.patch text/plain 10249 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl ZDliZmIxZDJiNTEyZTk2ZWQ0MTIwZDNmNjc2ZWY0ZjA0NWE2OTQzLi4yODJlMGQxY2MzZGRkYTgz ZWYzNWE2Y2JhZWZhODkyYzI5MTQ3YTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzNiBAQAogMjAxNC0wMS0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgRmlsdGVyIHRoZSBUaW1lbGluZSBvdmVydmlldyBncmFwaCBhbmQgc2lk ZWJhciBiYXNlZCBvbiB0aGUgY3VycmVudCB0aW1lIHNlbGVjdGlvbi4KKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2OTU1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL05hdmln YXRpb25TaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5wcm90b3R5cGUudXBkYXRlRmlsdGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5oYXNDdXN0b21GaWx0ZXJzKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5tYXRj aFRyZWVFbGVtZW50QWdhaW5zdEN1c3RvbUZpbHRlcnMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLmFwcGx5RmlsdGVyc1RvVHJlZUVsZW1l bnQubWF0Y2hUZXh0RmlsdGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lk ZWJhclBhbmVsLnByb3RvdHlwZS5hcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50KToKKyAgICAgICAg QWRkIHN1cHBvcnQgZm9yIGN1c3RvbSBmaWx0ZXJzIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUubWF0Y2hUcmVl RWxlbWVudEFnYWluc3RDdXN0b21GaWx0ZXJzLmNoZWNrVGltZUJvdW5kcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUubWF0Y2hUcmVlRWxlbWVu dEFnYWluc3RDdXN0b21GaWx0ZXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCk6CisgICAgICAg IEZpbHRlciBrbm93biB0cmVlIGVsZW1lbnQgdHlwZXMgYnkgdGltZS4KKworICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFuZWwuY3NzOgorICAgICAgICAoLnNpZGViYXIg PiAucGFuZWwudGltZWxpbmUgPiAuZW1wdHktY29udGVudC1wbGFjZWhvbGRlcik6CisgICAgICAg IFBvc2l0aW9uIHRoZSBlbXB0eSBwbGFjZWhvbGRlciB3aXRoIHRoZSBjb250ZW50LgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuaGFzQ3VzdG9tRmlsdGVy cyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBl Lm1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVycyk6CisgICAgICAgIERlZmVyIGZp bHRlcmluZyB0byB0aGUgVGltZWxpbmVDb250ZW50Vmlldy4KKworMjAxNC0wMS0xMyAgVGltb3Ro eSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50IHN0YXRl IGNvb2tpZSBzdXBwb3J0IGZvciBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuCiAK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjkyMQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05h dmlnYXRpb25TaWRlYmFyUGFuZWwuanMKaW5kZXggYWIxZjNjMWQyMzVhMzc2YTc2NzRjOWU5Y2U3 ZTU1MTlmNGYyMmU5Yy4uOGJlYjViMGYxMjE0NmZkOTExMzdmMjY4Yzk0NWFhZjZkMTFiZjk0ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlv blNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzCkBAIC0yODcsOSArMjg3LDI2IEBAIFdlYkluc3Bl Y3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAg IH0sCiAKLSAgICBhcHBseUZpbHRlcnNUb1RyZWVFbGVtZW50OiBmdW5jdGlvbih0cmVlRWxlbWVu dCkKKyAgICB1cGRhdGVGaWx0ZXI6IGZ1bmN0aW9uKGRvbnRFeHBhbmRPbk1hdGNoKQogICAgIHsK LSAgICAgICAgaWYgKCF0aGlzLl9maWx0ZXJCYXIuaGFzQWN0aXZlRmlsdGVycygpKSB7CisgICAg ICAgIHRoaXMuX3VwZGF0ZUZpbHRlcihkb250RXhwYW5kT25NYXRjaCk7CisgICAgfSwKKworICAg IGhhc0N1c3RvbUZpbHRlcnM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIEltcGxlbWVu dGVkIGJ5IHN1YmNsYXNzZXMgaWYgbmVlZGVkLgorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAg fSwKKworICAgIG1hdGNoVHJlZUVsZW1lbnRBZ2FpbnN0Q3VzdG9tRmlsdGVyczogZnVuY3Rpb24o dHJlZUVsZW1lbnQpCisgICAgeworICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2Vz IGlmIG5lZWRlZC4KKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfSwKKworICAgIGFwcGx5Rmls dGVyc1RvVHJlZUVsZW1lbnQ6IGZ1bmN0aW9uKHRyZWVFbGVtZW50LCBkb250RXhwYW5kT25NYXRj aCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fZmlsdGVyQmFyLmhhc0FjdGl2ZUZpbHRlcnMo KSAmJiAhdGhpcy5oYXNDdXN0b21GaWx0ZXJzKCkpIHsKICAgICAgICAgICAgIC8vIE5vIGZpbHRl cnMsIHNvIG1ha2UgZXZlcnl0aGluZyB2aXNpYmxlLgogICAgICAgICAgICAgdHJlZUVsZW1lbnQu aGlkZGVuID0gZmFsc2U7CiAKQEAgLTMwMiwyNiArMzE5LDIzIEBAIFdlYkluc3BlY3Rvci5OYXZp Z2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogCi0gICAgICAgIC8vIEdldCB0aGUgZmlsdGVyYWJsZSBkYXRhIGZyb20gdGhlIHRy ZWUgZWxlbWVudC4KLSAgICAgICAgdmFyIGZpbHRlcmFibGVEYXRhID0gdHJlZUVsZW1lbnQuZmls dGVyYWJsZURhdGE7Ci0gICAgICAgIGlmICghZmlsdGVyYWJsZURhdGEpCi0gICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIHZhciBmaWx0ZXJhYmxlRGF0YSA9IHRyZWVFbGVtZW50LmZpbHRlcmFi bGVEYXRhIHx8IHt9OwogCiAgICAgICAgIHZhciBzZWxmID0gdGhpczsKLSAgICAgICAgZnVuY3Rp b24gbWF0Y2hUZXh0RmlsdGVyKGlucHV0KQorICAgICAgICBmdW5jdGlvbiBtYXRjaFRleHRGaWx0 ZXIoaW5wdXRzKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoIXNlbGYuX3RleHRGaWx0ZXJS ZWdleCkKKyAgICAgICAgICAgIGlmICghaW5wdXRzIHx8ICFzZWxmLl90ZXh0RmlsdGVyUmVnZXgp CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIC8vIENvbnZlcnQg dG8gYSBzaW5nbGUgaXRlbSBhcnJheSBpZiBuZWVkZWQuCi0gICAgICAgICAgICBpZiAoIShpbnB1 dCBpbnN0YW5jZW9mIEFycmF5KSkKLSAgICAgICAgICAgICAgICBpbnB1dCA9IFtpbnB1dF07Cisg ICAgICAgICAgICBpZiAoIShpbnB1dHMgaW5zdGFuY2VvZiBBcnJheSkpCisgICAgICAgICAgICAg ICAgaW5wdXRzID0gW2lucHV0c107CiAKICAgICAgICAgICAgIC8vIExvb3Agb3ZlciBhbGwgdGhl IGlucHV0cyBhbmQgdHJ5IHRvIG1hdGNoIHRoZW0uCi0gICAgICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGlucHV0Lmxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFpbnB1dFtp XSkKKyAgICAgICAgICAgIGZvciAodmFyIGlucHV0IG9mIGlucHV0cykgeworICAgICAgICAgICAg ICAgIGlmICghaW5wdXQpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAg ICAgICAgIGlmIChzZWxmLl90ZXh0RmlsdGVyUmVnZXgudGVzdChpbnB1dFtpXSkpCisgICAgICAg ICAgICAgICAgaWYgKHNlbGYuX3RleHRGaWx0ZXJSZWdleC50ZXN0KGlucHV0KSkKICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAKQEAgLTMzOSw3ICszNTMs NyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICB3aGlsZSAoY3VycmVudEFuY2VzdG9yICYmICFjdXJyZW50QW5jZXN0b3Iucm9v dCkgewogICAgICAgICAgICAgICAgIGN1cnJlbnRBbmNlc3Rvci5oaWRkZW4gPSBmYWxzZTsKIAot ICAgICAgICAgICAgICAgIGlmICghY3VycmVudEFuY2VzdG9yLmV4cGFuZGVkKSB7CisgICAgICAg ICAgICAgICAgaWYgKCFjdXJyZW50QW5jZXN0b3IuZXhwYW5kZWQgJiYgIWRvbnRFeHBhbmRPbk1h dGNoKSB7CiAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRBbmNlc3Rvci5fX3dhc0V4cGFuZGVk RHVyaW5nRmlsdGVyaW5nID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgY3VycmVudEFuY2Vz dG9yLmV4cGFuZCgpOwogICAgICAgICAgICAgICAgIH0KQEAgLTM0OCw3ICszNjIsNyBAQCBXZWJJ bnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAotICAgICAgICBpZiAobWF0Y2hUZXh0RmlsdGVyKGZpbHRlcmFibGVE YXRhLnRleHQpKSB7CisgICAgICAgIGlmIChtYXRjaFRleHRGaWx0ZXIoZmlsdGVyYWJsZURhdGEu dGV4dCkgJiYgdGhpcy5tYXRjaFRyZWVFbGVtZW50QWdhaW5zdEN1c3RvbUZpbHRlcnModHJlZUVs ZW1lbnQpKSB7CiAgICAgICAgICAgICAvLyBNYWtlIHRoaXMgZWxlbWVudCB2aXNpYmxlIHNpbmNl IGl0IG1hdGNoZXMuCiAgICAgICAgICAgICBtYWtlVmlzaWJsZSgpOwogICAgICAgICAgICAgcmV0 dXJuOwpAQCAtNDQyLDcgKzQ1Niw3IEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fZW1wdHlGaWx0ZXJSZXN1bHRzID0gdHJ1 ZTsKICAgICB9LAogCi0gICAgX3VwZGF0ZUZpbHRlcjogZnVuY3Rpb24oKQorICAgIF91cGRhdGVG aWx0ZXI6IGZ1bmN0aW9uKGRvbnRFeHBhbmRPbk1hdGNoKQogICAgIHsKICAgICAgICAgdmFyIGZp bHRlcnMgPSB0aGlzLl9maWx0ZXJCYXIuZmlsdGVyczsKICAgICAgICAgdGhpcy5fdGV4dEZpbHRl clJlZ2V4ID0gc2ltcGxlR2xvYlN0cmluZ1RvUmVnRXhwKGZpbHRlcnMudGV4dCwgImkiKTsKQEAg LTQ1MSw3ICs0NjUsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIC8vIFVwZGF0ZSB0aGUgd2hvbGUgdHJlZS4KICAgICAgICAgdmFy IGN1cnJlbnRUcmVlRWxlbWVudCA9IHRoaXMuX2NvbnRlbnRUcmVlT3V0bGluZS5jaGlsZHJlblsw XTsKICAgICAgICAgd2hpbGUgKGN1cnJlbnRUcmVlRWxlbWVudCAmJiAhY3VycmVudFRyZWVFbGVt ZW50LnJvb3QpIHsKLSAgICAgICAgICAgIHRoaXMuYXBwbHlGaWx0ZXJzVG9UcmVlRWxlbWVudChj dXJyZW50VHJlZUVsZW1lbnQpOworICAgICAgICAgICAgdGhpcy5hcHBseUZpbHRlcnNUb1RyZWVF bGVtZW50KGN1cnJlbnRUcmVlRWxlbWVudCwgZG9udEV4cGFuZE9uTWF0Y2gpOwogICAgICAgICAg ICAgY3VycmVudFRyZWVFbGVtZW50ID0gY3VycmVudFRyZWVFbGVtZW50LnRyYXZlcnNlTmV4dFRy ZWVFbGVtZW50KGZhbHNlLCBudWxsLCBmYWxzZSk7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZp ZXcuanMKaW5kZXggMGQyODQxZDhjYTUxNDZkN2I3M2FhYzE2MDQwZmU0Nzg1NzNjZjc5Mi4uNzk5 YmE0Y2VjOTYwNzU1ZGRlYTk4ZDA4MDI1NDgyZWY1YTkyMGRiMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3 LmpzCkBAIC0xNDksNiArMTQ5LDQ1IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy51cGRhdGVM YXlvdXQoKTsKICAgICB9LAogCisgICAgbWF0Y2hUcmVlRWxlbWVudEFnYWluc3RDdXN0b21GaWx0 ZXJzOiBmdW5jdGlvbih0cmVlRWxlbWVudCkKKyAgICB7CisgICAgICAgIHZhciBzdGFydFRpbWUg PSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZTsKKyAgICAgICAgdmFy IGVuZFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSArIHRo aXMuX3RpbWVsaW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRpb247CisgICAgICAgIHZhciBjdXJy ZW50VGltZSA9IHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyLnRpbWU7CisKKyAgICAgICAgZnVuY3Rp b24gY2hlY2tUaW1lQm91bmRzKGl0ZW1TdGFydFRpbWUsIGl0ZW1FbmRUaW1lKQorICAgICAgICB7 CisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghaXNOYU4oaXRlbVN0YXJ0VGltZSkpOworCisg ICAgICAgICAgICBpdGVtRW5kVGltZSA9IGl0ZW1FbmRUaW1lIHx8IGN1cnJlbnRUaW1lOworCisg ICAgICAgICAgICByZXR1cm4gc3RhcnRUaW1lIDwgaXRlbUVuZFRpbWUgJiYgaXRlbVN0YXJ0VGlt ZSA8IGVuZFRpbWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAodHJlZUVsZW1lbnQgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlRWxlbWVudCkgeworICAgICAgICAgICAgdmFy IHJlc291cmNlID0gdHJlZUVsZW1lbnQucmVzb3VyY2U7CisgICAgICAgICAgICByZXR1cm4gY2hl Y2tUaW1lQm91bmRzKHJlc291cmNlLnJlcXVlc3RTZW50VGltZXN0YW1wLCByZXNvdXJjZS5maW5p c2hlZE9yRmFpbGVkVGltZXN0YW1wKTsKKyAgICAgICAgfQorCisgICAgICAgIGlmICh0cmVlRWxl bWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmVUcmVlRWxlbWVu dCkgeworICAgICAgICAgICAgdmFyIHNvdXJjZUNvZGVUaW1lbGluZSA9IHRyZWVFbGVtZW50LnNv dXJjZUNvZGVUaW1lbGluZTsKKworICAgICAgICAgICAgLy8gRG8gYSBxdWljayBjaGVjayBvZiB0 aGUgdGltZWxpbmUgYm91bmRzIGJlZm9yZSB3ZSBjaGVjayBlYWNoIHJlY29yZC4KKyAgICAgICAg ICAgIGlmICghY2hlY2tUaW1lQm91bmRzKHNvdXJjZUNvZGVUaW1lbGluZS5zdGFydFRpbWUsIHNv dXJjZUNvZGVUaW1lbGluZS5lbmRUaW1lKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICAgICAgICAgIGZvciAodmFyIHJlY29yZCBvZiBzb3VyY2VDb2RlVGltZWxpbmUucmVj b3JkcykgeworICAgICAgICAgICAgICAgIGlmIChjaGVja1RpbWVCb3VuZHMocmVjb3JkLnN0YXJ0 VGltZSwgcmVjb3JkLmVuZFRpbWUpKQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisK KyAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biBUcmVlRWxlbWVudCwgY2FuJ3QgZmlsdGVy IGJ5IHRpbWUuIik7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0sCisKICAgICAvLyBQcml2 YXRlCiAKICAgICBfcGF0aENvbXBvbmVudFNlbGVjdGVkOiBmdW5jdGlvbihldmVudCkKQEAgLTI3 Myw1ICszMTIsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcuemVyb1RpbWUgPSB0aGlzLl90 aW1lbGluZU92ZXJ2aWV3LnN0YXJ0VGltZTsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5l Vmlldy5zdGFydFRpbWUgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGlt ZTsKICAgICAgICAgdGhpcy5fY3VycmVudFRpbWVsaW5lVmlldy5lbmRUaW1lID0gdGhpcy5fdGlt ZWxpbmVPdmVydmlldy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLl90aW1lbGluZU92ZXJ2aWV3 LnNlbGVjdGlvbkR1cmF0aW9uOworCisgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZVNpZGVi YXJQYW5lbC51cGRhdGVGaWx0ZXIodHJ1ZSk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVs LmNzcwppbmRleCAzNGIyNDkwYmQ1ZWYxMzI5YWJlYjgyNjgwOTkzMThmNzMyNzdjMzhjLi40YmY3 ZWJiYzBmY2Q3YWVhMTBhMWVmYTI4NzIzN2ExM2VlNmZjNTMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFu ZWwuY3NzCkBAIC05NSw3ICs5NSw4IEBACiAgICAgb3BhY2l0eTogMC44OwogfQogCi0uc2lkZWJh ciA+IC5wYW5lbC50aW1lbGluZSA+IC5jb250ZW50IHsKKy5zaWRlYmFyID4gLnBhbmVsLnRpbWVs aW5lID4gLmNvbnRlbnQsCisuc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5lbXB0eS1jb250 ZW50LXBsYWNlaG9sZGVyIHsKICAgICB0b3A6IDE3NXB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVs LmpzCmluZGV4IDA2MmM0OGQzZmQ4ZDhlYWEyODU4MWY3YTEwMGQzM2MyMmE1Mjk5YzYuLjAyYTU1 YjZkM2U1YzFmZTlmMmQ1YjA0NTQ2MThjNTEwYTRhZTYxYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVs LmpzCkBAIC0xNjIsNiArMTYyLDE5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5jb250ZW50QnJvd3Nlci5zaG93 Q29udGVudFZpZXcodGhpcy5fdGltZWxpbmVDb250ZW50Vmlldyk7CiAgICAgfSwKIAorICAgIGhh c0N1c3RvbUZpbHRlcnM6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0cnVlOwor ICAgIH0sCisKKyAgICBtYXRjaFRyZWVFbGVtZW50QWdhaW5zdEN1c3RvbUZpbHRlcnM6IGZ1bmN0 aW9uKHRyZWVFbGVtZW50KQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl90aW1lbGluZUNvbnRl bnRWaWV3KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgcmV0dXJuIHRoaXMu X3RpbWVsaW5lQ29udGVudFZpZXcubWF0Y2hUcmVlRWxlbWVudEFnYWluc3RDdXN0b21GaWx0ZXJz KHRyZWVFbGVtZW50KTsKKyAgICB9LAorCiAgICAgY2FuU2hvd0RpZmZlcmVudENvbnRlbnRWaWV3 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICByZXR1cm4gIXRoaXMucmVzdG9yaW5nU3RhdGUg fHwgIXRoaXMuX3Jlc3RvcmVkU2hvd2luZ1RpbWVsaW5lQ29udGVudFZpZXc7Cg==