36555 2010-03-24 14:04:52 -0700 Make calls to m_keyframeAnimations.checkConsistency() debug-only 2010-03-25 14:34:53 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All OS X 10.5 RESOLVED INVALID P2 Normal --- 1 simon.fraser simon.fraser ap cmarrin darin oldest_to_newest 203571 0 simon.fraser 2010-03-24 14:04:52 -0700 Animation code has a bunch of calls to m_keyframeAnimations.checkConsistency() that are in release builds. These should be debug-only. 203572 1 simon.fraser 2010-03-24 14:05:15 -0700 Or we should remove them. 203692 2 ap 2010-03-24 17:08:50 -0700 These are supposed to be no-ops in release builds. Are they not? We don't usually add ifdef NDEBUG at each call site if function name clearly indicates that it's debug-only, and has such ifdefs inside. 204187 3 51669 simon.fraser 2010-03-25 12:14:43 -0700 Created attachment 51669 Patch 204198 4 51669 simon.fraser 2010-03-25 12:57:09 -0700 Comment on attachment 51669 Patch r=ericc 204199 5 simon.fraser 2010-03-25 12:58:09 -0700 http://trac.webkit.org/changeset/56565 204209 6 darin 2010-03-25 13:59:26 -0700 The premise of this bug was wrong, I think. The code is already debug-only. 204221 7 simon.fraser 2010-03-25 14:23:55 -0700 Reopening to revert the change. 204224 8 simon.fraser 2010-03-25 14:34:53 -0700 Backed out in http://trac.webkit.org/changeset/56568. 51669 2010-03-25 12:14:43 -0700 2010-03-25 12:57:08 -0700 Patch bug-36555-20100325121441.patch text/plain 6831 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODY0OWJjZS4uYTg4NjZmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxMC0wMy0yNSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIGNhbGxzIHRvIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNo ZWNrQ29uc2lzdGVuY3koKSBkZWJ1Zy1vbmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zNjU1NQorCisgICAgICAgIFJlbW92ZSBsb3RzIG9mIGNhbGxz IHRvIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNoZWNrQ29uc2lzdGVuY3koKTsgd2hpY2ggd2VyZSBs ZWZ0IGFmdGVyIHNvbWUgZWFybGllcgorICAgICAgICBkZWJ1Z2dpbmcuIExlYXZlIG9uZSBpbiBD b21wb3NpdGVBbmltYXRpb246OmFuaW1hdGUoKSB0byBjYXRjaCBhbnkgZnV0dXJlIGlzc3Vlcywg d2hpY2ggaXMgT0sgc2luY2UKKyAgICAgICAgdGhlc2UgY2FsbHMgYXJlIG5vLW9wcyBpbiByZWxl YXNlIGJ1aWxkcy4KKyAgICAgICAgCisgICAgICAgICogcGFnZS9hbmltYXRpb24vQ29tcG9zaXRl QW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0ZUFuaW1hdGlvbjo6Y2xl YXJSZW5kZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVBbmltYXRpb246OnVwZGF0 ZUtleWZyYW1lQW5pbWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVBbmltYXRp b246OmdldEFuaW1hdGVkU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0 aW9uOjpzZXRBbmltYXRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9zaXRlQW5pbWF0aW9u Ojp0aW1lVG9OZXh0U2VydmljZSk6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NpdGVBbmltYXRp b246OmdldEFuaW1hdGlvbkZvclByb3BlcnR5KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2l0 ZUFuaW1hdGlvbjo6c3VzcGVuZEFuaW1hdGlvbnMpOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9z aXRlQW5pbWF0aW9uOjpyZXN1bWVBbmltYXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBv c2l0ZUFuaW1hdGlvbjo6aXNBbmltYXRpbmdQcm9wZXJ0eSk6CisgICAgICAgIChXZWJDb3JlOjpD b21wb3NpdGVBbmltYXRpb246OnBhdXNlQW5pbWF0aW9uQXRUaW1lKToKKyAgICAgICAgKFdlYkNv cmU6OkNvbXBvc2l0ZUFuaW1hdGlvbjo6bnVtYmVyT2ZBY3RpdmVBbmltYXRpb25zKToKKworMjAx MC0wMy0yNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAg ICBSZXZpZXdlZCBieSBHZW9mZnJleSBHYXJlbi4KIAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY1NTcKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9h bmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNwcCBiL1dlYkNvcmUvcGFnZS9hbmltYXRpb24v Q29tcG9zaXRlQW5pbWF0aW9uLmNwcAppbmRleCAwZjIzOGZkLi5jZGUwMTYzIDEwMDY0NAotLS0g YS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFuaW1hdGlvbi5jcHAKKysrIGIvV2Vi Q29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCkBAIC01Nyw3ICs1Nyw2 IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpjbGVhclJlbmRlcmVyKCkKICAgICAgICAgfQog ICAgIH0KICAgICBpZiAoIW1fa2V5ZnJhbWVBbmltYXRpb25zLmlzRW1wdHkoKSkgewotICAgICAg ICBtX2tleWZyYW1lQW5pbWF0aW9ucy5jaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgICAgIEFuaW1h dGlvbk5hbWVNYXA6OmNvbnN0X2l0ZXJhdG9yIGFuaW1hdGlvbnNFbmQgPSBtX2tleWZyYW1lQW5p bWF0aW9ucy5lbmQoKTsKICAgICAgICAgZm9yIChBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVy YXRvciBpdCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGFuaW1hdGlvbnNF bmQ7ICsraXQpIHsKICAgICAgICAgICAgIEtleWZyYW1lQW5pbWF0aW9uKiBhbmltID0gaXQtPnNl Y29uZC5nZXQoKTsKQEAgLTE4Nyw4ICsxODYsNiBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6 dXBkYXRlS2V5ZnJhbWVBbmltYXRpb25zKFJlbmRlck9iamVjdCogcmVuZGVyZXIsIFJlbmRlcgog ICAgIGlmIChtX2tleWZyYW1lQW5pbWF0aW9ucy5pc0VtcHR5KCkgJiYgIXRhcmdldFN0eWxlLT5o YXNBbmltYXRpb25zKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fa2V5ZnJhbWVBbmltYXRp b25zLmNoZWNrQ29uc2lzdGVuY3koKTsKLQogICAgIEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0 ZXJhdG9yIGtmZW5kID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuZW5kKCk7CiAgICAgCiAgICAgaWYg KGN1cnJlbnRTdHlsZSAmJiBjdXJyZW50U3R5bGUtPmhhc0FuaW1hdGlvbnMoKSAmJiB0YXJnZXRT dHlsZS0+aGFzQW5pbWF0aW9ucygpICYmICooY3VycmVudFN0eWxlLT5hbmltYXRpb25zKCkpID09 ICoodGFyZ2V0U3R5bGUtPmFuaW1hdGlvbnMoKSkpIHsKQEAgLTI5OSw4ICsyOTYsNiBAQCBQYXNz UmVmUHRyPFJlbmRlclN0eWxlPiBDb21wb3NpdGVBbmltYXRpb246OmdldEFuaW1hdGVkU3R5bGUo KSBjb25zdAogICAgICAgICAgICAgaW1wbGljaXRBbmltYXRpb24tPmdldEFuaW1hdGVkU3R5bGUo cmVzdWx0U3R5bGUpOwogICAgIH0KIAotICAgIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNoZWNrQ29u c2lzdGVuY3koKTsKLQogICAgIGZvciAoVmVjdG9yPEF0b21pY1N0cmluZ0ltcGwqPjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBtX2tleWZyYW1lQW5pbWF0aW9uT3JkZXJNYXAuYmVnaW4oKTsgaXQgIT0g bV9rZXlmcmFtZUFuaW1hdGlvbk9yZGVyTWFwLmVuZCgpOyArK2l0KSB7CiAgICAgICAgIFJlZlB0 cjxLZXlmcmFtZUFuaW1hdGlvbj4ga2V5ZnJhbWVBbmltYXRpb24gPSBtX2tleWZyYW1lQW5pbWF0 aW9ucy5nZXQoKml0KTsKICAgICAgICAgaWYgKGtleWZyYW1lQW5pbWF0aW9uKQpAQCAtMzIxLDcg KzMxNiw2IEBAIHZvaWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpzZXRBbmltYXRpbmcoYm9vbCBhbmlt YXRpbmcpCiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKCFtX2tleWZyYW1lQW5pbWF0aW9ucy5p c0VtcHR5KCkpIHsKLSAgICAgICAgbV9rZXlmcmFtZUFuaW1hdGlvbnMuY2hlY2tDb25zaXN0ZW5j eSgpOwogICAgICAgICBBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRvciBhbmltYXRpb25z RW5kID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuZW5kKCk7CiAgICAgICAgIGZvciAoQW5pbWF0aW9u TmFtZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2tleWZyYW1lQW5pbWF0aW9ucy5iZWdpbigp OyBpdCAhPSBhbmltYXRpb25zRW5kOyArK2l0KSB7CiAgICAgICAgICAgICBLZXlmcmFtZUFuaW1h dGlvbiogYW5pbSA9IGl0LT5zZWNvbmQuZ2V0KCk7CkBAIC0zNDgsNyArMzQyLDYgQEAgZG91Ymxl IENvbXBvc2l0ZUFuaW1hdGlvbjo6dGltZVRvTmV4dFNlcnZpY2UoKSBjb25zdAogICAgICAgICB9 CiAgICAgfQogICAgIGlmICghbV9rZXlmcmFtZUFuaW1hdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAg ICAgIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNoZWNrQ29uc2lzdGVuY3koKTsKICAgICAgICAgQW5p bWF0aW9uTmFtZU1hcDo6Y29uc3RfaXRlcmF0b3IgYW5pbWF0aW9uc0VuZCA9IG1fa2V5ZnJhbWVB bmltYXRpb25zLmVuZCgpOwogICAgICAgICBmb3IgKEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuYmVnaW4oKTsgaXQgIT0gYW5pbWF0aW9u c0VuZDsgKytpdCkgewogICAgICAgICAgICAgS2V5ZnJhbWVBbmltYXRpb24qIGFuaW1hdGlvbiA9 IGl0LT5zZWNvbmQuZ2V0KCk7CkBAIC0zNzAsNyArMzYzLDYgQEAgUGFzc1JlZlB0cjxLZXlmcmFt ZUFuaW1hdGlvbj4gQ29tcG9zaXRlQW5pbWF0aW9uOjpnZXRBbmltYXRpb25Gb3JQcm9wZXJ0eShp bnQgcHIKICAgICAvLyBXZSB3YW50IHRvIHNlbmQgYmFjayB0aGUgbGFzdCBhbmltYXRpb24gd2l0 aCB0aGUgcHJvcGVydHkgaWYgdGhlcmUgYXJlIG11bHRpcGxlcy4KICAgICAvLyBTbyB3ZSBuZWVk IHRvIGl0ZXJhdGUgdGhyb3VnaCBhbGwgYW5pbWF0aW9ucwogICAgIGlmICghbV9rZXlmcmFtZUFu aW1hdGlvbnMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNoZWNr Q29uc2lzdGVuY3koKTsKICAgICAgICAgQW5pbWF0aW9uTmFtZU1hcDo6Y29uc3RfaXRlcmF0b3Ig YW5pbWF0aW9uc0VuZCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmVuZCgpOwogICAgICAgICBmb3Ig KEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZUFuaW1hdGlv bnMuYmVnaW4oKTsgaXQgIT0gYW5pbWF0aW9uc0VuZDsgKytpdCkgewogICAgICAgICAgICAgUmVm UHRyPEtleWZyYW1lQW5pbWF0aW9uPiBhbmltID0gaXQtPnNlY29uZDsKQEAgLTM5MCw3ICszODIs NiBAQCB2b2lkIENvbXBvc2l0ZUFuaW1hdGlvbjo6c3VzcGVuZEFuaW1hdGlvbnMoKQogICAgIG1f aXNTdXNwZW5kZWQgPSB0cnVlOwogCiAgICAgaWYgKCFtX2tleWZyYW1lQW5pbWF0aW9ucy5pc0Vt cHR5KCkpIHsKLSAgICAgICAgbV9rZXlmcmFtZUFuaW1hdGlvbnMuY2hlY2tDb25zaXN0ZW5jeSgp OwogICAgICAgICBBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRvciBhbmltYXRpb25zRW5k ID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuZW5kKCk7CiAgICAgICAgIGZvciAoQW5pbWF0aW9uTmFt ZU1hcDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2tleWZyYW1lQW5pbWF0aW9ucy5iZWdpbigpOyBp dCAhPSBhbmltYXRpb25zRW5kOyArK2l0KSB7CiAgICAgICAgICAgICBpZiAoS2V5ZnJhbWVBbmlt YXRpb24qIGFuaW0gPSBpdC0+c2Vjb25kLmdldCgpKQpAQCAtNDE1LDcgKzQwNiw2IEBAIHZvaWQg Q29tcG9zaXRlQW5pbWF0aW9uOjpyZXN1bWVBbmltYXRpb25zKCkKICAgICBtX2lzU3VzcGVuZGVk ID0gZmFsc2U7CiAKICAgICBpZiAoIW1fa2V5ZnJhbWVBbmltYXRpb25zLmlzRW1wdHkoKSkgewot ICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9ucy5jaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgICAg IEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0ZXJhdG9yIGFuaW1hdGlvbnNFbmQgPSBtX2tleWZy YW1lQW5pbWF0aW9ucy5lbmQoKTsKICAgICAgICAgZm9yIChBbmltYXRpb25OYW1lTWFwOjpjb25z dF9pdGVyYXRvciBpdCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGFuaW1h dGlvbnNFbmQ7ICsraXQpIHsKICAgICAgICAgICAgIEtleWZyYW1lQW5pbWF0aW9uKiBhbmltID0g aXQtPnNlY29uZC5nZXQoKTsKQEAgLTQ2MSw3ICs0NTEsNiBAQCB2b2lkIENvbXBvc2l0ZUFuaW1h dGlvbjo6cmVzdW1lT3ZlcnJpZGRlbkltcGxpY2l0QW5pbWF0aW9ucyhpbnQgcHJvcGVydHkpCiBi b29sIENvbXBvc2l0ZUFuaW1hdGlvbjo6aXNBbmltYXRpbmdQcm9wZXJ0eShpbnQgcHJvcGVydHks IGJvb2wgaXNSdW5uaW5nTm93KSBjb25zdAogewogICAgIGlmICghbV9rZXlmcmFtZUFuaW1hdGlv bnMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1fa2V5ZnJhbWVBbmltYXRpb25zLmNoZWNrQ29uc2lz dGVuY3koKTsKICAgICAgICAgQW5pbWF0aW9uTmFtZU1hcDo6Y29uc3RfaXRlcmF0b3IgYW5pbWF0 aW9uc0VuZCA9IG1fa2V5ZnJhbWVBbmltYXRpb25zLmVuZCgpOwogICAgICAgICBmb3IgKEFuaW1h dGlvbk5hbWVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9rZXlmcmFtZUFuaW1hdGlvbnMuYmVn aW4oKTsgaXQgIT0gYW5pbWF0aW9uc0VuZDsgKytpdCkgewogICAgICAgICAgICAgS2V5ZnJhbWVB bmltYXRpb24qIGFuaW0gPSBpdC0+c2Vjb25kLmdldCgpOwpAQCAtNDg2LDggKzQ3NSw2IEBAIGJv b2wgQ29tcG9zaXRlQW5pbWF0aW9uOjpwYXVzZUFuaW1hdGlvbkF0VGltZShjb25zdCBBdG9taWNT dHJpbmcmIG5hbWUsIGRvdWJsZSB0CiAgICAgaWYgKCFuYW1lKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBtX2tleWZyYW1lQW5pbWF0aW9ucy5jaGVja0NvbnNpc3RlbmN5KCk7Ci0KICAg ICBSZWZQdHI8S2V5ZnJhbWVBbmltYXRpb24+IGtleWZyYW1lQW5pbSA9IG1fa2V5ZnJhbWVBbmlt YXRpb25zLmdldChuYW1lLmltcGwoKSk7CiAgICAgaWYgKCFrZXlmcmFtZUFuaW0gfHwgIWtleWZy YW1lQW5pbS0+cnVubmluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01MjMsNyArNTEw LDYgQEAgdW5zaWduZWQgQ29tcG9zaXRlQW5pbWF0aW9uOjpudW1iZXJPZkFjdGl2ZUFuaW1hdGlv bnMoKSBjb25zdAogICAgIHVuc2lnbmVkIGNvdW50ID0gMDsKICAgICAKICAgICBpZiAoIW1fa2V5 ZnJhbWVBbmltYXRpb25zLmlzRW1wdHkoKSkgewotICAgICAgICBtX2tleWZyYW1lQW5pbWF0aW9u cy5jaGVja0NvbnNpc3RlbmN5KCk7CiAgICAgICAgIEFuaW1hdGlvbk5hbWVNYXA6OmNvbnN0X2l0 ZXJhdG9yIGFuaW1hdGlvbnNFbmQgPSBtX2tleWZyYW1lQW5pbWF0aW9ucy5lbmQoKTsKICAgICAg ICAgZm9yIChBbmltYXRpb25OYW1lTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IG1fa2V5ZnJhbWVB bmltYXRpb25zLmJlZ2luKCk7IGl0ICE9IGFuaW1hdGlvbnNFbmQ7ICsraXQpIHsKICAgICAgICAg ICAgIEtleWZyYW1lQW5pbWF0aW9uKiBhbmltID0gaXQtPnNlY29uZC5nZXQoKTsK