80064 2012-03-01 16:09:02 -0800 [chromium] Fix errors in LayerRendererChromium cleanup 2012-03-02 01:13:15 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kbr kbr enne jamesr webkit.review.bot oldest_to_newest 569021 0 kbr 2012-03-01 16:09:02 -0800 LayerRendererChromium's cleanup path doesn't match the declaration order of the OwnPtrs to ProgramBindings in its header, and there are consequently a couple of objects which aren't getting cleaned up properly. This is leading to assertion failures during lost context operations and interfering with the investigation of http://crbug.com/113125 . 569025 1 129766 kbr 2012-03-01 16:11:19 -0800 Created attachment 129766 Patch 569030 2 129766 jamesr 2012-03-01 16:14:18 -0800 Comment on attachment 129766 Patch R=me. This code has gotten smelly :( 569408 3 129766 webkit.review.bot 2012-03-02 01:13:03 -0800 Comment on attachment 129766 Patch Clearing flags on attachment: 129766 Committed r109528: <http://trac.webkit.org/changeset/109528> 569409 4 webkit.review.bot 2012-03-02 01:13:15 -0800 All reviewed patches have been landed. Closing bug. 129766 2012-03-01 16:11:19 -0800 2012-03-02 01:13:03 -0800 Patch bug-80064-20120301161118.patch text/plain 4276 kbr U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5NDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjkzNGIxOWEwNmE1ZWU2 MDlhMGZjZDg2NmEyM2Q4N2ZkODU3MDcwZS4uODRlMWY1ZWUxNTk4OWE1MmM0MjhjZWVjNTFlZDEx ZTk5ZWE2ODgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTAxICBLZW5u ZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBl cnJvcnMgaW4gTGF5ZXJSZW5kZXJlckNocm9taXVtIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwMDY0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdGVkIG1hbnVhbGx5IGJ5IGZvcmNpbmcg bG9zdCBjb250ZXh0IHdoaWxlIHJlbmRlcmluZyBGbGFzaCBvbgorICAgICAgICBNYWMgT1MgaW4g YSBEZWJ1ZyBidWlsZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xh eWVyUmVuZGVyZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlbmRlcmVy Q2hyb21pdW06OmNsZWFudXBTaGFyZWRPYmplY3RzKToKKwogMjAxMi0wMy0wMSAgWGluZ25hbiBX YW5nICA8eGluZ25hbi53YW5nQGludGVsLmNvbT4KIAogICAgICAgICBFbmFibGUgSVBQIGZvciBC aXF1YWQgZmlsdGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5ZXJSZW5kZXJlckNocm9taXVtLmNwcAppbmRleCA3 YTI2ZGIyOGEwY2U3MzQzZDVlNDQ1OWU4YzdmNzFkYzc1OTg3N2Y0Li4wYzY3MWEyYTNlNjMyMDE3 ZmM1ZWNlOGVkMjgwOTVjZGFlNGZhOTY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVyZXJDaHJv bWl1bS5jcHAKQEAgLTE0ODMsMTIgKzE0ODMsMTIgQEAgdm9pZCBMYXllclJlbmRlcmVyQ2hyb21p dW06OmNsZWFudXBTaGFyZWRPYmplY3RzKCkKICAgICAgICAgbV90aWxlclByb2dyYW0tPmNsZWFu dXAobV9jb250ZXh0LmdldCgpKTsKICAgICBpZiAobV90aWxlclByb2dyYW1PcGFxdWUpCiAgICAg ICAgIG1fdGlsZXJQcm9ncmFtT3BhcXVlLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7Ci0gICAg aWYgKG1fdGlsZXJQcm9ncmFtQUEpCi0gICAgICAgIG1fdGlsZXJQcm9ncmFtQUEtPmNsZWFudXAo bV9jb250ZXh0LmdldCgpKTsKICAgICBpZiAobV90aWxlclByb2dyYW1Td2l6emxlKQogICAgICAg ICBtX3RpbGVyUHJvZ3JhbVN3aXp6bGUtPmNsZWFudXAobV9jb250ZXh0LmdldCgpKTsKICAgICBp ZiAobV90aWxlclByb2dyYW1Td2l6emxlT3BhcXVlKQogICAgICAgICBtX3RpbGVyUHJvZ3JhbVN3 aXp6bGVPcGFxdWUtPmNsZWFudXAobV9jb250ZXh0LmdldCgpKTsKKyAgICBpZiAobV90aWxlclBy b2dyYW1BQSkKKyAgICAgICAgbV90aWxlclByb2dyYW1BQS0+Y2xlYW51cChtX2NvbnRleHQuZ2V0 KCkpOwogICAgIGlmIChtX3RpbGVyUHJvZ3JhbVN3aXp6bGVBQSkKICAgICAgICAgbV90aWxlclBy b2dyYW1Td2l6emxlQUEtPmNsZWFudXAobV9jb250ZXh0LmdldCgpKTsKICAgICBpZiAobV9jYW52 YXNMYXllclByb2dyYW0pCkBAIC0xNDk3LDE4ICsxNDk3LDI0IEBAIHZvaWQgTGF5ZXJSZW5kZXJl ckNocm9taXVtOjpjbGVhbnVwU2hhcmVkT2JqZWN0cygpCiAgICAgICAgIG1fcGx1Z2luTGF5ZXJQ cm9ncmFtLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7CiAgICAgaWYgKG1fcGx1Z2luTGF5ZXJQ cm9ncmFtRmxpcCkKICAgICAgICAgbV9wbHVnaW5MYXllclByb2dyYW1GbGlwLT5jbGVhbnVwKG1f Y29udGV4dC5nZXQoKSk7CisgICAgaWYgKG1fcGx1Z2luTGF5ZXJUZXhSZWN0UHJvZ3JhbSkKKyAg ICAgICAgbV9wbHVnaW5MYXllclRleFJlY3RQcm9ncmFtLT5jbGVhbnVwKG1fY29udGV4dC5nZXQo KSk7CisgICAgaWYgKG1fcGx1Z2luTGF5ZXJUZXhSZWN0UHJvZ3JhbUZsaXApCisgICAgICAgIG1f cGx1Z2luTGF5ZXJUZXhSZWN0UHJvZ3JhbUZsaXAtPmNsZWFudXAobV9jb250ZXh0LmdldCgpKTsK ICAgICBpZiAobV9yZW5kZXJTdXJmYWNlTWFza1Byb2dyYW0pCiAgICAgICAgIG1fcmVuZGVyU3Vy ZmFjZU1hc2tQcm9ncmFtLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7Ci0gICAgaWYgKG1fcmVu ZGVyU3VyZmFjZU1hc2tQcm9ncmFtQUEpCi0gICAgICAgIG1fcmVuZGVyU3VyZmFjZU1hc2tQcm9n cmFtQUEtPmNsZWFudXAobV9jb250ZXh0LmdldCgpKTsKICAgICBpZiAobV9yZW5kZXJTdXJmYWNl UHJvZ3JhbSkKICAgICAgICAgbV9yZW5kZXJTdXJmYWNlUHJvZ3JhbS0+Y2xlYW51cChtX2NvbnRl eHQuZ2V0KCkpOworICAgIGlmIChtX3JlbmRlclN1cmZhY2VNYXNrUHJvZ3JhbUFBKQorICAgICAg ICBtX3JlbmRlclN1cmZhY2VNYXNrUHJvZ3JhbUFBLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7 CiAgICAgaWYgKG1fcmVuZGVyU3VyZmFjZVByb2dyYW1BQSkKICAgICAgICAgbV9yZW5kZXJTdXJm YWNlUHJvZ3JhbUFBLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7CiAgICAgaWYgKG1fdmlkZW9M YXllclJHQkFQcm9ncmFtKQogICAgICAgICBtX3ZpZGVvTGF5ZXJSR0JBUHJvZ3JhbS0+Y2xlYW51 cChtX2NvbnRleHQuZ2V0KCkpOwogICAgIGlmIChtX3ZpZGVvTGF5ZXJZVVZQcm9ncmFtKQogICAg ICAgICBtX3ZpZGVvTGF5ZXJZVVZQcm9ncmFtLT5jbGVhbnVwKG1fY29udGV4dC5nZXQoKSk7Cisg ICAgaWYgKG1fdmlkZW9MYXllck5hdGl2ZVRleHR1cmVQcm9ncmFtKQorICAgICAgICBtX3ZpZGVv TGF5ZXJOYXRpdmVUZXh0dXJlUHJvZ3JhbS0+Y2xlYW51cChtX2NvbnRleHQuZ2V0KCkpOwogICAg IGlmIChtX3N0cmVhbVRleHR1cmVMYXllclByb2dyYW0pCiAgICAgICAgIG1fc3RyZWFtVGV4dHVy ZUxheWVyUHJvZ3JhbS0+Y2xlYW51cChtX2NvbnRleHQuZ2V0KCkpOwogCkBAIC0xNTE2LDE5ICsx NTIyLDIyIEBAIHZvaWQgTGF5ZXJSZW5kZXJlckNocm9taXVtOjpjbGVhbnVwU2hhcmVkT2JqZWN0 cygpCiAgICAgbV9oZWFkc1VwRGlzcGxheVByb2dyYW0uY2xlYXIoKTsKICAgICBtX3RpbGVyUHJv Z3JhbS5jbGVhcigpOwogICAgIG1fdGlsZXJQcm9ncmFtT3BhcXVlLmNsZWFyKCk7Ci0gICAgbV90 aWxlclByb2dyYW1BQS5jbGVhcigpOwogICAgIG1fdGlsZXJQcm9ncmFtU3dpenpsZS5jbGVhcigp OwogICAgIG1fdGlsZXJQcm9ncmFtU3dpenpsZU9wYXF1ZS5jbGVhcigpOworICAgIG1fdGlsZXJQ cm9ncmFtQUEuY2xlYXIoKTsKICAgICBtX3RpbGVyUHJvZ3JhbVN3aXp6bGVBQS5jbGVhcigpOwog ICAgIG1fY2FudmFzTGF5ZXJQcm9ncmFtLmNsZWFyKCk7CiAgICAgbV9wbHVnaW5MYXllclByb2dy YW0uY2xlYXIoKTsKICAgICBtX3BsdWdpbkxheWVyUHJvZ3JhbUZsaXAuY2xlYXIoKTsKKyAgICBt X3BsdWdpbkxheWVyVGV4UmVjdFByb2dyYW0uY2xlYXIoKTsKKyAgICBtX3BsdWdpbkxheWVyVGV4 UmVjdFByb2dyYW1GbGlwLmNsZWFyKCk7CiAgICAgbV9yZW5kZXJTdXJmYWNlTWFza1Byb2dyYW0u Y2xlYXIoKTsKLSAgICBtX3JlbmRlclN1cmZhY2VNYXNrUHJvZ3JhbUFBLmNsZWFyKCk7CiAgICAg bV9yZW5kZXJTdXJmYWNlUHJvZ3JhbS5jbGVhcigpOworICAgIG1fcmVuZGVyU3VyZmFjZU1hc2tQ cm9ncmFtQUEuY2xlYXIoKTsKICAgICBtX3JlbmRlclN1cmZhY2VQcm9ncmFtQUEuY2xlYXIoKTsK ICAgICBtX3ZpZGVvTGF5ZXJSR0JBUHJvZ3JhbS5jbGVhcigpOwogICAgIG1fdmlkZW9MYXllcllV VlByb2dyYW0uY2xlYXIoKTsKKyAgICBtX3ZpZGVvTGF5ZXJOYXRpdmVUZXh0dXJlUHJvZ3JhbS5j bGVhcigpOwogICAgIG1fc3RyZWFtVGV4dHVyZUxheWVyUHJvZ3JhbS5jbGVhcigpOwogICAgIGlm IChtX29mZnNjcmVlbkZyYW1lYnVmZmVySWQpCiAgICAgICAgIEdMQyhtX2NvbnRleHQuZ2V0KCks IG1fY29udGV4dC0+ZGVsZXRlRnJhbWVidWZmZXIobV9vZmZzY3JlZW5GcmFtZWJ1ZmZlcklkKSk7 Cg==