49486 2010-11-12 19:18:54 -0800 [chromium] Remove assumption that GL functions are function pointers 2010-11-15 13:04:55 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kbr kbr dglazkov enne jamesr senorblanco zmo oldest_to_newest 308907 0 kbr 2010-11-12 19:18:54 -0800 Currently in Chromium's in-process WebGL implementation there is an assumption that the GL entry points are function pointers. This is not a good assumption; the appropriate extension queries should be made instead. 308908 1 73805 kbr 2010-11-12 19:23:26 -0800 Created attachment 73805 Patch 309360 2 73805 jamesr 2010-11-15 11:04:40 -0800 Comment on attachment 73805 Patch R=me 309401 3 kbr 2010-11-15 13:04:55 -0800 Committed r72025: <http://trac.webkit.org/changeset/72025> 73805 2010-11-12 19:23:26 -0800 2010-11-15 11:04:39 -0800 Patch bug-49486-20101112192325.patch text/plain 7319 kbr SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNzE5NjApCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMTEtMTIgIEtlbm5l dGggUnVzc2VsbCAgPGtickBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIGFzc3VtcHRpb24gdGhhdCBH TCBmdW5jdGlvbnMgYXJlIGZ1bmN0aW9uIHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTQ4NgorCisgICAgICAgIEFkZGVkIGFwcHJvcHJp YXRlIGV4dGVuc2lvbiBxdWVyaWVzIGFuZCBubyBsb25nZXIgYXNzdW1lIHRoYXQgR0wKKyAgICAg ICAgZnVuY3Rpb24gbmFtZXMgYXJlIGZ1bmN0aW9uIHBvaW50ZXJzIHdoaWNoIGNhbiBiZSB0ZXN0 ZWQuCisKKyAgICAgICAgKiBzcmMvV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGw6OldlYkdy YXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwpOgorICAgICAgICAoV2ViS2l0OjpXZWJHcmFwaGlj c0NvbnRleHQzRERlZmF1bHRJbXBsOjppbml0aWFsaXplKToKKyAgICAgICAgKFdlYktpdDo6V2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6dmFsaWRhdGVBdHRyaWJ1dGVzKToKKyAgICAg ICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6cmVzb2x2ZU11bHRp c2FtcGxlZEZyYW1lYnVmZmVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViR3JhcGhpY3NDb250ZXh0 M0REZWZhdWx0SW1wbDo6cmVzaGFwZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkdyYXBoaWNzQ29u dGV4dDNERGVmYXVsdEltcGw6OmdlbmVyYXRlTWlwbWFwKToKKyAgICAgICAgKFdlYktpdDo6V2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6Z2V0U3RyaW5nKToKKyAgICAgICAgKiBzcmMv V2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5oOgorCiAyMDEwLTExLTEyICBKYW1lcyBT aW1vbnNlbiAgPHNpbW9uamFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBGaXNoZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4 dDNERGVmYXVsdEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2Vi R3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbC5jcHAJKHJldmlzaW9uIDcxOTYwKQorKysgV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNzEsNiArNzEsOSBAQCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJ bXBsOjpXZWJHcmFwCiAgICAgOiBtX2luaXRpYWxpemVkKGZhbHNlKQogICAgICwgbV9yZW5kZXJE aXJlY3RseVRvV2ViVmlldyhmYWxzZSkKICAgICAsIG1faXNHTEVTMihmYWxzZSkKKyAgICAsIG1f aGF2ZUVYVEZyYW1lYnVmZmVyT2JqZWN0KGZhbHNlKQorICAgICwgbV9oYXZlRVhURnJhbWVidWZm ZXJNdWx0aXNhbXBsZShmYWxzZSkKKyAgICAsIG1faGF2ZUFOR0xFRnJhbWVidWZmZXJNdWx0aXNh bXBsZShmYWxzZSkKICAgICAsIG1fdGV4dHVyZSgwKQogICAgICwgbV9mYm8oMCkKICAgICAsIG1f ZGVwdGhTdGVuY2lsQnVmZmVyKDApCkBAIC0xNjgsOSArMTcxLDEzIEBAIGJvb2wgV2ViR3JhcGhp Y3NDb250ZXh0M0REZWZhdWx0SW1wbDo6aW4KICAgICBpZiAocmVuZGVyRGlyZWN0bHlUb1dlYlZp ZXcpCiAgICAgICAgIG1fYXR0cmlidXRlcy5hbnRpYWxpYXMgPSBmYWxzZTsKIAotICAgIHZhbGlk YXRlQXR0cmlidXRlcygpOwotCiAgICAgbV9pc0dMRVMyID0gZ2Z4OjpHZXRHTEltcGxlbWVudGF0 aW9uKCkgPT0gZ2Z4OjprR0xJbXBsZW1lbnRhdGlvbkVHTEdMRVMyOworICAgIGNvbnN0IGNoYXIq IGV4dGVuc2lvbnMgPSByZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihnbEdldFN0cmluZyhH TF9FWFRFTlNJT05TKSk7CisgICAgbV9oYXZlRVhURnJhbWVidWZmZXJPYmplY3QgPSBzdHJzdHIo ZXh0ZW5zaW9ucywgIkdMX0VYVF9mcmFtZWJ1ZmZlcl9vYmplY3QiKTsKKyAgICBtX2hhdmVFWFRG cmFtZWJ1ZmZlck11bHRpc2FtcGxlID0gc3Ryc3RyKGV4dGVuc2lvbnMsICJHTF9FWFRfZnJhbWVi dWZmZXJfbXVsdGlzYW1wbGUiKTsKKyAgICBtX2hhdmVBTkdMRUZyYW1lYnVmZmVyTXVsdGlzYW1w bGUgPSBzdHJzdHIoZXh0ZW5zaW9ucywgIkdMX0FOR0xFX2ZyYW1lYnVmZmVyX211bHRpc2FtcGxl Iik7CisKKyAgICB2YWxpZGF0ZUF0dHJpYnV0ZXMoKTsKIAogICAgIGlmICghbV9pc0dMRVMyKSB7 CiAgICAgICAgIGdsRW5hYmxlKEdMX1ZFUlRFWF9QUk9HUkFNX1BPSU5UX1NJWkUpOwpAQCAtMjA5 LDkgKzIxNiw4IEBAIHZvaWQgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wbDo6dmEKICAg ICAgICAgICAgIGlzVmFsaWRWZW5kb3IgPSBmYWxzZTsKICNlbmRpZgogICAgICAgICBpZiAoIShp c1ZhbGlkVmVuZG9yCi0gICAgICAgICAgICAgICYmIChzdHJzdHIoZXh0ZW5zaW9ucywgIkdMX0VY VF9mcmFtZWJ1ZmZlcl9tdWx0aXNhbXBsZSIpCi0gICAgICAgICAgICAgICAgICB8fCAoc3Ryc3Ry KGV4dGVuc2lvbnMsICJHTF9BTkdMRV9mcmFtZWJ1ZmZlcl9tdWx0aXNhbXBsZSIpCi0gICAgICAg ICAgICAgICAgICAgICAgJiYgc3Ryc3RyKGV4dGVuc2lvbnMsICJHTF9PRVNfcmdiOF9yZ2JhOCIp KSkpKQorICAgICAgICAgICAgICAmJiAobV9oYXZlRVhURnJhbWVidWZmZXJNdWx0aXNhbXBsZQor ICAgICAgICAgICAgICAgICAgfHwgKG1faGF2ZUFOR0xFRnJhbWVidWZmZXJNdWx0aXNhbXBsZSAm JiBzdHJzdHIoZXh0ZW5zaW9ucywgIkdMX09FU19yZ2I4X3JnYmE4IikpKSkpCiAgICAgICAgICAg ICBtX2F0dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7CiAKICAgICAgICAgLy8gRG9uJ3QgYW50 aWFsaWFzIHdoZW4gdXNpbmcgTWVzYSB0byBlbnN1cmUgbW9yZSByZWxpYWJsZSB0ZXN0aW5nIGFu ZApAQCAtMjMwLDEwICsyMzYsMTAgQEAgdm9pZCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJ bXBsOjpyZQogICAgIGlmIChtX2F0dHJpYnV0ZXMuYW50aWFsaWFzKSB7CiAgICAgICAgIGdsQmlu ZEZyYW1lYnVmZmVyRVhUKEdMX1JFQURfRlJBTUVCVUZGRVJfRVhULCBtX211bHRpc2FtcGxlRkJP KTsKICAgICAgICAgZ2xCaW5kRnJhbWVidWZmZXJFWFQoR0xfRFJBV19GUkFNRUJVRkZFUl9FWFQs IG1fZmJvKTsKLSAgICAgICAgaWYgKGdsQmxpdEZyYW1lYnVmZmVyRVhUKQorICAgICAgICBpZiAo bV9oYXZlRVhURnJhbWVidWZmZXJNdWx0aXNhbXBsZSkKICAgICAgICAgICAgIGdsQmxpdEZyYW1l YnVmZmVyRVhUKHgsIHksIHggKyB3aWR0aCwgeSArIGhlaWdodCwgeCwgeSwgeCArIHdpZHRoLCB5 ICsgaGVpZ2h0LCBHTF9DT0xPUl9CVUZGRVJfQklULCBHTF9ORUFSRVNUKTsKICAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICBBU1NFUlQoZ2xCbGl0RnJhbWVidWZmZXJBTkdMRSk7CisgICAgICAg ICAgICBBU1NFUlQobV9oYXZlQU5HTEVGcmFtZWJ1ZmZlck11bHRpc2FtcGxlKTsKICAgICAgICAg ICAgIGdsQmxpdEZyYW1lYnVmZmVyQU5HTEUoeCwgeSwgeCArIHdpZHRoLCB5ICsgaGVpZ2h0LCB4 LCB5LCB4ICsgd2lkdGgsIHkgKyBoZWlnaHQsIEdMX0NPTE9SX0JVRkZFUl9CSVQsIEdMX05FQVJF U1QpOwogICAgICAgICB9CiAgICAgICAgIGdsQmluZEZyYW1lYnVmZmVyRVhUKEdMX0ZSQU1FQlVG RkVSX0VYVCwgbV9ib3VuZEZCTyk7CkBAIC0zODAsMTkgKzM4NiwxOSBAQCB2b2lkIFdlYkdyYXBo aWNzQ29udGV4dDNERGVmYXVsdEltcGw6OnJlCiAgICAgICAgICAgICBnbEJpbmRGcmFtZWJ1ZmZl ckVYVChHTF9GUkFNRUJVRkZFUl9FWFQsIG1fbXVsdGlzYW1wbGVGQk8pOwogICAgICAgICB9CiAg ICAgICAgIGdsQmluZFJlbmRlcmJ1ZmZlckVYVChHTF9SRU5ERVJCVUZGRVJfRVhULCBtX211bHRp c2FtcGxlQ29sb3JCdWZmZXIpOwotICAgICAgICBpZiAoZ2xSZW5kZXJidWZmZXJTdG9yYWdlTXVs dGlzYW1wbGVFWFQpCisgICAgICAgIGlmIChtX2hhdmVFWFRGcmFtZWJ1ZmZlck11bHRpc2FtcGxl KQogICAgICAgICAgICAgZ2xSZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGVFWFQoR0xfUkVO REVSQlVGRkVSX0VYVCwgc2FtcGxlQ291bnQsIGludGVybmFsTXVsdGlzYW1wbGVkQ29sb3JGb3Jt YXQsIHdpZHRoLCBoZWlnaHQpOwogICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIEFTU0VSVChn bFJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZUFOR0xFKTsKKyAgICAgICAgICAgIEFTU0VS VChtX2hhdmVBTkdMRUZyYW1lYnVmZmVyTXVsdGlzYW1wbGUpOwogICAgICAgICAgICAgZ2xSZW5k ZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGVBTkdMRShHTF9SRU5ERVJCVUZGRVJfRVhULCBzYW1w bGVDb3VudCwgaW50ZXJuYWxNdWx0aXNhbXBsZWRDb2xvckZvcm1hdCwgd2lkdGgsIGhlaWdodCk7 CiAgICAgICAgIH0KICAgICAgICAgZ2xGcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlckVYVChHTF9GUkFN RUJVRkZFUl9FWFQsIEdMX0NPTE9SX0FUVEFDSE1FTlQwX0VYVCwgR0xfUkVOREVSQlVGRkVSX0VY VCwgbV9tdWx0aXNhbXBsZUNvbG9yQnVmZmVyKTsKICAgICAgICAgaWYgKG1fYXR0cmlidXRlcy5z dGVuY2lsIHx8IG1fYXR0cmlidXRlcy5kZXB0aCkgewogICAgICAgICAgICAgZ2xCaW5kUmVuZGVy YnVmZmVyRVhUKEdMX1JFTkRFUkJVRkZFUl9FWFQsIG1fbXVsdGlzYW1wbGVEZXB0aFN0ZW5jaWxC dWZmZXIpOwotICAgICAgICAgICAgaWYgKGdsUmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxl RVhUKQorICAgICAgICAgICAgaWYgKG1faGF2ZUVYVEZyYW1lYnVmZmVyTXVsdGlzYW1wbGUpCiAg ICAgICAgICAgICAgICAgZ2xSZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGVFWFQoR0xfUkVO REVSQlVGRkVSX0VYVCwgc2FtcGxlQ291bnQsIGludGVybmFsRGVwdGhTdGVuY2lsRm9ybWF0LCB3 aWR0aCwgaGVpZ2h0KTsKICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAgICAgICAgIEFTU0VS VChnbFJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZUFOR0xFKTsKKyAgICAgICAgICAgICAg ICBBU1NFUlQobV9oYXZlQU5HTEVGcmFtZWJ1ZmZlck11bHRpc2FtcGxlKTsKICAgICAgICAgICAg ICAgICBnbFJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZUFOR0xFKEdMX1JFTkRFUkJVRkZF Ul9FWFQsIHNhbXBsZUNvdW50LCBpbnRlcm5hbERlcHRoU3RlbmNpbEZvcm1hdCwgd2lkdGgsIGhl aWdodCk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobV9hdHRyaWJ1dGVzLnN0ZW5j aWwpCkBAIC04ODQsNyArODkwLDcgQEAgREVMRUdBVEVfVE9fR0xfMShmcm9udEZhY2UsIEZyb250 RmFjZSwgdQogdm9pZCBXZWJHcmFwaGljc0NvbnRleHQzRERlZmF1bHRJbXBsOjpnZW5lcmF0ZU1p cG1hcCh1bnNpZ25lZCBsb25nIHRhcmdldCkKIHsKICAgICBtYWtlQ29udGV4dEN1cnJlbnQoKTsK LSAgICBpZiAoZ2xHZW5lcmF0ZU1pcG1hcEVYVCkKKyAgICBpZiAobV9pc0dMRVMyIHx8IG1faGF2 ZUVYVEZyYW1lYnVmZmVyT2JqZWN0KQogICAgICAgICBnbEdlbmVyYXRlTWlwbWFwRVhUKHRhcmdl dCk7CiAgICAgLy8gRklYTUU6IHByb3ZpZGUgYWx0ZXJuYXRpdmUgY29kZSBwYXRoPyBUaGlzIHdp bGwgYmUgdW5wbGVhc2FudAogICAgIC8vIHRvIGltcGxlbWVudCBpZiBnbEdlbmVyYXRlTWlwbWFw RVhUIGlzIG5vdCBhdmFpbGFibGUgLS0gaXQgd2lsbApAQCAtMTEzOSwxMCArMTE0NSwxMCBAQCBX ZWJTdHJpbmcgV2ViR3JhcGhpY3NDb250ZXh0M0REZWZhdWx0SW1wCiAgICAgU3RyaW5nQnVpbGRl ciByZXN1bHQ7CiAgICAgcmVzdWx0LmFwcGVuZChyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIq PihnbEdldFN0cmluZyhuYW1lKSkpOwogICAgIGlmIChuYW1lID09IEdMX0VYVEVOU0lPTlMpIHsK LSAgICAgICAgLy8gR0xfQ0hST01JVU1fY29weV90ZXh0dXJlX3RvX3BhcmVudF90ZXh0dXJlIHJl cXVpcmVzIHRoaXMKLSAgICAgICAgLy8gZGVza3RvcEdMLW9ubHkgZnVuY3Rpb24gKEdMRVMyIGRv ZXNuJ3Qgc3VwcG9ydCBpdCksIHNvCi0gICAgICAgIC8vIGNoZWNrIGZvciBpdHMgZXhpc3RlbmNl IGhlcmUuCi0gICAgICAgIGlmIChnbEdldFRleExldmVsUGFyYW1ldGVyaXYpCisgICAgICAgIC8v IEdMX0NIUk9NSVVNX2NvcHlfdGV4dHVyZV90b19wYXJlbnRfdGV4dHVyZSByZXF1aXJlcyB0aGUK KyAgICAgICAgLy8gZGVza3RvcEdMLW9ubHkgZnVuY3Rpb24gZ2xHZXRUZXhMZXZlbFBhcmFtZXRl cml2IChHTEVTMgorICAgICAgICAvLyBkb2Vzbid0IHN1cHBvcnQgaXQpLgorICAgICAgICBpZiAo IW1faXNHTEVTMikKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoIiBHTF9DSFJPTUlVTV9jb3B5 X3RleHR1cmVfdG9fcGFyZW50X3RleHR1cmUiKTsKICAgICB9CiAgICAgcmV0dXJuIFdlYlN0cmlu ZyhyZXN1bHQudG9TdHJpbmcoKSk7CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBo aWNzQ29udGV4dDNERGVmYXVsdEltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvY2hyb21pdW0v c3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuaAkocmV2aXNpb24gNzE5NjApCisr KyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYkdyYXBoaWNzQ29udGV4dDNERGVmYXVsdEltcGwuaAko d29ya2luZyBjb3B5KQpAQCAtMjcyLDYgKzI3Miw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lu aXRpYWxpemVkOwogICAgIGJvb2wgbV9yZW5kZXJEaXJlY3RseVRvV2ViVmlldzsKICAgICBib29s IG1faXNHTEVTMjsKKyAgICBib29sIG1faGF2ZUVYVEZyYW1lYnVmZmVyT2JqZWN0OworICAgIGJv b2wgbV9oYXZlRVhURnJhbWVidWZmZXJNdWx0aXNhbXBsZTsKKyAgICBib29sIG1faGF2ZUFOR0xF RnJhbWVidWZmZXJNdWx0aXNhbXBsZTsKIAogICAgIHVuc2lnbmVkIGludCBtX3RleHR1cmU7CiAg ICAgdW5zaWduZWQgaW50IG1fZmJvOwo=