58906 2011-04-19 11:06:33 -0700 GLES2Canvas state application should be refactored 2011-04-19 12:04:18 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Minor --- 1 senorblanco senorblanco jamesr kbr mdelaney7 oldest_to_newest 388608 0 senorblanco 2011-04-19 11:06:33 -0700 There are a number of places where we bind the main framebuffer, apply compositing and clipping state. This should be refactored. 388611 1 90218 senorblanco 2011-04-19 11:08:26 -0700 Created attachment 90218 Patch 388677 2 90218 kbr 2011-04-19 12:02:17 -0700 Comment on attachment 90218 Patch Looks good to me. 388682 3 senorblanco 2011-04-19 12:04:18 -0700 Committed r84277: <http://trac.webkit.org/changeset/84277> 90218 2011-04-19 11:08:26 -0700 2011-04-19 12:02:17 -0700 Patch bug-58906-20110419140824.patch text/plain 5146 senorblanco SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg0MjY0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMTkgIFN0ZXBoZW4g V2hpdGUgIDxzZW5vcmJsYW5jb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVmYWN0b3IgR0xFUzJDYW52YXMgc3RhdGUgYXBw bGljYXRpb24gb3V0IGludG8gaXRzIG93biBmdW5jdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU4OTA2CisKKyAgICAgICAgQ292ZXJlZCBieSBl eGlzdGluZyB0ZXN0cyBpbiBmYXN0L2NhbnZhcyBhbmQgY2FudmFzL3BoaWxpcC4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkdMRVMyQ2FudmFzOjphcHBseVN0YXRlKToKKyAgICAgICAgTmV3IGZ1bmN0aW9u IHRvIGFwcGx5IGNvbXBvc2l0aW5nIGFuZCBjbGlwcGluZyBzdGF0ZS4KKyAgICAgICAgKFdlYkNv cmU6OkdMRVMyQ2FudmFzOjpmaWxsUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNhbnZh czo6ZmlsbFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6R0xFUzJDYW52YXM6OmJlZ2luU2hhZG93 RHJhdyk6CisgICAgICAgIChXZWJDb3JlOjpHTEVTMkNhbnZhczo6ZW5kU2hhZG93RHJhdyk6Cisg ICAgICAgIFJlZmFjdG9yIGNhbGxzIHRvIGFwcGx5U3RhdGUoKS4KKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5oOgorCiAyMDExLTA0LTE5ICBKdW5nc2hp ayBTaGluICA8anNoaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlk IExldmluCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9H TEVTMkNhbnZhcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuY3BwCShyZXZpc2lvbiA4NDI2MykKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0dMRVMyQ2FudmFzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjM1LDYgKzIzNSwxMyBAQCB2b2lkIEdMRVMyQ2FudmFzOjpjbGVhclJl Y3QoY29uc3QgRmxvYXRSCiAgICAgfQogfQogCit2b2lkIEdMRVMyQ2FudmFzOjphcHBseVN0YXRl KCkKK3sKKyAgICBiaW5kRnJhbWVidWZmZXIoKTsKKyAgICBtX2NvbnRleHQtPmFwcGx5Q29tcG9z aXRlT3BlcmF0b3IobV9zdGF0ZS0+bV9jb21wb3NpdGVPcCk7CisgICAgYXBwbHlDbGlwcGluZyht X3N0YXRlLT5jbGlwcGluZ0VuYWJsZWQoKSk7Cit9CisKIHZvaWQgR0xFUzJDYW52YXM6OnNjaXNz b3JDbGVhcihmbG9hdCB4LCBmbG9hdCB5LCBmbG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0KQogewog ICAgIGludCBpbnRYID0gc3RhdGljX2Nhc3Q8aW50Pih4ICsgMC41Zik7CkBAIC0yNTYsMTAgKzI2 Myw3IEBAIHZvaWQgR0xFUzJDYW52YXM6OmZpbGxQYXRoKGNvbnN0IFBhdGgmIHAKICAgICAgICAg ZW5kU2hhZG93RHJhdyhwYXRoLmJvdW5kaW5nUmVjdCgpKTsKICAgICB9CiAKLSAgICBiaW5kRnJh bWVidWZmZXIoKTsKLSAgICBtX2NvbnRleHQtPmFwcGx5Q29tcG9zaXRlT3BlcmF0b3IobV9zdGF0 ZS0+bV9jb21wb3NpdGVPcCk7Ci0gICAgYXBwbHlDbGlwcGluZyhtX3N0YXRlLT5jbGlwcGluZ0Vu YWJsZWQoKSk7Ci0KKyAgICBhcHBseVN0YXRlKCk7CiAgICAgZmlsbFBhdGhJbnRlcm5hbChwYXRo LCBtX3N0YXRlLT5hcHBseUFscGhhKG1fc3RhdGUtPm1fZmlsbENvbG9yKSk7CiB9CiAKQEAgLTI3 MSwxMCArMjc1LDcgQEAgdm9pZCBHTEVTMkNhbnZhczo6ZmlsbFJlY3QoY29uc3QgRmxvYXRSZQog ICAgICAgICBlbmRTaGFkb3dEcmF3KHJlY3QpOwogICAgIH0KIAotICAgIGJpbmRGcmFtZWJ1ZmZl cigpOwotICAgIG1fY29udGV4dC0+YXBwbHlDb21wb3NpdGVPcGVyYXRvcihtX3N0YXRlLT5tX2Nv bXBvc2l0ZU9wKTsKLSAgICBhcHBseUNsaXBwaW5nKG1fc3RhdGUtPmNsaXBwaW5nRW5hYmxlZCgp KTsKLQorICAgIGFwcGx5U3RhdGUoKTsKICAgICBmaWxsUmVjdEludGVybmFsKHJlY3QsIGNvbG9y KTsKIH0KIApAQCAtNzc3LDkgKzc3OCw3IEBAIHZvaWQgR0xFUzJDYW52YXM6OmJlZ2luU2hhZG93 RHJhdygpCiAgICAgICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcihDb2xvcihSR0JBMzIoMCkpKTsK ICAgICAgICAgbV9jb250ZXh0LT5jbGVhcihHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVS X0JJVCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgYmluZEZyYW1lYnVmZmVyKCk7Ci0gICAgICAg IG1fY29udGV4dC0+YXBwbHlDb21wb3NpdGVPcGVyYXRvcihtX3N0YXRlLT5tX2NvbXBvc2l0ZU9w KTsKLSAgICAgICAgYXBwbHlDbGlwcGluZyhtX3N0YXRlLT5jbGlwcGluZ0VuYWJsZWQoKSk7Cisg ICAgICAgIGFwcGx5U3RhdGUoKTsKICAgICB9CiB9CiAKQEAgLTg1NCwxOSArODUzLDE0IEBAIHZv aWQgR0xFUzJDYW52YXM6OmVuZFNoYWRvd0RyYXcoY29uc3QgRmwKICAgICAgICAgICAgIHN0ZDo6 c3dhcChzcmNCdWZmZXIsIGRzdEJ1ZmZlcik7CiAKICAgICAgICAgICAgIC8vIFVwc2FtcGxlIHNy Y0J1ZmZlciAtPiBtYWluIGZyYW1lYnVmZmVyIHVzaW5nIGJpY3ViaWMgZmlsdGVyaW5nLgotICAg ICAgICAgICAgYmluZEZyYW1lYnVmZmVyKCk7Ci0gICAgICAgICAgICBtX2NvbnRleHQtPmFwcGx5 Q29tcG9zaXRlT3BlcmF0b3IobV9zdGF0ZS0+bV9jb21wb3NpdGVPcCk7Ci0gICAgICAgICAgICBh cHBseUNsaXBwaW5nKG1fc3RhdGUtPmNsaXBwaW5nRW5hYmxlZCgpKTsKKyAgICAgICAgICAgIGFw cGx5U3RhdGUoKTsKICAgICAgICAgICAgIG1fY29udGV4dC0+YmluZFRleHR1cmUoR3JhcGhpY3ND b250ZXh0M0Q6OlRFWFRVUkVfMkQsIHNyY0J1ZmZlci0+Y29sb3JCdWZmZXIoKSk7CiAgICAgICAg ICAgICBGbG9hdFJlY3QgZHN0UmVjdCA9IHNyY1JlY3Q7CiAgICAgICAgICAgICBkc3RSZWN0LnNj YWxlKHNjYWxlRmFjdG9yKTsKICAgICAgICAgICAgIGRyYXdUZXh0dXJlZFF1YWRNaXRjaGVsbChz cmNCdWZmZXItPnNpemUoKSwgZmxpcFJlY3Qoc3JjUmVjdCksIGRzdFJlY3QsIEFmZmluZVRyYW5z Zm9ybSgpLCAxLjApOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gQmx1ciBpbiBZ IGRpcmVjdGx5IHRvIGZyYW1lYnVmZmVyLgotICAgICAgICAgICAgYmluZEZyYW1lYnVmZmVyKCk7 Ci0gICAgICAgICAgICBtX2NvbnRleHQtPmFwcGx5Q29tcG9zaXRlT3BlcmF0b3IobV9zdGF0ZS0+ bV9jb21wb3NpdGVPcCk7Ci0gICAgICAgICAgICBhcHBseUNsaXBwaW5nKG1fc3RhdGUtPmNsaXBw aW5nRW5hYmxlZCgpKTsKLQorICAgICAgICAgICAgYXBwbHlTdGF0ZSgpOwogICAgICAgICAgICAg Y29udm9sdmVSZWN0KHNyY0J1ZmZlci0+Y29sb3JCdWZmZXIoKSwgc3JjQnVmZmVyLT5zaXplKCks IGZsaXBSZWN0KHNyY1JlY3QpLCBzcmNSZWN0LCBpbWFnZUluY3JlbWVudFksIGtlcm5lbC5nZXQo KSwga2VybmVsV2lkdGgpOwogICAgICAgICB9CiAgICAgfQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vR0xFUzJDYW52YXMuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9HTEVTMkNhbnZhcy5oCShy ZXZpc2lvbiA4NDI2MykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0dMRVMyQ2FudmFzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwMCwxMyArMTAwLDEzIEBAIHB1 YmxpYzoKICAgICBEcmF3aW5nQnVmZmVyKiBkcmF3aW5nQnVmZmVyKCkgY29uc3QgeyByZXR1cm4g bV9kcmF3aW5nQnVmZmVyOyB9CiAKIHByaXZhdGU6CisgICAgdm9pZCBhcHBseVN0YXRlKCk7CiAg ICAgdm9pZCBzY2lzc29yQ2xlYXIoZmxvYXQgeCwgZmxvYXQgeSwgZmxvYXQgd2lkdGgsIGZsb2F0 IGhlaWdodCk7CiAgICAgdm9pZCBkcmF3VGV4dHVyZWRSZWN0VGlsZShUZXh0dXJlKiB0ZXh0dXJl LCBpbnQgdGlsZSwgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LCBjb25zdCBGbG9hdFJlY3QmIGRz dFJlY3QsIGNvbnN0IEFmZmluZVRyYW5zZm9ybSYsIGZsb2F0IGFscGhhKTsKICAgICB2b2lkIGRy YXdUZXh0dXJlZFF1YWQoY29uc3QgSW50U2l6ZSYgdGV4dHVyZVNpemUsIGNvbnN0IEZsb2F0UmVj dCYgc3JjUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zv cm0mLCBmbG9hdCBhbHBoYSk7CiAgICAgdm9pZCBkcmF3VGV4dHVyZWRRdWFkTWl0Y2hlbGwoY29u c3QgSW50U2l6ZSYgdGV4dHVyZVNpemUsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3Qg RmxvYXRSZWN0JiBkc3RSZWN0LCBjb25zdCBBZmZpbmVUcmFuc2Zvcm0mLCBmbG9hdCBhbHBoYSk7 CiAgICAgdm9pZCBjb252b2x2ZVJlY3QodW5zaWduZWQgdGV4dHVyZSwgY29uc3QgSW50U2l6ZSYg dGV4dHVyZVNpemUsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgRmxvYXRSZWN0JiBk c3RSZWN0LCBmbG9hdCBpbWFnZUluY3JlbWVudFsyXSwgY29uc3QgZmxvYXQqIGtlcm5lbCwgaW50 IGtlcm5lbFdpZHRoKTsKIAotICAgIHZvaWQgYXBwbHlDb21wb3NpdGVPcGVyYXRvcihDb21wb3Np dGVPcGVyYXRvcik7CiAgICAgdm9pZCB0ZXNzZWxhdGVBbmRGaWxsUGF0aChjb25zdCBQYXRoJiwg Y29uc3QgQ29sb3ImKTsKICAgICB2b2lkIGZpbGxQYXRoSW50ZXJuYWwoY29uc3QgUGF0aCYsIGNv bnN0IENvbG9yJik7CiAgICAgdm9pZCBmaWxsUmVjdEludGVybmFsKGNvbnN0IEZsb2F0UmVjdCYs IGNvbnN0IENvbG9yJik7Cg==