113572 2013-03-29 05:56:41 -0700 Web Inspector: extract common base for 3 timeline overview controls (Events/Frames/Memory) 2013-03-29 08:20:49 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 113501 1 caseq caseq apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 866107 0 caseq 2013-03-29 05:56:41 -0700 Let's make every control a view and introduce a common base class. 866109 1 195733 caseq 2013-03-29 06:01:40 -0700 Created attachment 195733 Patch 866181 2 caseq 2013-03-29 08:20:49 -0700 Committed r147220: <http://trac.webkit.org/changeset/147220> 195733 2013-03-29 06:01:40 -0700 2013-03-29 08:02:08 -0700 Patch bug-113572-20130329170136.patch text/plain 14627 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY3NzU5YmEzYzA3YTcz OWI3OTVjZDc5YzQ3YTUzNmM0OTA0MzE0ZC4uZGE2YzAxZWFlNWRhODJhYzIxYTdmZmY2NTAyM2Nl MmRmOWY3NDM4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDEzLTAzLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZXh0cmFjdCBjb21tb24gYmFzZSBmb3IgMyB0aW1lbGluZSBvdmVydmlldyBjb250cm9scyAo RXZlbnRzL0ZyYW1lcy9NZW1vcnkpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTM1NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZWZhY3RvcmluZywgY292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKwor ICAgICAgICAtIGludHJvZHVjZSBUaW1lbGluZU92ZXJ2aWV3QmFzZSBhcyBhIGNvbW1vbiBiYXNl IGZvciAzIG92ZXJ2aWV3IGNvbnRyb2xzOworICAgICAgICAtIG1ha2UgZXZlcnkgb3ZlcnZpZXcg Y29udHJvbCBhIHZpZXcuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCB5ZXQgdGFrZSBhZHZhbnRh Z2Ugb2YgY29tbW9uIGJhc2UgKHN1YmplY3Qgb2YgdGhlIG5leHQgcGF0Y2gpLgorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9PdmVydmlld0dyaWQuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5ncmlkRWxlbWVudCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuT3ZlcnZpZXdHcmlkLnByb3RvdHlwZS5pdGVtc0dyYXBoc0VsZW1lbnQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5zZXRNb2RlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX3VwZGF0ZSk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0Jhc2UpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLnByb3RvdHlwZS51cGRhdGUpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWVtb3J5T3ZlcnZpZXcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVFdmVudE92ZXJ2aWV3LnByb3RvdHlwZS5fcmVuZGVyQmFyKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lRnJhbWVPdmVydmlldy5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcucHJvdG90eXBlLl9yZW5kZXJCYXJzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcucHJvdG90eXBlLl9kcmF3RlBT TWFya3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lRnJhbWVPdmVydmlldy5wcm90 b3R5cGUuX3JlbmRlckJhcik6CisKKzIwMTMtMDMtMjkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2Vx QGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBhc3NpZ24gU2Nyb2xsIGV2 ZW50cyB0byByZW5kZXJpbmcgY2F0ZWdvcnkgKHdhcyBwYWludGluZykKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzU2NAogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL092ZXJ2aWV3R3JpZC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvT3ZlcnZpZXdHcmlkLmpzCmluZGV4IDkwODZl ZjQ0MWQwYzZmZDhmMTQwNTQxZmQyMWE2NjZjNWQ0OTRjMmMuLjAyODQwYzY3NmZhMmNkNDJhNmIx MDYyOGQ1ZDk4OGJhYjBjNWM0MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvT3ZlcnZpZXdHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvT3ZlcnZpZXdHcmlkLmpzCkBAIC00OSwxNyArNDksMTQgQEAgV2ViSW5zcGVj dG9yLk92ZXJ2aWV3R3JpZCA9IGZ1bmN0aW9uKHByZWZpeCkKIH0KIAogV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3R3JpZC5wcm90b3R5cGUgPSB7Ci0gICAgaXRlbXNHcmFwaHNFbGVtZW50OiBmdW5jdGlv bigpCisgICAgZ3JpZEVsZW1lbnQ6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0 aGlzLl9ncmlkLml0ZW1zR3JhcGhzRWxlbWVudDsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2dyaWQu ZWxlbWVudDsKICAgICB9LAogCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHshTm9kZX0gY2hpbGQK LSAgICAgKi8KLSAgICBpbnNlcnRCZWZvcmVJdGVtc0dyYXBoc0VsZW1lbnQ6IGZ1bmN0aW9uKGNo aWxkKQorICAgIGl0ZW1zR3JhcGhzRWxlbWVudDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAg dGhpcy5fZ3JpZC5lbGVtZW50Lmluc2VydEJlZm9yZShjaGlsZCwgdGhpcy5fZ3JpZC5pdGVtc0dy YXBoc0VsZW1lbnQpOworICAgICAgICByZXR1cm4gdGhpcy5fZ3JpZC5pdGVtc0dyYXBoc0VsZW1l bnQ7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKaW5kZXggZTgyOThmYjk1 YmI4ZTJkN2VjOGI1MTJmYTVlZTM4YWNmMTcyYzE4My4uY2I3ODYxYTgzNGQ3NzFjMWUxNDFlOGFi OGJjNzc0OTc3MzU5ZjFhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCkBAIC03OCwxNSArNzgsMTMg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lID0gZnVuY3Rpb24obW9kZWwpCiAg ICAgdGhpcy5lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50KTsK IAogICAgIHRoaXMuX21lbW9yeU92ZXJ2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU1l bW9yeU92ZXJ2aWV3KHRoaXMuX21vZGVsKTsKLSAgICB0aGlzLl9tZW1vcnlPdmVydmlldy5lbGVt ZW50LmlkID0gInRpbWVsaW5lLW92ZXJ2aWV3LW1lbW9yeSI7Ci0gICAgdGhpcy5fb3ZlcnZpZXdH cmlkLmluc2VydEJlZm9yZUl0ZW1zR3JhcGhzRWxlbWVudCh0aGlzLl9tZW1vcnlPdmVydmlldy5l bGVtZW50KTsKIAogICAgIHZhciBzZXBhcmF0b3JFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgc2VwYXJhdG9yRWxlbWVudC5pZCA9ICJ0aW1lbGluZS1vdmVydmll dy1zZXBhcmF0b3IiOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZChzZXBhcmF0b3JFbGVt ZW50KTsKIAogICAgIHRoaXMuX2V2ZW50T3ZlcnZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lRXZlbnRPdmVydmlldyh0aGlzLl9tb2RlbCk7Ci0gICAgdGhpcy5fb3ZlcnZpZXdHcmlkLml0 ZW1zR3JhcGhzRWxlbWVudCgpLmFwcGVuZENoaWxkKHRoaXMuX2V2ZW50T3ZlcnZpZXcuZWxlbWVu dCk7CisgICAgdGhpcy5fZXZlbnRPdmVydmlldy5zaG93KHRoaXMuX292ZXJ2aWV3R3JpZC5pdGVt c0dyYXBoc0VsZW1lbnQoKSk7CiAgCiAgICAgdmFyIGNhdGVnb3JpZXMgPSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVzKCk7CiAgICAgZm9yICh2YXIgY2F0 ZWdvcnkgaW4gY2F0ZWdvcmllcykKQEAgLTEzMSwxMiArMTI5LDEyIEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHN3aXRjaCAodGhpcy5f Y3VycmVudE1vZGUpIHsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXdQYW5lLk1vZGUuRXZlbnRzOgogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUuTW9kZS5GcmFtZXM6Ci0gICAgICAgICAgICAgICAgdGhpcy5fbWVt b3J5T3ZlcnZpZXcuaGlkZSgpOworICAgICAgICAgICAgICAgIHRoaXMuX21lbW9yeU92ZXJ2aWV3 LmRldGFjaCgpOwogICAgICAgICAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5zaG93SXRlbXNH cmFwaHNFbGVtZW50KCk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNl IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlLk1lbW9yeToKICAgICAgICAg ICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuaGlkZUl0ZW1zR3JhcGhzRWxlbWVudCgpOwotICAg ICAgICAgICAgICAgIHRoaXMuX21lbW9yeU92ZXJ2aWV3LnNob3coKTsKKyAgICAgICAgICAgICAg ICB0aGlzLl9tZW1vcnlPdmVydmlldy5zaG93KHRoaXMuX292ZXJ2aWV3R3JpZC5ncmlkRWxlbWVu dCgpLCB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50KCkpOwogICAgICAgICB9 CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3SXRlbXNbdGhpcy5fY3VycmVudE1vZGVdLnJldmVhbEFu ZFNlbGVjdChmYWxzZSk7CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5FdmVudHMuTW9kZUNoYW5nZWQsIHRoaXMu X2N1cnJlbnRNb2RlKTsKQEAgLTE3Miw3ICsxNzAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlld1BhbmUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0 b3Iuc2V0V2luZG93KHRoaXMuX21vZGVsLm1pbmltdW1SZWNvcmRUaW1lKCksIHRoaXMuX21vZGVs Lm1heGltdW1SZWNvcmRUaW1lKCkpOwogICAgICAgICB0aGlzLl9vdmVydmlld0NhbGN1bGF0b3Iu c2V0RGlzcGxheVdpbmRvdygwLCB0aGlzLl9vdmVydmlld0dyaWQuY2xpZW50V2lkdGgoKSk7CiAK LSAgICAgICAgaWYgKHRoaXMuX21lbW9yeU92ZXJ2aWV3LnZpc2libGUpCisgICAgICAgIGlmICh0 aGlzLl9tZW1vcnlPdmVydmlldy5pc1Nob3dpbmcoKSkKICAgICAgICAgICAgIHRoaXMuX21lbW9y eU92ZXJ2aWV3LnVwZGF0ZSgpOwogICAgICAgICBlbHNlIGlmICh0aGlzLl9mcmFtZU92ZXJ2aWV3 KQogICAgICAgICAgICAgdGhpcy5fZnJhbWVPdmVydmlldy51cGRhdGUoKTsKQEAgLTQxNCw1NCAr NDEyLDM4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3Q2FsY3VsYXRvci5wcm90b3R5 cGUgPSB7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9y LlZpZXd9CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsfSBtb2RlbAogICov Ci1XZWJJbnNwZWN0b3IuVGltZWxpbmVNZW1vcnlPdmVydmlldyA9IGZ1bmN0aW9uKG1vZGVsKQor V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlID0gZnVuY3Rpb24obW9kZWwpCiB7Ci0g ICAgdGhpcy5fY2FudmFzID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7CisgICAg V2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKICAgICB0aGlzLl9tb2RlbCA9IG1vZGVsOwot Ci0gICAgdGhpcy5fbWF4SGVhcFNpemVMYWJlbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOwotICAgIHRoaXMuX21heEhlYXBTaXplTGFiZWwuYWRkU3R5bGVDbGFzcygibWF4Iik7Ci0g ICAgdGhpcy5fbWF4SGVhcFNpemVMYWJlbC5hZGRTdHlsZUNsYXNzKCJtZW1vcnktZ3JhcGgtbGFi ZWwiKTsKLSAgICB0aGlzLl9taW5IZWFwU2l6ZUxhYmVsID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgiZGl2Iik7Ci0gICAgdGhpcy5fbWluSGVhcFNpemVMYWJlbC5hZGRTdHlsZUNsYXNzKCJtaW4i KTsKLSAgICB0aGlzLl9taW5IZWFwU2l6ZUxhYmVsLmFkZFN0eWxlQ2xhc3MoIm1lbW9yeS1ncmFw aC1sYWJlbCIpOwotCi0gICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwotICAgIHRoaXMuX2VsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAg dGhpcy5fZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9jYW52YXMpOwotICAgIHRoaXMuX2VsZW1l bnQuYXBwZW5kQ2hpbGQodGhpcy5fbWF4SGVhcFNpemVMYWJlbCk7Ci0gICAgdGhpcy5fZWxlbWVu dC5hcHBlbmRDaGlsZCh0aGlzLl9taW5IZWFwU2l6ZUxhYmVsKTsKKyAgICB0aGlzLl9jYW52YXMg PSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoImNhbnZhcyIsICJmaWxsIik7CiB9CiAKLVdlYklu c3BlY3Rvci5UaW1lbGluZU1lbW9yeU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAg ICAgKiBAcmV0dXJuIHtOb2RlfQotICAgICAqLwotICAgIGdldCBlbGVtZW50KCkKLSAgICB7Ci0g ICAgICAgIHJldHVybiB0aGlzLl9lbGVtZW50OwotICAgIH0sCitXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld0Jhc2UucHJvdG90eXBlID0geworICAgIHVwZGF0ZTogZnVuY3Rpb24oKSB7fSwK IAotICAgIC8qKgotICAgICAqIEByZXR1cm4ge2Jvb2xlYW59Ci0gICAgICovCi0gICAgZ2V0IHZp c2libGUoKQotICAgIHsKLSAgICAgICAgcmV0dXJuICF0aGlzLmVsZW1lbnQuaGFzU3R5bGVDbGFz cygiaGlkZGVuIik7Ci0gICAgfSwKKyAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5WaWV3LnBy b3RvdHlwZQorfQogCi0gICAgc2hvdzogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5l bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotICAgIH0sCisvKioKKyAqIEBjb25z dHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3QmFzZX0K KyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlRpbWVsaW5lTW9kZWx9IG1vZGVsCisgKi8KK1dlYklu c3BlY3Rvci5UaW1lbGluZU1lbW9yeU92ZXJ2aWV3ID0gZnVuY3Rpb24obW9kZWwpCit7CisgICAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLmNhbGwodGhpcywgbW9kZWwpOworICAg IHRoaXMuZWxlbWVudC5pZCA9ICJ0aW1lbGluZS1vdmVydmlldy1tZW1vcnkiOworICAgIHRoaXMu ZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJmaWxsIik7CiAKLSAgICBoaWRlOiBmdW5jdGlvbigpCi0g ICAgewotICAgICAgICB0aGlzLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7Ci0gICAg fSwKKyAgICB0aGlzLl9tYXhIZWFwU2l6ZUxhYmVsID0gdGhpcy5lbGVtZW50LmNyZWF0ZUNoaWxk KCJkaXYiLCAibWF4IG1lbW9yeS1ncmFwaC1sYWJlbCIpOworICAgIHRoaXMuX21pbkhlYXBTaXpl TGFiZWwgPSB0aGlzLmVsZW1lbnQuY3JlYXRlQ2hpbGQoImRpdiIsICJtaW4gbWVtb3J5LWdyYXBo LWxhYmVsIik7Cit9CiAKK1dlYkluc3BlY3Rvci5UaW1lbGluZU1lbW9yeU92ZXJ2aWV3LnByb3Rv dHlwZSA9IHsKICAgICB1cGRhdGU6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciByZWNv cmRzID0gdGhpcy5fbW9kZWwucmVjb3JkczsKQEAgLTUzOSwxNyArNTIxLDIwIEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZU1lbW9yeU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgY3R4LmZp bGxTdHlsZSA9ICJyZ2JhKDI1NSwyNTUsMjU1LDAuOCkiOwogICAgICAgICBjdHguZmlsbFJlY3Qo MCwgMCwgdGhpcy5fY2FudmFzLndpZHRoLCB0aGlzLl9jYW52YXMuaGVpZ2h0KTsKICAgICB9LAor CisgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0Jhc2UucHJvdG90 eXBlCiB9CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9y LlRpbWVsaW5lT3ZlcnZpZXdCYXNlfQogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGltZWxpbmVN b2RlbH0gbW9kZWwKICAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldyA9IGZ1 bmN0aW9uKG1vZGVsKQogewotICAgIHRoaXMuX21vZGVsID0gbW9kZWw7Ci0gICAgdGhpcy5lbGVt ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2FudmFzIik7Ci0gICAgdGhpcy5fY29udGV4 dCA9IHRoaXMuZWxlbWVudC5nZXRDb250ZXh0KCIyZCIpOworICAgIFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3QmFzZS5jYWxsKHRoaXMsIG1vZGVsKTsKKworICAgIHRoaXMuX2NvbnRleHQg PSB0aGlzLl9jYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKICAgICB0aGlzLl9taW5pbXVtUmVjb3Jk RHVyYXRpb24gPSAwOwogCiAgICAgdGhpcy5fZmlsbFN0eWxlcyA9IHt9OwpAQCAtNTc4LDE4ICs1 NjMsMTggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5wcm90b3R5cGUgPSB7 CiAgICAgdXBkYXRlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICAvLyBVc2UgcmVhbCB3b3Js ZCwgMToxIGNvb3JkaW5hdGVzIGluIGNhbnZhcy4gVGhpcyB3aWxsIGFsc28gdGFrZSBjYXJlIG9m IGNsZWFyaW5nIGl0LgotICAgICAgICB0aGlzLmVsZW1lbnQud2lkdGggPSB0aGlzLmVsZW1lbnQu cGFyZW50RWxlbWVudC5jbGllbnRXaWR0aDsKLSAgICAgICAgdGhpcy5lbGVtZW50LmhlaWdodCA9 IFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcuX2NhbnZhc0hlaWdodDsKKyAgICAg ICAgdGhpcy5fY2FudmFzLndpZHRoID0gdGhpcy5lbGVtZW50LnBhcmVudEVsZW1lbnQuY2xpZW50 V2lkdGg7CisgICAgICAgIHRoaXMuX2NhbnZhcy5oZWlnaHQgPSBXZWJJbnNwZWN0b3IuVGltZWxp bmVFdmVudE92ZXJ2aWV3Ll9jYW52YXNIZWlnaHQ7CiAKICAgICAgICAgdmFyIHRpbWVPZmZzZXQg PSB0aGlzLl9tb2RlbC5taW5pbXVtUmVjb3JkVGltZSgpOwogICAgICAgICB2YXIgdGltZVNwYW4g PSB0aGlzLl9tb2RlbC5tYXhpbXVtUmVjb3JkVGltZSgpIC0gdGltZU9mZnNldDsKLSAgICAgICAg dmFyIHNjYWxlID0gdGhpcy5lbGVtZW50LndpZHRoIC8gdGltZVNwYW47CisgICAgICAgIHZhciBz Y2FsZSA9IHRoaXMuX2NhbnZhcy53aWR0aCAvIHRpbWVTcGFuOwogCiAgICAgICAgIHZhciBsYXN0 QmFyQnlHcm91cCA9IFtdOwogCiAgICAgICAgIHRoaXMuX2NvbnRleHQuZmlsbFN0eWxlID0gInJn YmEoMCwgMCwgMCwgMC4wNSkiOwogICAgICAgICBmb3IgKHZhciBpID0gMTsgaSA8IFdlYkluc3Bl Y3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcuX251bWJlck9mU3RyaXBzOyBpICs9IDIpCi0gICAg ICAgICAgICB0aGlzLl9jb250ZXh0LmZpbGxSZWN0KDAuNSwgaSAqIFdlYkluc3BlY3Rvci5UaW1l bGluZUV2ZW50T3ZlcnZpZXcuX3N0cmlwSGVpZ2h0ICsgMC41LCB0aGlzLmVsZW1lbnQud2lkdGgs IFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcuX3N0cmlwSGVpZ2h0KTsKKyAgICAg ICAgICAgIHRoaXMuX2NvbnRleHQuZmlsbFJlY3QoMC41LCBpICogV2ViSW5zcGVjdG9yLlRpbWVs aW5lRXZlbnRPdmVydmlldy5fc3RyaXBIZWlnaHQgKyAwLjUsIHRoaXMuX2NhbnZhcy53aWR0aCwg V2ViSW5zcGVjdG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5fc3RyaXBIZWlnaHQpOwogCiAgICAg ICAgIGZ1bmN0aW9uIGFwcGVuZFJlY29yZChyZWNvcmQpCiAgICAgICAgIHsKQEAgLTY0MywyMCAr NjI4LDIwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUV2ZW50T3ZlcnZpZXcucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9jb250ZXh0LnN0cm9rZVN0eWxlID0gY2F0ZWdvcnkuaGlkZGVuID8g dGhpcy5fZGlzYWJsZWRDYXRlZ29yeUJvcmRlclN0eWxlIDogY2F0ZWdvcnkuYm9yZGVyQ29sb3I7 CiAgICAgICAgIHRoaXMuX2NvbnRleHQuc3Ryb2tlUmVjdCgwLCAwLCB3aWR0aCwgV2ViSW5zcGVj dG9yLlRpbWVsaW5lRXZlbnRPdmVydmlldy5faW5uZXJTdHJpcEhlaWdodCk7CiAgICAgICAgIHRo aXMuX2NvbnRleHQucmVzdG9yZSgpOwotICAgIH0KKyAgICB9LAorCisgICAgX19wcm90b19fOiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld0Jhc2UucHJvdG90eXBlCiB9CiAKIC8qKgogICog QGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlZpZXd9CisgKiBAZXh0ZW5k cyB7V2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlfQogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuVGltZWxpbmVNb2RlbH0gbW9kZWwKICAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lRnJh bWVPdmVydmlldyA9IGZ1bmN0aW9uKG1vZGVsKQogewotICAgIFdlYkluc3BlY3Rvci5WaWV3LmNh bGwodGhpcyk7Ci0gICAgdGhpcy5lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiY2Fu dmFzIik7Ci0gICAgdGhpcy5lbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1mcmFtZS1vdmVy dmlldy1iYXJzIGZpbGwiOwotICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CisgICAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdCYXNlLmNhbGwodGhpcywgbW9kZWwpOworICAgIHRoaXMuX2Nh bnZhcy5jbGFzc0xpc3QuYWRkKCJ0aW1lbGluZS1mcmFtZS1vdmVydmlldy1iYXJzIik7CiAgICAg dGhpcy5yZXNldCgpOwogCiAgICAgdGhpcy5fb3V0ZXJQYWRkaW5nID0gNDsKQEAgLTY2Niw3ICs2 NTEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVGcmFtZU92ZXJ2aWV3ID0gZnVuY3Rpb24obW9k ZWwpCiAgICAgdGhpcy5fYWN0dWFsUGFkZGluZyA9IDU7CiAgICAgdGhpcy5fYWN0dWFsT3V0ZXJC YXJXaWR0aCA9IHRoaXMuX21heElubmVyQmFyV2lkdGggKyB0aGlzLl9hY3R1YWxQYWRkaW5nOwog Ci0gICAgdGhpcy5fY29udGV4dCA9IHRoaXMuZWxlbWVudC5nZXRDb250ZXh0KCIyZCIpOworICAg IHRoaXMuX2NvbnRleHQgPSB0aGlzLl9jYW52YXMuZ2V0Q29udGV4dCgiMmQiKTsKIAogICAgIHRo aXMuX2ZpbGxTdHlsZXMgPSB7fTsKICAgICB2YXIgY2F0ZWdvcmllcyA9IFdlYkluc3BlY3Rvci5U aW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmNhdGVnb3JpZXMoKTsKQEAgLTY5OCw3ICs2ODMsNyBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVGcmFtZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgaWYgKGZ1bGxCYXJMZW5ndGggPCB0aGlzLl9tZWRpYW5GcmFtZUxlbmd0aCkKICAgICAgICAg ICAgIGZ1bGxCYXJMZW5ndGggPSBNYXRoLm1pbih0aGlzLl9tZWRpYW5GcmFtZUxlbmd0aCAqIDIs IHRoaXMuX21heEZyYW1lTGVuZ3RoKTsKIAotICAgICAgICB2YXIgc2NhbGUgPSAodGhpcy5lbGVt ZW50LmNsaWVudEhlaWdodCAtIHBhZGRpbmdUb3ApIC8gZnVsbEJhckxlbmd0aDsKKyAgICAgICAg dmFyIHNjYWxlID0gKHRoaXMuX2NhbnZhcy5jbGllbnRIZWlnaHQgLSBwYWRkaW5nVG9wKSAvIGZ1 bGxCYXJMZW5ndGg7CiAgICAgICAgIHRoaXMuX3JlbmRlckJhcnModmlzaWJsZUZyYW1lcywgc2Nh bGUpOwogICAgIH0sCiAKQEAgLTc2MiwxMSArNzQ3LDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZUZyYW1lT3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgIF9yZW5kZXJCYXJzOiBmdW5jdGlvbihm cmFtZXMsIHNjYWxlKQogICAgIHsKICAgICAgICAgLy8gVXNlIHJlYWwgd29ybGQsIDE6MSBjb29y ZGluYXRlcyBpbiBjYW52YXMuIFRoaXMgd2lsbCBhbHNvIHRha2UgY2FyZSBvZiBjbGVhcmluZyBp dC4KLSAgICAgICAgdGhpcy5lbGVtZW50LndpZHRoID0gdGhpcy5lbGVtZW50LmNsaWVudFdpZHRo OwotICAgICAgICB0aGlzLmVsZW1lbnQuaGVpZ2h0ID0gdGhpcy5lbGVtZW50LmNsaWVudEhlaWdo dDsKKyAgICAgICAgdGhpcy5fY2FudmFzLndpZHRoID0gdGhpcy5fY2FudmFzLmNsaWVudFdpZHRo OworICAgICAgICB0aGlzLl9jYW52YXMuaGVpZ2h0ID0gdGhpcy5fY2FudmFzLmNsaWVudEhlaWdo dDsKIAogICAgICAgICBjb25zdCBtYXhQYWRkaW5nID0gNTsKLSAgICAgICAgdGhpcy5fYWN0dWFs T3V0ZXJCYXJXaWR0aCA9IE1hdGgubWluKCh0aGlzLmVsZW1lbnQud2lkdGggLSAyICogdGhpcy5f b3V0ZXJQYWRkaW5nKSAvIGZyYW1lcy5sZW5ndGgsIHRoaXMuX21heElubmVyQmFyV2lkdGggKyBt YXhQYWRkaW5nKTsKKyAgICAgICAgdGhpcy5fYWN0dWFsT3V0ZXJCYXJXaWR0aCA9IE1hdGgubWlu KCh0aGlzLl9jYW52YXMud2lkdGggLSAyICogdGhpcy5fb3V0ZXJQYWRkaW5nKSAvIGZyYW1lcy5s ZW5ndGgsIHRoaXMuX21heElubmVyQmFyV2lkdGggKyBtYXhQYWRkaW5nKTsKICAgICAgICAgdGhp cy5fYWN0dWFsUGFkZGluZyA9IE1hdGgubWluKE1hdGguZmxvb3IodGhpcy5fYWN0dWFsT3V0ZXJC YXJXaWR0aCAvIDMpLCBtYXhQYWRkaW5nKTsKIAogICAgICAgICB2YXIgYmFyV2lkdGggPSB0aGlz Ll9hY3R1YWxPdXRlckJhcldpZHRoIC0gdGhpcy5fYWN0dWFsUGFkZGluZzsKQEAgLTgwNCwyMSAr Nzg5LDIxIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcucHJvdG90eXBlID0g ewogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGZwc01hcmtzLmxlbmd0aDsgKytpKSB7CiAg ICAgICAgICAgICB2YXIgZnBzID0gZnBzTWFya3NbaV07CiAgICAgICAgICAgICAvLyBEcmF3IGxp bmVzIG9uZSBwaXhlbCBhYm92ZSB0aGV5IG5lZWQgdG8gYmUsIHNvIDYwcGZzIGxpbmUgZG9lcyBu b3QgY3Jvc3MgbW9zdCBvZiB0aGUgZnJhbWVzIHRvcHMuCi0gICAgICAgICAgICB2YXIgeSA9IHRo aXMuZWxlbWVudC5oZWlnaHQgLSBNYXRoLmZsb29yKDEuMCAvIGZwcyAqIHNjYWxlKSAtIDAuNTsK KyAgICAgICAgICAgIHZhciB5ID0gdGhpcy5fY2FudmFzLmhlaWdodCAtIE1hdGguZmxvb3IoMS4w IC8gZnBzICogc2NhbGUpIC0gMC41OwogICAgICAgICAgICAgdmFyIGxhYmVsID0gZnBzICsgIiBG UFMgIjsKICAgICAgICAgICAgIHZhciBsYWJlbFdpZHRoID0gdGhpcy5fY29udGV4dC5tZWFzdXJl VGV4dChsYWJlbCkud2lkdGg7Ci0gICAgICAgICAgICB2YXIgbGFiZWxYID0gdGhpcy5lbGVtZW50 LndpZHRoOworICAgICAgICAgICAgdmFyIGxhYmVsWCA9IHRoaXMuX2NhbnZhcy53aWR0aDsKICAg ICAgICAgICAgIHZhciBsYWJlbFk7CiAKICAgICAgICAgICAgIGlmIChsYWJlbFRvcE1hcmdpbiA8 IHkgLSBsaW5lSGVpZ2h0KQogICAgICAgICAgICAgICAgIGxhYmVsWSA9IHkgLSBsaW5lSGVpZ2h0 OwotICAgICAgICAgICAgZWxzZSBpZiAoeSArIGxpbmVIZWlnaHQgPCB0aGlzLmVsZW1lbnQuaGVp Z2h0KQorICAgICAgICAgICAgZWxzZSBpZiAoeSArIGxpbmVIZWlnaHQgPCB0aGlzLl9jYW52YXMu aGVpZ2h0KQogICAgICAgICAgICAgICAgIGxhYmVsWSA9IHk7CiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgYnJlYWs7IC8vIE5vIHNwYWNlIGZvciB0aGUgbGFiZWwsIHNvIG5vIGxp bmUgYXMgd2VsbC4KIAogICAgICAgICAgICAgdGhpcy5fY29udGV4dC5tb3ZlVG8oMCwgeSk7Ci0g ICAgICAgICAgICB0aGlzLl9jb250ZXh0LmxpbmVUbyh0aGlzLmVsZW1lbnQud2lkdGgsIHkpOwor ICAgICAgICAgICAgdGhpcy5fY29udGV4dC5saW5lVG8odGhpcy5fY2FudmFzLndpZHRoLCB5KTsK IAogICAgICAgICAgICAgdGhpcy5fY29udGV4dC5maWxsU3R5bGUgPSAicmdiYSgyNTUsIDI1NSwg MjU1LCAwLjc1KSI7CiAgICAgICAgICAgICB0aGlzLl9jb250ZXh0LmZpbGxSZWN0KGxhYmVsWCAt IGxhYmVsV2lkdGggLSBsYWJlbFBhZGRpbmcsIGxhYmVsWSwgbGFiZWxXaWR0aCArIDIgKiBsYWJl bFBhZGRpbmcsIGxpbmVIZWlnaHQpOwpAQCAtODM5LDcgKzgyNCw3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZUZyYW1lT3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgeCA9IE1hdGgu Zmxvb3IobGVmdCkgKyAwLjU7CiAgICAgICAgIHdpZHRoID0gTWF0aC5mbG9vcih3aWR0aCk7CiAK LSAgICAgICAgZm9yICh2YXIgaSA9IDAsIGJvdHRvbU9mZnNldCA9IHRoaXMuZWxlbWVudC5oZWln aHQ7IGkgPCBjYXRlZ29yaWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgIGZvciAodmFyIGkgPSAw LCBib3R0b21PZmZzZXQgPSB0aGlzLl9jYW52YXMuaGVpZ2h0OyBpIDwgY2F0ZWdvcmllcy5sZW5n dGg7ICsraSkgewogICAgICAgICAgICAgdmFyIGNhdGVnb3J5ID0gY2F0ZWdvcmllc1tpXTsKICAg ICAgICAgICAgIHZhciBkdXJhdGlvbiA9IGZyYW1lLnRpbWVCeUNhdGVnb3J5W2NhdGVnb3J5XTsK IApAQCAtODg4LDcgKzg3Myw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUZyYW1lT3ZlcnZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB9CiAgICAgfSwKIAotICAgIF9fcHJvdG9fXzogV2ViSW5z cGVjdG9yLlZpZXcucHJvdG90eXBlCisgICAgX19wcm90b19fOiBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlld0Jhc2UucHJvdG90eXBlCiB9CiAKIC8qKgo=