90684 2012-07-06 06:41:05 -0700 Web Inspector: get rid of cancellable records in Timeline, manage frame records explicitly 2012-07-06 09:41:23 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 caseq caseq apavlov bweinstein keishi loislo pfeldman pmuellr rik yurys oldest_to_newest 664078 0 caseq 2012-07-06 06:41:05 -0700 Bringing in a notion of generic "cancelable" records in Timeline agent was a bad idea -- we don't seem to have other uses for it, and current implementation that uses records stack is somewhat confusing. Let's manage pending frame record explicitly instead. 664083 1 151079 caseq 2012-07-06 06:53:30 -0700 Created attachment 151079 Patch 664147 2 caseq 2012-07-06 09:41:23 -0700 Committed r121980: <http://trac.webkit.org/changeset/121980> 151079 2012-07-06 06:53:30 -0700 2012-07-06 09:16:32 -0700 Patch bug-90684-20120706175328.patch text/plain 7354 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxOTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZiYmNlYzcyMThhZGU4 MGNiZGM3Zjk4ZjRiZDg2MDVjN2RiYjkyNC4uNGI0YWI4Y2I2NGVhNGJhNGY3MzhlNGNkZDNiY2Y1 NDJmNGU3ZTNhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTA3LTA2ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogZ2V0IHJpZCBvZiBjYW5jZWxsYWJsZSByZWNvcmRzIGluIFRpbWVsaW5lLCBtYW5hZ2UgZnJh bWUgcmVjb3JkcyBleHBsaWNpdGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05MDY4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIC0gZHJvcCBoYW5kbGluZyBvZiAiY2FuY2VsYWJsZSIgcmVjb3JkczsKKyAg ICAgICAgLSBrZWVwIGZyYW1lIHJlY29yZCB1bnRpbCBvdGhlciByZWNvcmRzIGNvbWUgKG9yIGZy YW1lIGlzIGNhbmNlbGVkKQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5l QWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlk QmVnaW5GcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpk aWRDYW5jZWxGcmFtZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50 OjphZGRSZWNvcmRUb1RpbWVsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OnB1c2hDdXJyZW50UmVjb3JkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv clRpbWVsaW5lQWdlbnQ6OmNvbW1pdEZyYW1lUmVjb3JkKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNsZWFyUmVjb3JkU3RhY2spOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbnNwZWN0b3JUaW1lbGluZUFnZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjpUaW1lbGluZVJlY29yZEVudHJ5OjpUaW1lbGluZVJlY29yZEVudHJ5 KToKKyAgICAgICAgKFRpbWVsaW5lUmVjb3JkRW50cnkpOgorICAgICAgICAoSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCk6CisKIDIwMTItMDctMDYgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIG1lbW9yeSByZXBvcnRpbmcg cm91dGluZSB0byBEb2N1bWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IGIyNjM0ZjI0MDYwNWIxMDhlZjA3NmY5NDM2 YjE2MDNiMTZiNzE0YmUuLjc2YTc5MmY5NDZjYWVmYzQ2ZDZkNDVjN2NiOTQ5ZWY4ZjRjYzVjNmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JUaW1lbGluZUFn ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5jcHAKQEAgLTE5NSwxMiArMTk1LDEzIEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dDo6c3VwcG9ydHNGcmFtZUluc3RydW1lbnRhdGlvbihFcnJvclN0cmluZyosIGJvb2wqIHJlCiAK IHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQmVnaW5GcmFtZSgpCiB7Ci0gICAgcHVz aENhbmNlbGFibGVSZWNvcmQoSW5zcGVjdG9yT2JqZWN0OjpjcmVhdGUoKSwgVGltZWxpbmVSZWNv cmRUeXBlOjpCZWdpbkZyYW1lLCAwKTsKKyAgICBtX3BlbmRpbmdGcmFtZVJlY29yZCA9IFRpbWVs aW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1JlY29yZCh0aW1lc3RhbXAoKSwgMCk7CiB9 CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ2FuY2VsRnJhbWUoKQogewotICAg IGNhbmNlbFJlY29yZChUaW1lbGluZVJlY29yZFR5cGU6OkJlZ2luRnJhbWUpOworICAgIEFTU0VS VChtX3BlbmRpbmdGcmFtZVJlY29yZCk7CisgICAgbV9wZW5kaW5nRnJhbWVSZWNvcmQuY2xlYXIo KTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp3aWxsQ2FsbEZ1bmN0aW9uKGNv bnN0IFN0cmluZyYgc2NyaXB0TmFtZSwgaW50IHNjcmlwdExpbmUsIEZyYW1lKiBmcmFtZSkKQEAg LTQzOCw3ICs0MzksNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmRpZFByb2Nlc3NU YXNrKCkKIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5l KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQsIGNvbnN0IFN0cmluZyYgdHlwZSwg Y29uc3QgU3RyaW5nJiBmcmFtZUlkKQogewotICAgIGNvbW1pdENhbmNlbGFibGVSZWNvcmRzKCk7 CisgICAgY29tbWl0RnJhbWVSZWNvcmQoKTsKICAgICBpbm5lckFkZFJlY29yZFRvVGltZWxpbmUo cmVjb3JkLCB0eXBlLCBmcmFtZUlkKTsKIH0KIApAQCAtNTI2LDcgKzUyNyw3IEBAIHZvaWQgSW5z cGVjdG9yVGltZWxpbmVBZ2VudDo6YXBwZW5kUmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBkYXRhLCBjb25zCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hDdXJyZW50 UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25zdCBTdHJpbmcmIHR5 cGUsIGJvb2wgY2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqIGZyYW1lLCBib29sIGhhc09ycGhhbkRl dGFpbHMpCiB7CiAgICAgcHVzaEdDRXZlbnRSZWNvcmRzKCk7Ci0gICAgY29tbWl0Q2FuY2VsYWJs ZVJlY29yZHMoKTsKKyAgICBjb21taXRGcmFtZVJlY29yZCgpOwogICAgIFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IHJlY29yZCA9IFRpbWVsaW5lUmVjb3JkRmFjdG9yeTo6Y3JlYXRlR2VuZXJpY1Jl Y29yZCh0aW1lc3RhbXAoKSwgY2FwdHVyZUNhbGxTdGFjayA/IG1fbWF4Q2FsbFN0YWNrRGVwdGgg OiAwKTsKICAgICBTdHJpbmcgZnJhbWVJZDsKICAgICBpZiAoZnJhbWUgJiYgbV9wYWdlQWdlbnQp CkBAIC01MzgsNDQgKzUzOSwxNyBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnB1c2hD dXJyZW50UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLAogICAgIH0KIH0K IAotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpwdXNoQ2FuY2VsYWJsZVJlY29yZChQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgY29uc3QgU3RyaW5nJiB0eXBlLCBGcmFtZSog ZnJhbWUpCit2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmNvbW1pdEZyYW1lUmVjb3JkKCkK IHsKLSAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQgPSBUaW1lbGluZVJlY29yZEZh Y3Rvcnk6OmNyZWF0ZUdlbmVyaWNSZWNvcmQodGltZXN0YW1wKCksIDApOwotICAgIFN0cmluZyBm cmFtZUlkOwotICAgIGlmIChmcmFtZSAmJiBtX3BhZ2VBZ2VudCkKLSAgICAgICAgZnJhbWVJZCA9 IG1fcGFnZUFnZW50LT5mcmFtZUlkKGZyYW1lKTsKLSAgICBtX3JlY29yZFN0YWNrLmFwcGVuZChU aW1lbGluZVJlY29yZEVudHJ5KHJlY29yZC5yZWxlYXNlKCksIGRhdGEsIDAsIHR5cGUsIGZyYW1l SWQsIHRydWUpKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojpjb21taXRDYW5j ZWxhYmxlUmVjb3JkcygpCi17Ci0gICAgVmVjdG9yPFRpbWVsaW5lUmVjb3JkRW50cnk+IGNhbmNl bGFibGVSZWNvcmRzOwotICAgIHdoaWxlICghbV9yZWNvcmRTdGFjay5pc0VtcHR5KCkpIHsKLSAg ICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeSBlbnRyeSA9IG1fcmVjb3JkU3RhY2subGFzdCgpOwot ICAgICAgICBpZiAoIW1fcmVjb3JkU3RhY2subGFzdCgpLmNhbmNlbGFibGUpCi0gICAgICAgICAg ICBicmVhazsKLSAgICAgICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7Ci0gICAgICAgIGNh bmNlbGFibGVSZWNvcmRzLmFwcGVuZChlbnRyeSk7Ci0gICAgfQotICAgIHdoaWxlICghY2FuY2Vs YWJsZVJlY29yZHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIFRpbWVsaW5lUmVjb3JkRW50cnkgZW50 cnkgPSBjYW5jZWxhYmxlUmVjb3Jkcy5sYXN0KCk7Ci0gICAgICAgIGNhbmNlbGFibGVSZWNvcmRz LnJlbW92ZUxhc3QoKTsKLSAgICAgICAgZW50cnkucmVjb3JkLT5zZXRPYmplY3QoImRhdGEiLCBl bnRyeS5kYXRhKTsKLSAgICAgICAgaW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKGVudHJ5LnJlY29y ZC5yZWxlYXNlKCksIGVudHJ5LnR5cGUsIGVudHJ5LmZyYW1lSWQpOwotICAgIH0KLX0KLQotdm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpjYW5jZWxSZWNvcmQoY29uc3QgU3RyaW5nJiB0eXBl KQotewotICAgIGlmIChtX3JlY29yZFN0YWNrLmlzRW1wdHkoKSkKKyAgICBpZiAoIW1fcGVuZGlu Z0ZyYW1lUmVjb3JkKQogICAgICAgICByZXR1cm47Ci0gICAgVGltZWxpbmVSZWNvcmRFbnRyeSBl bnRyeSA9IG1fcmVjb3JkU3RhY2subGFzdCgpOwotICAgIGlmIChlbnRyeS5jYW5jZWxhYmxlICYm IGVudHJ5LnR5cGUgPT0gdHlwZSkKLSAgICAgICAgbV9yZWNvcmRTdGFjay5yZW1vdmVMYXN0KCk7 CisgICAgCisgICAgaW5uZXJBZGRSZWNvcmRUb1RpbWVsaW5lKG1fcGVuZGluZ0ZyYW1lUmVjb3Jk LnJlbGVhc2UoKSwgVGltZWxpbmVSZWNvcmRUeXBlOjpCZWdpbkZyYW1lLCAiIik7CiB9CiAKIHZv aWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6Y2xlYXJSZWNvcmRTdGFjaygpCiB7CisgICAgbV9w ZW5kaW5nRnJhbWVSZWNvcmQuY2xlYXIoKTsKICAgICBtX3JlY29yZFN0YWNrLmNsZWFyKCk7CiAg ICAgbV9pZCsrOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvclRpbWVsaW5lQWdlbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JU aW1lbGluZUFnZW50LmgKaW5kZXggODY5MmZjM2IxNjc0NzM0MTVkMzhmNGQ5NjM1OGRkNjgzMmFj MGI1Ni4uMzQ5MTM5YzFjYmVlZDIzMmJjMDdkMzVjN2U0NGQ0ZGE2YmQ2MjQxNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oCkBAIC0x NDgsOCArMTQ4LDggQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHN0cnVjdCBUaW1lbGluZVJl Y29yZEVudHJ5IHsKLSAgICAgICAgVGltZWxpbmVSZWNvcmRFbnRyeShQYXNzUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gcmVjb3JkLCBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZGF0YSwgUGFz c1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW4sIGNvbnN0IFN0cmluZyYgdHlwZSwgY29u c3QgU3RyaW5nJiBmcmFtZUlkLCBib29sIGNhbmNlbGFibGUgPSBmYWxzZSkKLSAgICAgICAgICAg IDogcmVjb3JkKHJlY29yZCksIGRhdGEoZGF0YSksIGNoaWxkcmVuKGNoaWxkcmVuKSwgdHlwZSh0 eXBlKSwgZnJhbWVJZChmcmFtZUlkKSwgY2FuY2VsYWJsZShjYW5jZWxhYmxlKQorICAgICAgICBU aW1lbGluZVJlY29yZEVudHJ5KFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiByZWNvcmQsIFBh c3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5 PiBjaGlsZHJlbiwgY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lSWQpCisg ICAgICAgICAgICA6IHJlY29yZChyZWNvcmQpLCBkYXRhKGRhdGEpLCBjaGlsZHJlbihjaGlsZHJl biksIHR5cGUodHlwZSksIGZyYW1lSWQoZnJhbWVJZCkKICAgICAgICAgewogICAgICAgICB9CiAg ICAgICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IHJlY29yZDsKQEAgLTE1NywxOSArMTU3LDE2 IEBAIHByaXZhdGU6CiAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gY2hpbGRyZW47CiAg ICAgICAgIFN0cmluZyB0eXBlOwogICAgICAgICBTdHJpbmcgZnJhbWVJZDsKLSAgICAgICAgYm9v bCBjYW5jZWxhYmxlOwogICAgIH07CiAgICAgICAgIAogICAgIEluc3BlY3RvclRpbWVsaW5lQWdl bnQoSW5zdHJ1bWVudGluZ0FnZW50cyosIEluc3BlY3RvclBhZ2VBZ2VudCosIEluc3BlY3RvclN0 YXRlKiwgSW5zcGVjdG9yVHlwZSwgSW5zcGVjdG9yQ2xpZW50Kik7CiAKICAgICB2b2lkIHB1c2hD dXJyZW50UmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiwgY29uc3QgU3RyaW5nJiB0 eXBlLCBib29sIGNhcHR1cmVDYWxsU3RhY2ssIEZyYW1lKiwgYm9vbCBoYXNPcnBoYW5EZXRhaWxz ID0gZmFsc2UpOwogICAgIHZvaWQgc2V0SGVhcFNpemVTdGF0aXN0aWMoSW5zcGVjdG9yT2JqZWN0 KiByZWNvcmQpOwotICAgICAgICAKKwogICAgIHZvaWQgZGlkQ29tcGxldGVDdXJyZW50UmVjb3Jk KGNvbnN0IFN0cmluZyYgdHlwZSk7CisgICAgdm9pZCBjb21taXRGcmFtZVJlY29yZCgpOwogICAg IHZvaWQgYXBwZW5kUmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBkYXRhLCBjb25z dCBTdHJpbmcmIHR5cGUsIGJvb2wgY2FwdHVyZUNhbGxTdGFjaywgRnJhbWUqKTsKLSAgICB2b2lk IHB1c2hDYW5jZWxhYmxlUmVjb3JkKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiwgY29uc3Qg U3RyaW5nJiB0eXBlLCBGcmFtZSopOwotICAgIHZvaWQgY29tbWl0Q2FuY2VsYWJsZVJlY29yZHMo KTsKLSAgICB2b2lkIGNhbmNlbFJlY29yZChjb25zdCBTdHJpbmcmIHR5cGUpOwogICAgIHZvaWQg YWRkUmVjb3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0 cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlkKTsKICAgICB2b2lkIGlubmVyQWRkUmVj b3JkVG9UaW1lbGluZShQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIGNvbnN0IFN0cmluZyYg dHlwZSwgY29uc3QgU3RyaW5nJiBmcmFtZUlkKTsKIApAQCAtMjAwLDYgKzE5Nyw3IEBAIHByaXZh dGU6CiAgICAgR0NFdmVudHMgbV9nY0V2ZW50czsKICAgICBpbnQgbV9tYXhDYWxsU3RhY2tEZXB0 aDsKICAgICB1bnNpZ25lZCBtX29ycGhhbkV2ZW50c0VuYWJsZWRTdGFja01hcms7CisgICAgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4gbV9wZW5kaW5nRnJhbWVSZWNvcmQ7CiAgICAgSW5zcGVjdG9y VHlwZSBtX2luc3BlY3RvclR5cGU7CiAgICAgSW5zcGVjdG9yQ2xpZW50KiBtX2NsaWVudDsKIH07 Cg==