87134 2012-05-22 08:15:12 -0700 [chromium] Move asserts in CCLayerTreeHostTest::dispatch* 2012-05-22 09:46:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vollick vollick enne webkit.review.bot oldest_to_newest 630380 0 vollick 2012-05-22 08:15:12 -0700 In the fix for 74623, code was rearranged to bail early from CCLayerTreeHostTest::dispatch* when necessary, but the asserts in these functions were not moved. They should have been. 630383 1 143304 vollick 2012-05-22 08:17:04 -0700 Created attachment 143304 Patch 630409 2 143304 enne 2012-05-22 08:50:07 -0700 Comment on attachment 143304 Patch Sure. R=me. 630458 3 143304 webkit.review.bot 2012-05-22 09:46:51 -0700 Comment on attachment 143304 Patch Clearing flags on attachment: 143304 Committed r117989: <http://trac.webkit.org/changeset/117989> 630459 4 webkit.review.bot 2012-05-22 09:46:55 -0700 All reviewed patches have been landed. Closing bug. 143304 2012-05-22 08:17:04 -0700 2012-05-22 09:46:51 -0700 Patch bug-87134-20120522111703.patch text/plain 5609 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDc1MTFiMDQxZTIzZTIxYjU0M2ZhMTQ3MzI4Y2I0Y2QxMmM4ZDA4NTEuLjJhYjg1ZjkyNTNlMGQ0 MDRjZjY3ZGEwNWQ5ZTM1OGNiNzVjZDA4NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjMgQEAKIDIwMTItMDUtMjIgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1 bS5vcmc+CiAKKyAgICAgICAgW2Nocm9taXVtXSBNb3ZlIGFzc2VydHMgaW4gQ0NMYXllclRyZWVI b3N0VGVzdDo6ZGlzcGF0Y2gqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NzEzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHA6CisgICAgICAgIChXVEY6 OkNDTGF5ZXJUcmVlSG9zdFRlc3Q6OmRpc3BhdGNoU2V0TmVlZHNBbmltYXRlKToKKyAgICAgICAg KFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdDo6ZGlzcGF0Y2hBZGRJbnN0YW50QW5pbWF0aW9uKToK KyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVIb3N0VGVzdDo6ZGlzcGF0Y2hBZGRBbmltYXRpb24p OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0OjpkaXNwYXRjaFNldE5lZWRzQW5p bWF0ZUFuZENvbW1pdCk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVlSG9zdFRlc3Q6OmRpc3Bh dGNoU2V0TmVlZHNDb21taXQpOgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0Ojpk aXNwYXRjaEFjcXVpcmVMYXllclRleHR1cmVzKToKKyAgICAgICAgKFdURjo6Q0NMYXllclRyZWVI b3N0VGVzdDo6ZGlzcGF0Y2hTZXROZWVkc1JlZHJhdyk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3Q6OmRpc3BhdGNoU2V0VmlzaWJsZSk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJU cmVlSG9zdFRlc3Q6OmRpc3BhdGNoU2V0SW52aXNpYmxlKToKKworMjAxMi0wNS0yMiAgSWFuIFZv bGxpY2sgIDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIFNwZWVk IHVwIENDTGF5ZXJUcmVlSG9zdFRlc3RUaWNrQW5pbWF0aW9uV2hpbGVCYWNrZ3JvdW5kZWQKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2ODcxCiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVz dC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3Qu Y3BwCmluZGV4IDRkMzA4YTk4YWEzZTU1NzJlNWVmYmU2ZjkwZTdhNzQ3NTkyM2UzYzMuLjlmNThk ODBhNGVmMmU0NDdiOWQ2OTgyZGQ2ZmFiNWE1YzYyYmI1ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcApAQCAtMzk5LDQ4 ICszOTksNTIgQEAgcHJvdGVjdGVkOgogCiAgICAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTZXROZWVk c0FuaW1hdGUodm9pZCogc2VsZikKICAgICB7CisgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CisKICAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVzdCogdGVzdCA9IHN0YXRpY19jYXN0PEND TGF5ZXJUcmVlSG9zdFRlc3QqPihzZWxmKTsKKyAgICAgICAgQVNTRVJUKHRlc3QpOwogICAgICAg ICBpZiAodGVzdC0+bV9maW5pc2hlZCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgICAgICBBU1NFUlQodGVzdCk7CiAgICAgICAgIGlm ICh0ZXN0LT5tX2xheWVyVHJlZUhvc3QpCiAgICAgICAgICAgICB0ZXN0LT5tX2xheWVyVHJlZUhv c3QtPnNldE5lZWRzQW5pbWF0ZSgpOwogICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNo QWRkSW5zdGFudEFuaW1hdGlvbih2b2lkKiBzZWxmKQogICAgIHsKKyAgICAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKKwogICAgICAgICBDQ0xheWVyVHJlZUhvc3RUZXN0KiB0ZXN0ID0gc3Rh dGljX2Nhc3Q8Q0NMYXllclRyZWVIb3N0VGVzdCo+KHNlbGYpOworICAgICAgICBBU1NFUlQodGVz dCk7CiAgICAgICAgIGlmICh0ZXN0LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VSVCh0ZXN0KTsK ICAgICAgICAgaWYgKHRlc3QtPm1fbGF5ZXJUcmVlSG9zdCAmJiB0ZXN0LT5tX2xheWVyVHJlZUhv c3QtPnJvb3RMYXllcigpKQogICAgICAgICAgICAgYWRkT3BhY2l0eVRyYW5zaXRpb25Ub0xheWVy KCp0ZXN0LT5tX2xheWVyVHJlZUhvc3QtPnJvb3RMYXllcigpLCAwLCAwLCAwLjUsIGZhbHNlKTsK ICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCBkaXNwYXRjaEFkZEFuaW1hdGlvbih2b2lkKiBzZWxm KQogICAgIHsKKyAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKwogICAgICAgICBDQ0xh eWVyVHJlZUhvc3RUZXN0KiB0ZXN0ID0gc3RhdGljX2Nhc3Q8Q0NMYXllclRyZWVIb3N0VGVzdCo+ KHNlbGYpOworICAgICAgICBBU1NFUlQodGVzdCk7CiAgICAgICAgIGlmICh0ZXN0LT5tX2Zpbmlz aGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7Ci0gICAgICAgIEFTU0VSVCh0ZXN0KTsKICAgICAgICAgaWYgKHRlc3QtPm1fbGF5ZXJUcmVl SG9zdCAmJiB0ZXN0LT5tX2xheWVyVHJlZUhvc3QtPnJvb3RMYXllcigpKQogICAgICAgICAgICAg YWRkT3BhY2l0eVRyYW5zaXRpb25Ub0xheWVyKCp0ZXN0LT5tX2xheWVyVHJlZUhvc3QtPnJvb3RM YXllcigpLCAxMCwgMCwgMC41LCB0cnVlKTsKICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCBkaXNw YXRjaFNldE5lZWRzQW5pbWF0ZUFuZENvbW1pdCh2b2lkKiBzZWxmKQogICAgIHsKKyAgICAgICAg QVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKwogICAgICAgICBDQ0xheWVyVHJlZUhvc3RUZXN0KiB0 ZXN0ID0gc3RhdGljX2Nhc3Q8Q0NMYXllclRyZWVIb3N0VGVzdCo+KHNlbGYpOworICAgICAgICBB U1NFUlQodGVzdCk7CiAgICAgICAgIGlmICh0ZXN0LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VS VCh0ZXN0KTsKICAgICAgICAgaWYgKHRlc3QtPm1fbGF5ZXJUcmVlSG9zdCkgewogICAgICAgICAg ICAgdGVzdC0+bV9sYXllclRyZWVIb3N0LT5zZXROZWVkc0FuaW1hdGUoKTsKICAgICAgICAgICAg IHRlc3QtPm1fbGF5ZXJUcmVlSG9zdC0+c2V0TmVlZHNDb21taXQoKTsKQEAgLTQ0OSw2MCArNDUz LDY1IEBAIHByb3RlY3RlZDoKIAogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2V0TmVlZHNDb21t aXQodm9pZCogc2VsZikKICAgICB7CisgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisK ICAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVzdCogdGVzdCA9IHN0YXRpY19jYXN0PENDTGF5ZXJU cmVlSG9zdFRlc3QqPihzZWxmKTsKKyAgICAgICAgQVNTRVJUX1RSVUUodGVzdCk7CiAgICAgICAg IGlmICh0ZXN0LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VSVF9UUlVFKHRlc3QpOwogICAgICAg ICBpZiAodGVzdC0+bV9sYXllclRyZWVIb3N0KQogICAgICAgICAgICAgdGVzdC0+bV9sYXllclRy ZWVIb3N0LT5zZXROZWVkc0NvbW1pdCgpOwogICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIGRpc3Bh dGNoQWNxdWlyZUxheWVyVGV4dHVyZXModm9pZCogc2VsZikKICAgICB7CisgICAgICAgIEFTU0VS VChpc01haW5UaHJlYWQoKSk7CisKICAgICAgICAgQ0NMYXllclRyZWVIb3N0VGVzdCogdGVzdCA9 IHN0YXRpY19jYXN0PENDTGF5ZXJUcmVlSG9zdFRlc3QqPihzZWxmKTsKKyAgICAgICAgQVNTRVJU X1RSVUUodGVzdCk7CiAgICAgICAgIGlmICh0ZXN0LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAg cmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VS VF9UUlVFKHRlc3QpOwogICAgICAgICBpZiAodGVzdC0+bV9sYXllclRyZWVIb3N0KQogICAgICAg ICAgICAgdGVzdC0+bV9sYXllclRyZWVIb3N0LT5hY3F1aXJlTGF5ZXJUZXh0dXJlcygpOwogICAg IH0KIAogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2V0TmVlZHNSZWRyYXcodm9pZCogc2VsZikK ICAgICB7CisgICAgICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisKICAgICAgICAgQ0NMYXll clRyZWVIb3N0VGVzdCogdGVzdCA9IHN0YXRpY19jYXN0PENDTGF5ZXJUcmVlSG9zdFRlc3QqPihz ZWxmKTsKKyAgICAgICAgQVNTRVJUX1RSVUUodGVzdCk7CiAgICAgICAgIGlmICh0ZXN0LT5tX2Zp bmlzaGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChpc01haW5UaHJl YWQoKSk7Ci0gICAgICAgIEFTU0VSVF9UUlVFKHRlc3QpOwogICAgICAgICBpZiAodGVzdC0+bV9s YXllclRyZWVIb3N0KQogICAgICAgICAgICAgdGVzdC0+bV9sYXllclRyZWVIb3N0LT5zZXROZWVk c1JlZHJhdygpOwogICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIGRpc3BhdGNoU2V0VmlzaWJsZSh2 b2lkKiBzZWxmKQogICAgIHsKKyAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKwogICAg ICAgICBDQ0xheWVyVHJlZUhvc3RUZXN0KiB0ZXN0ID0gc3RhdGljX2Nhc3Q8Q0NMYXllclRyZWVI b3N0VGVzdCo+KHNlbGYpOworICAgICAgICBBU1NFUlQodGVzdCk7CiAgICAgICAgIGlmICh0ZXN0 LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChpc01h aW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VSVCh0ZXN0KTsKICAgICAgICAgaWYgKHRlc3QtPm1f bGF5ZXJUcmVlSG9zdCkKICAgICAgICAgICAgIHRlc3QtPm1fbGF5ZXJUcmVlSG9zdC0+c2V0Vmlz aWJsZSh0cnVlKTsKICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCBkaXNwYXRjaFNldEludmlzaWJs ZSh2b2lkKiBzZWxmKQogICAgIHsKKyAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKKwog ICAgICAgICBDQ0xheWVyVHJlZUhvc3RUZXN0KiB0ZXN0ID0gc3RhdGljX2Nhc3Q8Q0NMYXllclRy ZWVIb3N0VGVzdCo+KHNlbGYpOworICAgICAgICBBU1NFUlQodGVzdCk7CiAgICAgICAgIGlmICh0 ZXN0LT5tX2ZpbmlzaGVkKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7Ci0gICAgICAgIEFTU0VSVCh0ZXN0KTsKICAgICAgICAgaWYgKHRlc3Qt Pm1fbGF5ZXJUcmVlSG9zdCkKICAgICAgICAgICAgIHRlc3QtPm1fbGF5ZXJUcmVlSG9zdC0+c2V0 VmlzaWJsZShmYWxzZSk7CiAgICAgfQo=