195547 2019-03-11 01:06:36 -0700 Web Inspector: CPU Usage Timeline - Better Thread chart layout values 2019-03-11 14:53:15 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 194455 1 joepeck joepeck hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1514724 0 joepeck 2019-03-11 01:06:36 -0700 CPU Usage Timeline - Better Thread chart layout values Rather then layout the thread charts at the maximum usage of all threads, choose a better maximum value to share for the thread views. Try for a multiple for 25 up to 100, otherwise the maximum of a group. 1514725 1 364240 joepeck 2019-03-11 01:09:47 -0700 Created attachment 364240 [PATCH] Proposed Fix Won't apply but still reviewable. 1514726 2 364240 hi 2019-03-11 01:28:39 -0700 Comment on attachment 364240 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=364240&action=review rs=me > Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js:463 > + let workerMax = 0; Any reason to not use `-Infinity` like the rest? > Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js:601 > + if (value > 75) > + return 100; > + if (value > 50) > + return 75; > + if (value > 25) > + return 50; > + return 25; NIT: this could be rewritten/simplified as `(Math.floor(value / 25) + 1) * 25`. 1514995 3 364240 joepeck 2019-03-11 14:18:55 -0700 Comment on attachment 364240 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=364240&action=review >> Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js:601 >> + return 25; > > NIT: this could be rewritten/simplified as `(Math.floor(value / 25) + 1) * 25`. Yeah, I considered doing this when I first wrote it but I left it as is. This cascade is short and simple and makes it easy to play with new values and tweak. But I'll switch to this. The arithmetic approach is nice if we want to switch to multiples of 10 (something I've considered as well). 1515006 4 joepeck 2019-03-11 14:30:57 -0700 https://trac.webkit.org/r242740 1515014 5 webkit-bug-importer 2019-03-11 14:53:15 -0700 <rdar://problem/48784034> 364240 2019-03-11 01:09:47 -0700 2019-03-11 01:28:39 -0700 [PATCH] Proposed Fix layoutmax-1.patch text/plain 9854 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDgzZGRkNTk4OTM5Li44NTQ0ZWI4YjcxYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDMtMTEgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBDUFUgVXNhZ2UgVGltZWxpbmUgLSBCZXR0ZXIgVGhyZWFkIGNoYXJ0IGxheW91dCB2YWx1ZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTU0Nwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9DUFVUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXSS5DUFVUaW1lbGlu ZVZpZXcucHJvdG90eXBlLmxheW91dC5iZXN0VGhyZWFkTGF5b3V0TWF4KToKKyAgICAgICAgKFdJ LkNQVVRpbWVsaW5lVmlldy5wcm90b3R5cGUubGF5b3V0LmxheW91dFZpZXcpOgorICAgICAgICAo V0kuQ1BVVGltZWxpbmVWaWV3LnByb3RvdHlwZS5fc2hvd0dyYXBoT3ZlcmxheSk6CisgICAgICAg IEluY2x1ZGUgYSBzZXBhcmF0ZSBsYXlvdXRNYXggZm9yIHRoZSBjb21iaW5lZCB2aWV3IGFuZCBh IHRocmVhZCBsYXlvdXRNYXgKKyAgICAgICAgZm9yIHRoZSB0aHJlYWQgZ3JvdXBzLgorCiAyMDE5 LTAzLTA2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAg V2ViIEluc3BlY3RvcjogQ1BVIFVzYWdlIFRpbWVsaW5lIC0gQWRkIGxlZ2VuZCBhbmQgZ3JhcGgg aG92ZXIgZWZmZWN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzCmluZGV4IDU5Mzk4ZjljNzQ2Li5i ZDFhMmIyZDA4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ1BVVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NQVVRpbWVsaW5lVmlldy5qcwpAQCAtNDYwLDYgKzQ2MCw3IEBA IFdJLkNQVVRpbWVsaW5lVmlldyA9IGNsYXNzIENQVVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRp bWVsaW5lVmlldwogICAgICAgICBsZXQgbWFpblRocmVhZE1heCA9IC1JbmZpbml0eTsKICAgICAg ICAgbGV0IHdlYmtpdFRocmVhZE1heCA9IC1JbmZpbml0eTsKICAgICAgICAgbGV0IHVua25vd25U aHJlYWRNYXggPSAtSW5maW5pdHk7CisgICAgICAgIGxldCB3b3JrZXJNYXggPSAwOwogCiAgICAg ICAgIGxldCBtaW4gPSBJbmZpbml0eTsKICAgICAgICAgbGV0IG1haW5UaHJlYWRNaW4gPSBJbmZp bml0eTsKQEAgLTU3NywxNCArNTc4LDI5IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9IGNsYXNzIENQ VVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogICAgICAgICB3ZWJraXRUaHJl YWRBdmVyYWdlIC89IHZpc2libGVSZWNvcmRzLmxlbmd0aDsKICAgICAgICAgdW5rbm93blRocmVh ZEF2ZXJhZ2UgLz0gdmlzaWJsZVJlY29yZHMubGVuZ3RoOwogCi0gICAgICAgIGZvciAobGV0IFt3 b3JrZXJJZCwgd29ya2VyRGF0YV0gb2Ygd29ya2Vyc0RhdGFNYXApCisgICAgICAgIGZvciAobGV0 IFt3b3JrZXJJZCwgd29ya2VyRGF0YV0gb2Ygd29ya2Vyc0RhdGFNYXApIHsKICAgICAgICAgICAg IHdvcmtlckRhdGEuYXZlcmFnZSA9IHdvcmtlckRhdGEuYXZlcmFnZSAvIHdvcmtlckRhdGEucmVj b3Jkc0NvdW50OworICAgICAgICAgICAgaWYgKHdvcmtlckRhdGEubWF4ID4gd29ya2VyTWF4KQor ICAgICAgICAgICAgICAgIHdvcmtlck1heCA9IHdvcmtlckRhdGEubWF4OworICAgICAgICB9CiAK ICAgICAgICAgLy8gSWYgdGhlIGdyYXBoIGVuZCB0aW1lIGlzIGluc2lkZSBhIGdhcCwgdGhlIGxh c3QgZGF0YSBwb2ludCBzaG91bGQKICAgICAgICAgLy8gb25seSBiZSBleHRlbmRlZCB0byB0aGUg c3RhcnQgb2YgdGhlIGRpc2NvbnRpbnVpdHkuCiAgICAgICAgIGlmIChkaXNjb250aW51aXRpZXMu bGVuZ3RoKQogICAgICAgICAgICAgdmlzaWJsZUVuZFRpbWUgPSBkaXNjb250aW51aXRpZXNbMF0u c3RhcnRUaW1lOwogCisgICAgICAgIGZ1bmN0aW9uIGJlc3RUaHJlYWRMYXlvdXRNYXgodmFsdWUp IHsKKyAgICAgICAgICAgIGlmICh2YWx1ZSA+IDEwMCkKKyAgICAgICAgICAgICAgICByZXR1cm4g TWF0aC5jZWlsKHZhbHVlKTsKKyAgICAgICAgICAgIGlmICh2YWx1ZSA+IDc1KQorICAgICAgICAg ICAgICAgIHJldHVybiAxMDA7CisgICAgICAgICAgICBpZiAodmFsdWUgPiA1MCkKKyAgICAgICAg ICAgICAgICByZXR1cm4gNzU7CisgICAgICAgICAgICBpZiAodmFsdWUgPiAyNSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gNTA7CisgICAgICAgICAgICByZXR1cm4gMjU7CisgICAgICAgIH0KKwog ICAgICAgICBmdW5jdGlvbiByZW1vdmVHcmVhdGVyVGhhbihhcnIsIG1heCkgewogICAgICAgICAg ICAgcmV0dXJuIGFyci5maWx0ZXIoKHgpID0+IHggPD0gbWF4KTsKICAgICAgICAgfQpAQCAtNjIx LDEyICs2MzcsNyBAQCBXSS5DUFVUaW1lbGluZVZpZXcgPSBjbGFzcyBDUFVUaW1lbGluZVZpZXcg ZXh0ZW5kcyBXSS5UaW1lbGluZVZpZXcKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAg ICAgIC8vIExheW91dCBhbGwgZ3JhcGhzIHRvIHRoZSBzYW1lIHRpbWUgc2NhbGUuIFRoZSBtYXhp bXVtIHZhbHVlIGlzCi0gICAgICAgIC8vIHRoZSBtYXhpbXVtIHRvdGFsIENQVSB1c2FnZSBhY3Jv c3MgYWxsIHRocmVhZHMuCi0gICAgICAgIGxldCBsYXlvdXRNYXggPSBtYXg7Ci0gICAgICAgIHRo aXMuX2xheW91dE1heCA9IG1heDsKLQotICAgICAgICBmdW5jdGlvbiBsYXlvdXRWaWV3KHZpZXcs IHByb3BlcnR5LCBncmFwaEhlaWdodCwge2RhdGFQb2ludHMsIG1pbiwgbWF4LCBhdmVyYWdlfSkg eworICAgICAgICBmdW5jdGlvbiBsYXlvdXRWaWV3KHZpZXcsIHByb3BlcnR5LCBncmFwaEhlaWdo dCwgbGF5b3V0TWF4LCB7ZGF0YVBvaW50cywgbWluLCBtYXgsIGF2ZXJhZ2V9KSB7CiAgICAgICAg ICAgICBpZiAobWluID09PSBJbmZpbml0eSkKICAgICAgICAgICAgICAgICBtaW4gPSAwOwogICAg ICAgICAgICAgaWYgKG1heCA9PT0gLUluZmluaXR5KQpAQCAtNjg1LDEyICs2OTYsMTcgQEAgV0ku Q1BVVGltZWxpbmVWaWV3ID0gY2xhc3MgQ1BVVGltZWxpbmVWaWV3IGV4dGVuZHMgV0kuVGltZWxp bmVWaWV3CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAgICBsYXlvdXRWaWV3KHRo aXMuX2NwdVVzYWdlVmlldywgbnVsbCwgQ1BVVGltZWxpbmVWaWV3LmNwdVVzYWdlVmlld0hlaWdo dCwge2RhdGFQb2ludHMsIG1pbiwgbWF4LCBhdmVyYWdlfSk7CisgICAgICAgIC8vIExheW91dCB0 aGUgY29tYmluZWQgZ3JhcGggdG8gdGhlIG1heGltdW0gdG90YWwgQ1BVIHVzYWdlLgorICAgICAg ICAvLyBMYXlvdXQgYWxsIHRoZSB0aHJlYWQgZ3JhcGhzIHRvIHRoZSBzYW1lIHRpbWUgc2NhbGUs IHRoZSBtYXhpbXVtIGFjcm9zcyB0aHJlYWRzIC8gdGhyZWFkIGdyb3Vwcy4KKyAgICAgICAgdGhp cy5fbGF5b3V0TWF4ID0gbWF4OworICAgICAgICB0aGlzLl90aHJlYWRMYXlvdXRNYXggPSBiZXN0 VGhyZWFkTGF5b3V0TWF4KE1hdGgubWF4KG1haW5UaHJlYWRNYXgsIHdlYmtpdFRocmVhZE1heCwg dW5rbm93blRocmVhZE1heCwgd29ya2VyTWF4KSk7CisKKyAgICAgICAgbGF5b3V0Vmlldyh0aGlz Ll9jcHVVc2FnZVZpZXcsIG51bGwsIENQVVRpbWVsaW5lVmlldy5jcHVVc2FnZVZpZXdIZWlnaHQs IHRoaXMuX2xheW91dE1heCwge2RhdGFQb2ludHMsIG1pbiwgbWF4LCBhdmVyYWdlfSk7CiAKICAg ICAgICAgaWYgKHRoaXMuX3RocmVhZHNEZXRhaWxzRWxlbWVudC5vcGVuKSB7Ci0gICAgICAgICAg ICBsYXlvdXRWaWV3KHRoaXMuX21haW5UaHJlYWRVc2FnZVZpZXcsICJtYWluVGhyZWFkVXNhZ2Ui LCBDUFVUaW1lbGluZVZpZXcudGhyZWFkQ1BVVXNhZ2VWaWV3SGVpZ2h0LCB7ZGF0YVBvaW50cywg bWluOiBtYWluVGhyZWFkTWluLCBtYXg6IG1haW5UaHJlYWRNYXgsIGF2ZXJhZ2U6IG1haW5UaHJl YWRBdmVyYWdlfSk7Ci0gICAgICAgICAgICBsYXlvdXRWaWV3KHRoaXMuX3dlYmtpdFRocmVhZFVz YWdlVmlldywgIndlYmtpdFRocmVhZFVzYWdlIiwgQ1BVVGltZWxpbmVWaWV3LnRocmVhZENQVVVz YWdlVmlld0hlaWdodCwge2RhdGFQb2ludHMsIG1pbjogd2Via2l0VGhyZWFkTWluLCBtYXg6IHdl YmtpdFRocmVhZE1heCwgYXZlcmFnZTogd2Via2l0VGhyZWFkQXZlcmFnZX0pOwotICAgICAgICAg ICAgbGF5b3V0Vmlldyh0aGlzLl91bmtub3duVGhyZWFkVXNhZ2VWaWV3LCAidW5rbm93blRocmVh ZFVzYWdlIiwgQ1BVVGltZWxpbmVWaWV3LnRocmVhZENQVVVzYWdlVmlld0hlaWdodCwge2RhdGFQ b2ludHMsIG1pbjogdW5rbm93blRocmVhZE1pbiwgbWF4OiB1bmtub3duVGhyZWFkTWF4LCBhdmVy YWdlOiB1bmtub3duVGhyZWFkQXZlcmFnZX0pOworICAgICAgICAgICAgbGF5b3V0Vmlldyh0aGlz Ll9tYWluVGhyZWFkVXNhZ2VWaWV3LCAibWFpblRocmVhZFVzYWdlIiwgQ1BVVGltZWxpbmVWaWV3 LnRocmVhZENQVVVzYWdlVmlld0hlaWdodCwgdGhpcy5fdGhyZWFkTGF5b3V0TWF4LCB7ZGF0YVBv aW50cywgbWluOiBtYWluVGhyZWFkTWluLCBtYXg6IG1haW5UaHJlYWRNYXgsIGF2ZXJhZ2U6IG1h aW5UaHJlYWRBdmVyYWdlfSk7CisgICAgICAgICAgICBsYXlvdXRWaWV3KHRoaXMuX3dlYmtpdFRo cmVhZFVzYWdlVmlldywgIndlYmtpdFRocmVhZFVzYWdlIiwgQ1BVVGltZWxpbmVWaWV3LnRocmVh ZENQVVVzYWdlVmlld0hlaWdodCwgdGhpcy5fdGhyZWFkTGF5b3V0TWF4LCB7ZGF0YVBvaW50cywg bWluOiB3ZWJraXRUaHJlYWRNaW4sIG1heDogd2Via2l0VGhyZWFkTWF4LCBhdmVyYWdlOiB3ZWJr aXRUaHJlYWRBdmVyYWdlfSk7CisgICAgICAgICAgICBsYXlvdXRWaWV3KHRoaXMuX3Vua25vd25U aHJlYWRVc2FnZVZpZXcsICJ1bmtub3duVGhyZWFkVXNhZ2UiLCBDUFVUaW1lbGluZVZpZXcudGhy ZWFkQ1BVVXNhZ2VWaWV3SGVpZ2h0LCB0aGlzLl90aHJlYWRMYXlvdXRNYXgsIHtkYXRhUG9pbnRz LCBtaW46IHVua25vd25UaHJlYWRNaW4sIG1heDogdW5rbm93blRocmVhZE1heCwgYXZlcmFnZTog dW5rbm93blRocmVhZEF2ZXJhZ2V9KTsKIAogICAgICAgICAgICAgdGhpcy5fcmVtb3ZlV29ya2Vy VGhyZWFkVmlld3MoKTsKIApAQCAtNzA0LDcgKzcyMCw3IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9 IGNsYXNzIENQVVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogICAgICAgICAg ICAgICAgIHRoaXMuX3RocmVhZHNEZXRhaWxzRWxlbWVudC5pbnNlcnRCZWZvcmUod29ya2VyVmll dy5lbGVtZW50LCB0aGlzLl93ZWJraXRUaHJlYWRVc2FnZVZpZXcuZWxlbWVudCk7CiAgICAgICAg ICAgICAgICAgdGhpcy5fd29ya2VyVmlld3MucHVzaCh3b3JrZXJWaWV3KTsKIAotICAgICAgICAg ICAgICAgIGxheW91dFZpZXcod29ya2VyVmlldywgInVzYWdlIiwgQ1BVVGltZWxpbmVWaWV3LnRo cmVhZENQVVVzYWdlVmlld0hlaWdodCwge2RhdGFQb2ludHM6IHdvcmtlckRhdGEuZGF0YVBvaW50 cywgbWluOiB3b3JrZXJEYXRhLm1pbiwgbWF4OiB3b3JrZXJEYXRhLm1heCwgYXZlcmFnZTogd29y a2VyRGF0YS5hdmVyYWdlfSk7CisgICAgICAgICAgICAgICAgbGF5b3V0Vmlldyh3b3JrZXJWaWV3 LCAidXNhZ2UiLCBDUFVUaW1lbGluZVZpZXcudGhyZWFkQ1BVVXNhZ2VWaWV3SGVpZ2h0LCB0aGlz Ll90aHJlYWRMYXlvdXRNYXgsIHtkYXRhUG9pbnRzOiB3b3JrZXJEYXRhLmRhdGFQb2ludHMsIG1p bjogd29ya2VyRGF0YS5taW4sIG1heDogd29ya2VyRGF0YS5tYXgsIGF2ZXJhZ2U6IHdvcmtlckRh dGEuYXZlcmFnZX0pOwogICAgICAgICAgICAgfQogICAgICAgICB9CiAKQEAgLTE3MDMsOSArMTcx OSw3IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9IGNsYXNzIENQVVRpbWVsaW5lVmlldyBleHRlbmRz IFdJLlRpbWVsaW5lVmlldwogICAgICAgICB0aGlzLl9vdmVybGF5UmVjb3JkID0gcmVjb3JkOwog ICAgICAgICB0aGlzLl9vdmVybGF5VGltZSA9IHRpbWU7CiAKLSAgICAgICAgbGV0IGxheW91dE1h eCA9IHRoaXMuX2xheW91dE1heDsKICAgICAgICAgbGV0IHNlY29uZHNQZXJQaXhlbCA9IHRoaXMu X3NlY29uZHNQZXJQaXhlbEluTGF5b3V0OwotICAgICAgICBsZXQgZ3JhcGhNYXggPSBsYXlvdXRN YXggKiAxLjA1OwogICAgICAgICBsZXQgZ3JhcGhTdGFydFRpbWUgPSB0aGlzLnN0YXJ0VGltZTsK IAogICAgICAgICB0aGlzLl9vdmVybGF5TWFya2VyLnRpbWUgPSB0aW1lICsgKHNlY29uZHNQZXJQ aXhlbCAvIDIpOwpAQCAtMTcxOCwxMCArMTczMiwxMiBAQCBXSS5DUFVUaW1lbGluZVZpZXcgPSBj bGFzcyBDUFVUaW1lbGluZVZpZXcgZXh0ZW5kcyBXSS5UaW1lbGluZVZpZXcKIAogICAgICAgICBs ZXQge21haW5UaHJlYWRVc2FnZSwgd29ya2VyVGhyZWFkVXNhZ2UsIHdlYmtpdFRocmVhZFVzYWdl LCB1bmtub3duVGhyZWFkVXNhZ2UsIHdvcmtlcnNEYXRhfSA9IHJlY29yZDsKIAotICAgICAgICBm dW5jdGlvbiBhZGRPdmVybGF5UG9pbnQodmlldywgZ3JhcGhIZWlnaHQsIHZhbHVlKSB7CisgICAg ICAgIGZ1bmN0aW9uIGFkZE92ZXJsYXlQb2ludCh2aWV3LCBncmFwaEhlaWdodCwgbGF5b3V0TWF4 LCB2YWx1ZSkgewogICAgICAgICAgICAgaWYgKCF2YWx1ZSkKICAgICAgICAgICAgICAgICByZXR1 cm47CiAKKyAgICAgICAgICAgIGxldCBncmFwaE1heCA9IGxheW91dE1heCAqIDEuMDU7CisKICAg ICAgICAgICAgIGZ1bmN0aW9uIHlTY2FsZSh2YWx1ZSkgewogICAgICAgICAgICAgICAgIHJldHVy biBncmFwaEhlaWdodCAtICgodmFsdWUgLyBncmFwaE1heCkgKiBncmFwaEhlaWdodCk7CiAgICAg ICAgICAgICB9CkBAIC0xNzMzLDE5ICsxNzQ5LDE5IEBAIFdJLkNQVVRpbWVsaW5lVmlldyA9IGNs YXNzIENQVVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogICAgICAgICB0aGlz Ll9jbGVhck92ZXJsYXlNYXJrZXJzKCk7CiAKICAgICAgICAgdGhpcy5fY3B1VXNhZ2VWaWV3LnVw ZGF0ZUxlZ2VuZChyZWNvcmQpOwotICAgICAgICBhZGRPdmVybGF5UG9pbnQodGhpcy5fY3B1VXNh Z2VWaWV3LCBDUFVUaW1lbGluZVZpZXcuY3B1VXNhZ2VWaWV3SGVpZ2h0LCBtYWluVGhyZWFkVXNh Z2UpOwotICAgICAgICBhZGRPdmVybGF5UG9pbnQodGhpcy5fY3B1VXNhZ2VWaWV3LCBDUFVUaW1l bGluZVZpZXcuY3B1VXNhZ2VWaWV3SGVpZ2h0LCBtYWluVGhyZWFkVXNhZ2UgKyB3b3JrZXJUaHJl YWRVc2FnZSk7Ci0gICAgICAgIGFkZE92ZXJsYXlQb2ludCh0aGlzLl9jcHVVc2FnZVZpZXcsIENQ VVRpbWVsaW5lVmlldy5jcHVVc2FnZVZpZXdIZWlnaHQsIG1haW5UaHJlYWRVc2FnZSArIHdvcmtl clRocmVhZFVzYWdlICsgd2Via2l0VGhyZWFkVXNhZ2UgKyB1bmtub3duVGhyZWFkVXNhZ2UpOwor ICAgICAgICBhZGRPdmVybGF5UG9pbnQodGhpcy5fY3B1VXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZp ZXcuY3B1VXNhZ2VWaWV3SGVpZ2h0LCB0aGlzLl9sYXlvdXRNYXgsIG1haW5UaHJlYWRVc2FnZSk7 CisgICAgICAgIGFkZE92ZXJsYXlQb2ludCh0aGlzLl9jcHVVc2FnZVZpZXcsIENQVVRpbWVsaW5l Vmlldy5jcHVVc2FnZVZpZXdIZWlnaHQsIHRoaXMuX2xheW91dE1heCwgbWFpblRocmVhZFVzYWdl ICsgd29ya2VyVGhyZWFkVXNhZ2UpOworICAgICAgICBhZGRPdmVybGF5UG9pbnQodGhpcy5fY3B1 VXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZpZXcuY3B1VXNhZ2VWaWV3SGVpZ2h0LCB0aGlzLl9sYXlv dXRNYXgsIG1haW5UaHJlYWRVc2FnZSArIHdvcmtlclRocmVhZFVzYWdlICsgd2Via2l0VGhyZWFk VXNhZ2UgKyB1bmtub3duVGhyZWFkVXNhZ2UpOwogCiAgICAgICAgIGlmICh0aGlzLl90aHJlYWRz RGV0YWlsc0VsZW1lbnQub3BlbikgewogICAgICAgICAgICAgdGhpcy5fbWFpblRocmVhZFVzYWdl Vmlldy51cGRhdGVMZWdlbmQobWFpblRocmVhZFVzYWdlKTsKLSAgICAgICAgICAgIGFkZE92ZXJs YXlQb2ludCh0aGlzLl9tYWluVGhyZWFkVXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZpZXcudGhyZWFk Q1BVVXNhZ2VWaWV3SGVpZ2h0LCBtYWluVGhyZWFkVXNhZ2UpOworICAgICAgICAgICAgYWRkT3Zl cmxheVBvaW50KHRoaXMuX21haW5UaHJlYWRVc2FnZVZpZXcsIENQVVRpbWVsaW5lVmlldy50aHJl YWRDUFVVc2FnZVZpZXdIZWlnaHQsIHRoaXMuX3RocmVhZExheW91dE1heCwgbWFpblRocmVhZFVz YWdlKTsKIAogICAgICAgICAgICAgdGhpcy5fd2Via2l0VGhyZWFkVXNhZ2VWaWV3LnVwZGF0ZUxl Z2VuZCh3ZWJraXRUaHJlYWRVc2FnZSk7Ci0gICAgICAgICAgICBhZGRPdmVybGF5UG9pbnQodGhp cy5fd2Via2l0VGhyZWFkVXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZpZXcudGhyZWFkQ1BVVXNhZ2VW aWV3SGVpZ2h0LCB3ZWJraXRUaHJlYWRVc2FnZSk7CisgICAgICAgICAgICBhZGRPdmVybGF5UG9p bnQodGhpcy5fd2Via2l0VGhyZWFkVXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZpZXcudGhyZWFkQ1BV VXNhZ2VWaWV3SGVpZ2h0LCB0aGlzLl90aHJlYWRMYXlvdXRNYXgsIHdlYmtpdFRocmVhZFVzYWdl KTsKIAogICAgICAgICAgICAgdGhpcy5fdW5rbm93blRocmVhZFVzYWdlVmlldy51cGRhdGVMZWdl bmQodW5rbm93blRocmVhZFVzYWdlKTsKLSAgICAgICAgICAgIGFkZE92ZXJsYXlQb2ludCh0aGlz Ll91bmtub3duVGhyZWFkVXNhZ2VWaWV3LCBDUFVUaW1lbGluZVZpZXcudGhyZWFkQ1BVVXNhZ2VW aWV3SGVpZ2h0LCB1bmtub3duVGhyZWFkVXNhZ2UpOworICAgICAgICAgICAgYWRkT3ZlcmxheVBv aW50KHRoaXMuX3Vua25vd25UaHJlYWRVc2FnZVZpZXcsIENQVVRpbWVsaW5lVmlldy50aHJlYWRD UFVVc2FnZVZpZXdIZWlnaHQsIHRoaXMuX3RocmVhZExheW91dE1heCwgdW5rbm93blRocmVhZFVz YWdlKTsKIAogICAgICAgICAgICAgZm9yIChsZXQgd29ya2VyVmlldyBvZiB0aGlzLl93b3JrZXJW aWV3cykKICAgICAgICAgICAgICAgICB3b3JrZXJWaWV3LnVwZGF0ZUxlZ2VuZChOYU4pOwpAQCAt MTc1NSw3ICsxNzcxLDcgQEAgV0kuQ1BVVGltZWxpbmVWaWV3ID0gY2xhc3MgQ1BVVGltZWxpbmVW aWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3CiAgICAgICAgICAgICAgICAgICAgIGxldCB3b3Jr ZXJWaWV3ID0gdGhpcy5fd29ya2VyVmlld3MuZmluZCgoeCkgPT4geC5fX3dvcmtlcklkID09PSB0 YXJnZXRJZCk7CiAgICAgICAgICAgICAgICAgICAgIGlmICh3b3JrZXJWaWV3KSB7CiAgICAgICAg ICAgICAgICAgICAgICAgICB3b3JrZXJWaWV3LnVwZGF0ZUxlZ2VuZCh1c2FnZSk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBhZGRPdmVybGF5UG9pbnQod29ya2VyVmlldywgQ1BVVGltZWxpbmVW aWV3LnRocmVhZENQVVVzYWdlVmlld0hlaWdodCwgdXNhZ2UpOworICAgICAgICAgICAgICAgICAg ICAgICAgYWRkT3ZlcmxheVBvaW50KHdvcmtlclZpZXcsIENQVVRpbWVsaW5lVmlldy50aHJlYWRD UFVVc2FnZVZpZXdIZWlnaHQsIHRoaXMuX3RocmVhZExheW91dE1heCwgdXNhZ2UpOwogICAgICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQo=