79241 2012-02-22 08:02:41 -0800 Web Inspector: fix memory counters and start-at-zero modes of timeline panels to co-exist nicely 2012-02-22 08:08:26 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 561989 0 caseq 2012-02-22 08:02:41 -0800 - Do not auto-enable memory counters mode when start-at-zero is toggled off - Automatically disable memory counters when switching to start-at-zero mode - Fixed JSCompiler warnings 561992 1 128217 caseq 2012-02-22 08:03:39 -0800 Created attachment 128217 Patch 561994 2 caseq 2012-02-22 08:08:26 -0800 Committed r108504: <http://trac.webkit.org/changeset/108504> 128217 2012-02-22 08:03:39 -0800 2012-02-22 08:06:52 -0800 Patch bug-79241-20120222200337.patch text/plain 7392 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4NTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTkwNGZmYTlmZThhMjRm Y2Y4NDg2MmJjYmZjYmY0YTAwNWFiODE1OS4uZDg5MDhjNGY1NzdkMzdlOTVhZGNjNzAwYTYyMjg2 NWVjZWI3ZGUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTAyLTIyICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZml4IG1lbW9yeSBjb3VudGVycyBhbmQgc3RhcnQtYXQtemVybyBtb2RlcyBvZiB0aW1lbGlu ZSBwYW5lbHMgdG8gY28tZXhpc3QgbmljZWx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03OTI0MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNz LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlLmFk ZFRpbWxpbmVFdmVudCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92 ZXJ2aWV3UGFuZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFu ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBl Ll9zaG93VGltZWxpbmVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5wcm90b3R5cGUuX3Nob3dNZW1vcnlHcmFwaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLnNldFN0YXJ0QXRaZXJvKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUuX29uV2luZG93Q2hh bmdlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl90aW1lbGluZXNP dmVydmlld01vZGVDaGFuZ2VkKToKKworMjAxMi0wMi0yMiAgQW5kcmV5IEtvc3lha292ICA8Y2Fz ZXFAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtleHBlcmltZW50YWxd IGFkZCBhIG1vZGUgdG8gZGlzcGxheSB0aW1lbGluZSBldmVudHMgYWxpZ25lZCBieSB0aGUgc3Rh cnQgdGltZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzkxMjMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9N ZW1vcnlTdGF0aXN0aWNzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9N ZW1vcnlTdGF0aXN0aWNzLmpzCmluZGV4IDA4M2JmYzdlMWJmODA0YTUzMmRkMjA0OWVjMDEyOWQ1 NmViODA0ODIuLjQ4NDhlMWU0OTljYTQ0NTZjZjM0ZmE5MzYyNmEzYzFlYTBjM2IxOWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGlj cy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRp c3RpY3MuanMKQEAgLTEyNSw5ICsxMjUsOSBAQCBXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGlj cy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBjb3VudGVycyA9IGV2ZW50LmRhdGFbImNvdW50 ZXJzIl07CiAgICAgICAgIHRoaXMuX2NvdW50ZXJzLnB1c2goewogICAgICAgICAgICAgdGltZTog ZXZlbnQuZGF0YS5lbmRUaW1lLAotICAgICAgICAgICAgZG9jdW1lbnRDb3VudDogY291bnRlcnMu ZG9jdW1lbnRzLAotICAgICAgICAgICAgbm9kZUNvdW50OiBjb3VudGVycy5ub2RlcywKLSAgICAg ICAgICAgIGxpc3RlbmVyQ291bnQ6IGNvdW50ZXJzLmpzRXZlbnRMaXN0ZW5lcnMKKyAgICAgICAg ICAgIGRvY3VtZW50Q291bnQ6IGNvdW50ZXJzWyJkb2N1bWVudHMiXSwKKyAgICAgICAgICAgIG5v ZGVDb3VudDogY291bnRlcnNbIm5vZGVzIl0sCisgICAgICAgICAgICBsaXN0ZW5lckNvdW50OiBj b3VudGVyc1sianNFdmVudExpc3RlbmVycyJdCiAgICAgICAgIH0pOwogICAgIH0sCiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmll d1BhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3Zl cnZpZXdQYW5lLmpzCmluZGV4IDY2ZmVhNmYxZmViMjdiNjZmMmYwMGRjZTU5YjU3MTMyNWYzZTM0 MGEuLjg1ODc0MmM2YzVhNGIwYzAwZTE4ZjgwMzAxZmZjZjkxOTljNzc1OTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUu anMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2 aWV3UGFuZS5qcwpAQCAtNTMsMTQgKzUzLDE0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZSA9IGZ1bmN0aW9uKHByZXNlbnRhdGlvbk1vZGVsKQogICAgIHRoaXMuZWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl90b3BQYW5lU2lkZWJhckVsZW1lbnQpOwogCiAgICAgdmFyIHRvcFBh bmVTaWRlYmFyVHJlZSA9IG5ldyBUcmVlT3V0bGluZShvdmVydmlld1RyZWVFbGVtZW50KTsKLSAg ICB2YXIgdGltZWxpbmVzT3ZlcnZpZXdJdGVtID0gbmV3IFdlYkluc3BlY3Rvci5TaWRlYmFyVHJl ZUVsZW1lbnQoInJlc291cmNlcy10aW1lLWdyYXBoLXNpZGViYXItaXRlbSIsIFdlYkluc3BlY3Rv ci5VSVN0cmluZygiVGltZWxpbmVzIikpOwotICAgIHRvcFBhbmVTaWRlYmFyVHJlZS5hcHBlbmRD aGlsZCh0aW1lbGluZXNPdmVydmlld0l0ZW0pOwotICAgIHRpbWVsaW5lc092ZXJ2aWV3SXRlbS5y ZXZlYWxBbmRTZWxlY3QoZmFsc2UpOwotICAgIHRpbWVsaW5lc092ZXJ2aWV3SXRlbS5vbnNlbGVj dCA9IHRoaXMuX3Nob3dUaW1lbGluZXMuYmluZCh0aGlzKTsKKyAgICB0aGlzLl90aW1lbGluZXNP dmVydmlld0l0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCgicmVzb3Vy Y2VzLXRpbWUtZ3JhcGgtc2lkZWJhci1pdGVtIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1l bGluZXMiKSk7CisgICAgdG9wUGFuZVNpZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuX3RpbWVs aW5lc092ZXJ2aWV3SXRlbSk7CisgICAgdGhpcy5fdGltZWxpbmVzT3ZlcnZpZXdJdGVtLnJldmVh bEFuZFNlbGVjdChmYWxzZSk7CisgICAgdGhpcy5fdGltZWxpbmVzT3ZlcnZpZXdJdGVtLm9uc2Vs ZWN0ID0gdGhpcy5fc2hvd1RpbWVsaW5lcy5iaW5kKHRoaXMpOwogCi0gICAgdmFyIG1lbW9yeU92 ZXJ2aWV3SXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuU2lkZWJhclRyZWVFbGVtZW50KCJyZXNvdXJj ZXMtc2l6ZS1ncmFwaC1zaWRlYmFyLWl0ZW0iLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk1lbW9y eSIpKTsKLSAgICB0b3BQYW5lU2lkZWJhclRyZWUuYXBwZW5kQ2hpbGQobWVtb3J5T3ZlcnZpZXdJ dGVtKTsKLSAgICBtZW1vcnlPdmVydmlld0l0ZW0ub25zZWxlY3QgPSB0aGlzLl9zaG93TWVtb3J5 R3JhcGguYmluZCh0aGlzKTsKKyAgICB0aGlzLl9tZW1vcnlPdmVydmlld0l0ZW0gPSBuZXcgV2Vi SW5zcGVjdG9yLlNpZGViYXJUcmVlRWxlbWVudCgicmVzb3VyY2VzLXNpemUtZ3JhcGgtc2lkZWJh ci1pdGVtIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJNZW1vcnkiKSk7CisgICAgdG9wUGFuZVNp ZGViYXJUcmVlLmFwcGVuZENoaWxkKHRoaXMuX21lbW9yeU92ZXJ2aWV3SXRlbSk7CisgICAgdGhp cy5fbWVtb3J5T3ZlcnZpZXdJdGVtLm9uc2VsZWN0ID0gdGhpcy5fc2hvd01lbW9yeUdyYXBoLmJp bmQodGhpcyk7CiAKICAgICB0aGlzLl9vdmVydmlld0dyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLlRp bWVsaW5lR3JpZCgpOwogICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5lbGVtZW50LmlkID0gInRpbWVs aW5lLW92ZXJ2aWV3LWdyaWQiOwpAQCAtMTAxLDcgKzEwMSw3IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3UGFuZS5XaW5kb3dTY3JvbGxTcGVlZEZhY3RvciA9IC4zOwogV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLlJlc2l6ZXJPZmZzZXQgPSAzLjU7IC8vIGhhbGYgcGl4 ZWwgYmVjYXVzZSBvZmZzZXQgdmFsdWVzIGFyZSBub3Qgcm91bmRlZCBidXQgY2VpbGVkCiAKIFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2RlID0gewotICAgIEV2ZW50czogIlRp bWVsaW5lIiwKKyAgICBFdmVudHM6ICJFdmVudHMiLAogICAgIE1lbW9yeTogIk1lbW9yeSIKIH07 CiAKQEAgLTExMiw2ICsxMTIsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUu RXZlbnRzID0gewogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9 IHsKICAgICBfc2hvd1RpbWVsaW5lczogZnVuY3Rpb24oKQogICAgIHsKKyAgICAgICAgdGhpcy5f dGltZWxpbmVzT3ZlcnZpZXdJdGVtLnJldmVhbEFuZFNlbGVjdChmYWxzZSk7CiAgICAgICAgIHRo aXMuX2hlYXBHcmFwaC5oaWRlKCk7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3R3JpZC5pdGVtc0dy YXBoc0VsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgICAgIHRoaXMuZGlz cGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5F dmVudHMuTW9kZUNoYW5nZWQsIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5Nb2Rl LkV2ZW50cyk7CkBAIC0xMTksMTcgKzEyMCwxMyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1BhbmUucHJvdG90eXBlID0gewogCiAgICAgX3Nob3dNZW1vcnlHcmFwaDogZnVuY3Rpb24o KQogICAgIHsKKyAgICAgICAgdGhpcy5fbWVtb3J5T3ZlcnZpZXdJdGVtLnJldmVhbEFuZFNlbGVj dChmYWxzZSk7CiAgICAgICAgIHRoaXMuX2hlYXBHcmFwaC5zaG93KCk7CiAgICAgICAgIHRoaXMu X2hlYXBHcmFwaC51cGRhdGUodGhpcy5fcmVjb3Jkcyk7CiAgICAgICAgIHRoaXMuX292ZXJ2aWV3 R3JpZC5pdGVtc0dyYXBoc0VsZW1lbnQuYWRkU3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5FdmVudHMuTW9kZUNoYW5nZWQsIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5Nb2RlLk1lbW9yeSk7CiAgICAgfSwKIAotICAgIF9vbldpbmRvd0NoYW5nZWQ6IGZ1bmN0 aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLnNldFdpbmRvd1Bv c2l0aW9uKHRoaXMuX292ZXJ2aWV3V2luZG93LndpbmRvd0xlZnQsIHRoaXMuX292ZXJ2aWV3V2lu ZG93LndpbmRvd1JpZ2h0KTsKLSAgICB9LAotCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtib29s ZWFufSBlbmFibGVkCiAgICAgICovCkBAIC0xMzksNiArMTM2LDggQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgdGhpcy5fc3RhcnRBdFplcm8gPSBlbmFibGVkOwogICAgICAgICBpZiAoZW5hYmxlZCkg eworICAgICAgICAgICAgaWYgKHRoaXMuX2hlYXBHcmFwaC52aXNpYmxlKQorICAgICAgICAgICAg ICAgIHRoaXMuX3Nob3dUaW1lbGluZXMoKTsKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJ0aW1lbGluZS1zdGFydC1hdC16ZXJvIik7CiAgICAgICAgICAgICB0aGlzLl9z dGFydEF0WmVyb092ZXJ2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZVN0YXJ0QXRaZXJv T3ZlcnZpZXcodGhpcy5fcHJlc2VudGF0aW9uTW9kZWwpOwogICAgICAgICAgICAgdGhpcy5fc3Rh cnRBdFplcm9PdmVydmlldy5zaG93KHRoaXMuZWxlbWVudCk7CkBAIC0xNTEsNiArMTUwLDExIEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5wcm90b3R5cGUgPSB7CiAgICAgICAg IH0KICAgICB9LAogCisgICAgX29uV2luZG93Q2hhbmdlZDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuc2V0V2luZG93UG9zaXRpb24odGhpcy5fb3Zl cnZpZXdXaW5kb3cud2luZG93TGVmdCwgdGhpcy5fb3ZlcnZpZXdXaW5kb3cud2luZG93UmlnaHQp OworICAgIH0sCisKICAgICBfb25DYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2VkOiBmdW5jdGlvbihl dmVudCkKICAgICB7CiAgICAgICAgIHZhciBjYXRlZ29yeSA9IGV2ZW50LmRhdGE7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5k ZXggYTYxNDhlNDI5YTJjZmQ1NzdmNzdlNjE4ZmMwNDUzZDY4ZjVlNzk0ZC4uMWY1OTZhOTE4OTA4 M2FiMjljNjNkYzI4ZTJjNmNmNWU0MjU5Y2UxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtNDE1LDcgKzQxNSwxMCBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAg ICBpZiAoIXRoaXMuX21lbW9yeVN0YXRpc3RpY3MpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGlmIChldmVudC5kYXRhID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUu TW9kZS5FdmVudHMgJiYgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy52aXNpYmxlKCkpIHsKKyAgICAg ICAgdmFyIHNob3VsZFNob3dNZW1vcnkgPSBldmVudC5kYXRhID09PSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlld1BhbmUuTW9kZS5NZW1vcnk7CisgICAgICAgIGlmIChzaG91bGRTaG93TWVt b3J5ID09PSB0aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnZpc2libGUoKSkKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgaWYgKCFzaG91bGRTaG93TWVtb3J5KSB7CiAgICAgICAgICAgICB0aGlz Ll90aW1lbGluZU1lbW9yeVNwbGl0dGVyLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgICAg ICAgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5oaWRlKCk7CiAgICAgICAgICAgICB0aGlzLnNw bGl0Vmlldy5lbGVtZW50LnN0eWxlLmhlaWdodCA9ICJhdXRvIjsK