147993 2015-08-13 14:09:25 -0700 Web Inspector: Skip rendering frame records without children 2015-08-13 15:28:00 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1117379 0 mattbaker 2015-08-13 14:09:25 -0700 * SUMMARY Skip rendering frame records without children. We currently skip frame record payloads with no children, but the logic for skipping frame model objects with no children is broken. 1117387 1 258934 mattbaker 2015-08-13 14:18:44 -0700 Created attachment 258934 [Patch] Proposed Fix 1117388 2 webkit-bug-importer 2015-08-13 14:18:58 -0700 <rdar://problem/22275866> 1117395 3 258934 joepeck 2015-08-13 14:26:58 -0700 Comment on attachment 258934 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=258934&action=review r=me > Source/WebInspectorUI/UserInterface/Models/RenderingFrameTimelineRecord.js:73 > + if (this._frameIndex >= 0) > + return; > + this._frameIndex = WebInspector.RenderingFrameTimelineRecord._nextFrameIndex++; If we expect this to be set only once, we can: console.assert(this._frameIndex === -1); 1117403 4 258937 mattbaker 2015-08-13 14:36:22 -0700 Created attachment 258937 [Patch] Proposed Fix 1117418 5 258937 commit-queue 2015-08-13 15:27:56 -0700 Comment on attachment 258937 [Patch] Proposed Fix Clearing flags on attachment: 258937 Committed r188408: <http://trac.webkit.org/changeset/188408> 1117419 6 commit-queue 2015-08-13 15:28:00 -0700 All reviewed patches have been landed. Closing bug. 258934 2015-08-13 14:18:44 -0700 2015-08-13 14:36:19 -0700 [Patch] Proposed Fix bug-147993-20150813141826.patch text/plain 4563 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4Mzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi MDQ1MjIxNWNmNTA5ODNiZjY1YWQ2MDQ5Yzc3NGEyMzJjMzJkMzAzLi4wMzFkMzY3NmQyY2JlNjQ1 MTgxMjNjOTAxYWJlYTA0MDNjZDFlZWJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2tpcCByZW5kZXJpbmcgZnJhbWUgcmVjb3JkcyB3 aXRob3V0IGNoaWxkcmVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDc5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIGJlY2FtZSBhbiBpc3N1ZSBmb3IgZnJhbWVzIHdoaWNoIGluY2x1ZGUgYW4g SW5kZXhlZERCICJzdWNjZXNzIiBldmVudC4gVGhpcyBjYXVzZWQgdGhlCisgICAgICAgIHBheWxv YWQgdG8gcGFzcyB0aGUgImhhcyBjaGlsZHJlbiIgdGVzdCwgYnV0IHJlc3VsdGVkIGluIG1vZGVs IG9iamVjdHMgd2l0aCBubyBjaGlsZCByZWNvcmRzLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyLnByb3RvdHlwZS5ldmVudFJlY29yZGVkKToKKyAgICAgICAgRml4ZWQg cmVjb3JkIHR5cGUgY2hlY2sgYW5kIG1vdmVkIHJlbmRlcmluZyBmcmFtZSBpbmRleCBhc3NpZ25t ZW50LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1l bGluZVJlY29yZC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVs aW5lUmVjb3JkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5l UmVjb3JkLnByb3RvdHlwZS5zZXR1cEZyYW1lSW5kZXgpOgorICAgICAgICBGcmFtZSBpbmRleCBp cyBub3cgc2V0IGV4dGVybmFsbHksIGFuZCBjYW4gb25seSBiZSBzZXQgb25jZS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcucHJvdG90eXBl Ll9yZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkQWRkZWQpOgorICAgICAgICBBZGRlZCBhc3Nl cnRpb24uCisKIDIwMTUtMDgtMTMgIE5pa2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE4ODMyNSk6IFdlYiBJbnNwZWN0b3I6IEZpeCB2 ZXJ0aWNhbCBzcGFjaW5nIGluIENvZGVNaXJyb3IKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFu YWdlci5qcwppbmRleCA1MmExZmRhYWJhMDdhNDhkNThhN2M3MTJiMmNlOTAwMjJlOGFlYzM1Li5l Y2ZhN2EwZjhhNTJmZTljYjYyYzE3MjZiMDI1ODMwNGY5N2UwNGI4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFn ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvVGltZWxpbmVNYW5hZ2VyLmpzCkBAIC0yMTAsOCArMjEwLDEyIEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2JqZWN0CiAgICAgICAgIH0KIAogICAgICAgICBmb3IgKHZhciByZWNvcmQgb2YgcmVjb3Jk cykgewotICAgICAgICAgICAgaWYgKHJlY29yZC50eXBlID09PSBXZWJJbnNwZWN0b3IuUmVuZGVy aW5nRnJhbWVUaW1lbGluZVJlY29yZCAmJiAhcmVjb3JkLmNoaWxkcmVuLmxlbmd0aCkKLSAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIGlmIChyZWNvcmQudHlwZSA9PT0gV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuUmVuZGVyaW5nRnJhbWUpIHsKKyAgICAgICAg ICAgICAgICBpZiAoIXJlY29yZC5jaGlsZHJlbi5sZW5ndGgpCisgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgICAgIHJlY29yZC5zZXR1cEZyYW1lSW5kZXgoKTsKKyAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgdGhpcy5fYWRkUmVjb3JkKHJlY29yZCk7CiAgICAg ICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVj b3JkLmpzCmluZGV4IDg3MzhiYWI1ODlkOGZmYmQzMDQyODQ3YzlhMTMxYmQ4OGMxODg3ODcuLjlj YmIwMDg0OWVkN2I1OTQyMDM0YzU0YzgxYTdmNjU2ZGExYjZhZmQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9SZW5kZXJpbmdGcmFtZVRpbWVs aW5lUmVjb3JkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01v ZGVscy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkLmpzCkBAIC0zMCw3ICszMCw3IEBAIFdl Ykluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkID0gY2xhc3MgUmVuZGVyaW5n RnJhbWVUaW1lbGluZVJlY29yZCBlCiAgICAgICAgIHN1cGVyKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZC5UeXBlLlJlbmRlcmluZ0ZyYW1lLCBzdGFydFRpbWUsIGVuZFRpbWUpOwogCiAgICAg ICAgIHRoaXMuX2R1cmF0aW9uQnlUYXNrVHlwZSA9IG5ldyBNYXA7Ci0gICAgICAgIHRoaXMuX2Zy YW1lSW5kZXggPSBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5fbmV4 dEZyYW1lSW5kZXgrKzsKKyAgICAgICAgdGhpcy5fZnJhbWVJbmRleCA9IC0xOwogICAgIH0KIAog ICAgIC8vIFN0YXRpYwpAQCAtNjYsNiArNjYsMTMgQEAgV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0Zy YW1lVGltZWxpbmVSZWNvcmQgPSBjbGFzcyBSZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkIGUK ICAgICAgICAgcmV0dXJuIHRoaXMuX2ZyYW1lSW5kZXggKyAxOwogICAgIH0KIAorICAgIHNldHVw RnJhbWVJbmRleCgpCisgICAgeworICAgICAgICBpZiAodGhpcy5fZnJhbWVJbmRleCA+PSAwKQor ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl9mcmFtZUluZGV4ID0gV2ViSW5zcGVj dG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQuX25leHRGcmFtZUluZGV4Kys7CisgICAg fQorCiAgICAgZHVyYXRpb25Gb3JUYXNrKHRhc2tUeXBlKQogICAgIHsKICAgICAgICAgaWYgKHRo aXMuX2R1cmF0aW9uQnlUYXNrVHlwZS5oYXModGFza1R5cGUpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGlu ZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5k ZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwppbmRleCA5MzBjOWQzMjVkNDJjZDM5N2MwNzYzNzky NjIzYjc3NGFkZWQ5NWUyLi5hZjgwYmQ0NGJjZTY5YTRkZjgxMGU3MzAwYWIwYWMyYmE4ODZlYjQ0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwpAQCAtMzA2 LDYgKzMwNiw3IEBAIFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyA9IGNs YXNzIFJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3IGV4dGVuCiAgICAgewogICAgICAgICB2YXIg cmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZCA9IGV2ZW50LmRhdGEucmVjb3JkOwogICAgICAg ICBjb25zb2xlLmFzc2VydChyZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkIGluc3RhbmNlb2Yg V2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQpOworICAgICAgICBjb25z b2xlLmFzc2VydChyZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkLmNoaWxkcmVuLmxlbmd0aCwg Ik1pc3NpbmcgY2hpbGQgcmVjb3JkcyBmb3IgcmVuZGVyaW5nIGZyYW1lLiIpOwogCiAgICAgICAg IHRoaXMuX3BlbmRpbmdSZWNvcmRzLnB1c2gocmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZCk7 CiAK 258937 2015-08-13 14:36:22 -0700 2015-08-13 15:27:56 -0700 [Patch] Proposed Fix bug-147993-20150813143604.patch text/plain 4684 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NDA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAy ZGJjODZkZmM4ZWEwOGEwYmNkYWY0ODVmMzg1ZTRmNzBiZjJiMWUyLi5hMjk3NjM2NmEyZDkxMjQ4 ZGY2MTI0NDZiYjlkZTg2OWJiNWUzOTQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNS0wOC0xMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogU2tpcCByZW5kZXJpbmcgZnJhbWUgcmVjb3JkcyB3 aXRob3V0IGNoaWxkcmVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNDc5OTMKKworICAgICAgICBSZXZpZXdlZCBieSBSZXZpZXdlZCBieSBKb3NlcGgg UGVjb3Jhcm8uCisKKyAgICAgICAgVGhpcyBiZWNhbWUgYW4gaXNzdWUgZm9yIGZyYW1lcyB3aGlj aCBpbmNsdWRlIGFuIEluZGV4ZWREQiAic3VjY2VzcyIgZXZlbnQuIFRoaXMgY2F1c2VkIHRoZQor ICAgICAgICBwYXlsb2FkIHRvIHBhc3MgdGhlICJoYXMgY2hpbGRyZW4iIHRlc3QsIGJ1dCByZXN1 bHRlZCBpbiBtb2RlbCBvYmplY3RzIHdpdGggbm8gY2hpbGQgcmVjb3Jkcy4KKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5wcm90b3R5cGUuZXZlbnRSZWNvcmRlZCk6Cisg ICAgICAgIEZpeGVkIHJlY29yZCB0eXBlIGNoZWNrIGFuZCBtb3ZlZCByZW5kZXJpbmcgZnJhbWUg aW5kZXggYXNzaWdubWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1JlbmRl cmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVuZGVy aW5nRnJhbWVUaW1lbGluZVJlY29yZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVuZGVyaW5n RnJhbWVUaW1lbGluZVJlY29yZC5wcm90b3R5cGUuc2V0dXBGcmFtZUluZGV4KToKKyAgICAgICAg RnJhbWUgaW5kZXggaXMgbm93IHNldCBleHRlcm5hbGx5LCBhbmQgY2FuIG9ubHkgYmUgc2V0IG9u Y2UuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxp bmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVW aWV3LnByb3RvdHlwZS5fcmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZEFkZGVkKToKKyAgICAg ICAgQWRkZWQgYXNzZXJ0aW9uLgorCiAyMDE1LTA4LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNv cmFyb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQSB7TWFwLCBXZWFrTWFw LCBTZXQsIFdlYWtTZXR9IG9iamVjdCBjb250YWlucyBpdHNlbGYgd2lsbCBoYW5nIHRoZSBjb25z b2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNTJhMWZkYWFiYTA3 YTQ4ZDU4YTdjNzEyYjJjZTkwMDIyZThhZWMzNS4uZWNmYTdhMGY4YTUyZmU5Y2I2MmMxNzI2YjAy NTgzMDRmOTdlMDRiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAt MjEwLDggKzIxMCwxMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGlt ZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB9CiAKICAg ICAgICAgZm9yICh2YXIgcmVjb3JkIG9mIHJlY29yZHMpIHsKLSAgICAgICAgICAgIGlmIChyZWNv cmQudHlwZSA9PT0gV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQgJiYg IXJlY29yZC5jaGlsZHJlbi5sZW5ndGgpCi0gICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5U eXBlLlJlbmRlcmluZ0ZyYW1lKSB7CisgICAgICAgICAgICAgICAgaWYgKCFyZWNvcmQuY2hpbGRy ZW4ubGVuZ3RoKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAg ICByZWNvcmQuc2V0dXBGcmFtZUluZGV4KCk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAg IHRoaXMuX2FkZFJlY29yZChyZWNvcmQpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1JlbmRlcmluZ0ZyYW1l VGltZWxpbmVSZWNvcmQuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5qcwppbmRleCA1YzllYzBjMTNiYjUw NzQ4MmNjZDU4MWFmNGYyNThhZjI3OTNkZGU3Li5lZmE2NzY4N2FiMzIwZTUzYWMwZDJlYmU5MmJh NGE1ODM1ZDBlODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvUmVuZGVyaW5nRnJhbWVUaW1lbGlu ZVJlY29yZC5qcwpAQCAtMzAsNyArMzAsNyBAQCBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVU aW1lbGluZVJlY29yZCA9IGNsYXNzIFJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQgZQogICAg ICAgICBzdXBlcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5SZW5kZXJpbmdGcmFt ZSwgc3RhcnRUaW1lLCBlbmRUaW1lKTsKIAogICAgICAgICB0aGlzLl9kdXJhdGlvbkJ5VGFza1R5 cGUgPSBuZXcgTWFwOwotICAgICAgICB0aGlzLl9mcmFtZUluZGV4ID0gV2ViSW5zcGVjdG9yLlJl bmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQuX25leHRGcmFtZUluZGV4Kys7CisgICAgICAgIHRo aXMuX2ZyYW1lSW5kZXggPSAtMTsKICAgICB9CiAKICAgICAvLyBTdGF0aWMKQEAgLTgxLDYgKzgx LDE0IEBAIFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkID0gY2xhc3Mg UmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZCBlCiAgICAgICAgIHJldHVybiB0aGlzLl9mcmFt ZUluZGV4ICsgMTsKICAgICB9CiAKKyAgICBzZXR1cEZyYW1lSW5kZXgoKQorICAgIHsKKyAgICAg ICAgY29uc29sZS5hc3NlcnQodGhpcy5fZnJhbWVJbmRleCA9PT0gLTEsICJGcmFtZSBpbmRleCBz aG91bGQgb25seSBiZSBzZXQgb25jZS4iKTsKKyAgICAgICAgaWYgKHRoaXMuX2ZyYW1lSW5kZXgg Pj0gMCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fZnJhbWVJbmRleCA9IFdl Ykluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkLl9uZXh0RnJhbWVJbmRleCsr OworICAgIH0KKwogICAgIGR1cmF0aW9uRm9yVGFzayh0YXNrVHlwZSkKICAgICB7CiAgICAgICAg IGlmICh0aGlzLl9kdXJhdGlvbkJ5VGFza1R5cGUuaGFzKHRhc2tUeXBlKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1l VGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKaW5kZXggOTMwYzlkMzI1ZDQyY2QzOTdj MDc2Mzc5MjYyM2I3NzRhZGVkOTVlMi4uYWY4MGJkNDRiY2U2OWE0ZGY4MTBlNzMwMGFiMGFjMmJh ODg2ZWI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMK QEAgLTMwNiw2ICszMDYsNyBAQCBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZp ZXcgPSBjbGFzcyBSZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldyBleHRlbgogICAgIHsKICAgICAg ICAgdmFyIHJlbmRlcmluZ0ZyYW1lVGltZWxpbmVSZWNvcmQgPSBldmVudC5kYXRhLnJlY29yZDsK ICAgICAgICAgY29uc29sZS5hc3NlcnQocmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZCBpbnN0 YW5jZW9mIFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lUmVjb3JkKTsKKyAgICAg ICAgY29uc29sZS5hc3NlcnQocmVuZGVyaW5nRnJhbWVUaW1lbGluZVJlY29yZC5jaGlsZHJlbi5s ZW5ndGgsICJNaXNzaW5nIGNoaWxkIHJlY29yZHMgZm9yIHJlbmRlcmluZyBmcmFtZS4iKTsKIAog ICAgICAgICB0aGlzLl9wZW5kaW5nUmVjb3Jkcy5wdXNoKHJlbmRlcmluZ0ZyYW1lVGltZWxpbmVS ZWNvcmQpOwogCg==