58363 2011-04-12 12:45:26 -0700 Use new skia API for wrapping DrawingBuffer's FBO/Tex IDs in skia object 2011-04-13 07:34:00 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 bsalomon bsalomon andreip bsalomon commit-queue jamesr kbr reed oldest_to_newest 384266 0 bsalomon 2011-04-12 12:45:26 -0700 Use new skia API for wrapping DrawingBuffer's FBO/Tex IDs in skia object 384298 1 89259 bsalomon 2011-04-12 13:28:30 -0700 Created attachment 89259 Patch 384300 2 bsalomon 2011-04-12 13:29:38 -0700 *** Bug 58357 has been marked as a duplicate of this bug. *** 384302 3 bsalomon 2011-04-12 13:30:01 -0700 *** Bug 58358 has been marked as a duplicate of this bug. *** 384305 4 bsalomon 2011-04-12 13:30:22 -0700 *** Bug 58360 has been marked as a duplicate of this bug. *** 384328 5 89259 kbr 2011-04-12 13:48:34 -0700 Comment on attachment 89259 Patch Looks fine to me assuming it's been tested. 384809 6 89259 bsalomon 2011-04-13 05:41:08 -0700 Comment on attachment 89259 Patch The chrome DEPS roll that this change is dependent on has been committed. This change should be ready to go in. (I tested it locally with ENABLE(SKIA_GPU) turned on.) 384871 7 89259 commit-queue 2011-04-13 07:33:54 -0700 Comment on attachment 89259 Patch Clearing flags on attachment: 89259 Committed r83733: <http://trac.webkit.org/changeset/83733> 384872 8 commit-queue 2011-04-13 07:34:00 -0700 All reviewed patches have been landed. Closing bug. 89259 2011-04-12 13:28:30 -0700 2011-04-13 07:33:54 -0700 Patch bug-58363-20110412162543.patch text/plain 4007 bsalomon SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNjI0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDQtMTIgIEJyaWFuIFNh bG9tb24gIDxic2Fsb21vbkBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFVzZSBuZXcgc2tpYSBBUEkgZm9yIHdyYXBwaW5nIERyYXdp bmdCdWZmZXIncyBGQk8vVGV4IElEcyBpbiBza2lhIG9iamVjdAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTgzNjMKKworICAgICAgICBObyBuZXcgdGVz dHMgbmVlZGVkLCBleGVyY2lzZWQgYnkgYWxsIGV4aXN0aW5nIGNhbnZhczJkIHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVt LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZmZXI6OmdldEdyUGxhdGZvcm1TdXJm YWNlRGVzYyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0U2hhcmVkR3Jh cGhpY3NDb250ZXh0M0QpOgorCiAyMDExLTA0LTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vRHJhd2luZ0J1ZmZlckNocm9taXVt LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9EcmF3aW5nQnVmZmVyQ2hyb21pdW0uY3BwCShyZXZpc2lvbiA4MzYwMCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0RyYXdpbmdCdWZmZXJDaHJvbWl1 bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3Myw2ICsxNzMsMjkgQEAgdm9pZCBEcmF3aW5nQnVm ZmVyOjpzZXRHckNvbnRleHQoR3JDb250ZQogICAgIC8vIHRoZSBTaGFyZWRHcmFwaGljc0NvbnRl eHQzRCBvYmplY3QgdGhhdCBpcyBnaXZpbmcgdXMgdGhlIGNvbnRleHQuCiAgICAgbV9nckNvbnRl eHQgPSBjb250ZXh0OwogfQorCit2b2lkIERyYXdpbmdCdWZmZXI6OmdldEdyUGxhdGZvcm1TdXJm YWNlRGVzYyhHclBsYXRmb3JtU3VyZmFjZURlc2MqIGRlc2MpCit7CisgICAgZGVzYy0+ZlN1cmZh Y2VUeXBlID0ga1RleHR1cmVSZW5kZXJUYXJnZXRfR3JQbGF0Zm9ybVN1cmZhY2VUeXBlOworCisg ICAgZGVzYy0+ZlBsYXRmb3JtVGV4dHVyZSA9IG1fY29sb3JCdWZmZXI7CisgICAgaWYgKG11bHRp c2FtcGxlKCkpIHsKKyAgICAgICAgZGVzYy0+ZlJlbmRlclRhcmdldEZsYWdzID0ga0lzTXVsdGlz YW1wbGVkX0dyUGxhdGZvcm1SZW5kZXJUYXJnZXRGbGFnQml0IHwga0dyQ2FuUmVzb2x2ZV9HclBs YXRmb3JtUmVuZGVyVGFyZ2V0RmxhZ0JpdDsKKyAgICAgICAgZGVzYy0+ZlBsYXRmb3JtUmVuZGVy VGFyZ2V0ID0gbV9tdWx0aXNhbXBsZUZCTzsKKyAgICAgICAgZGVzYy0+ZlBsYXRmb3JtUmVzb2x2 ZURlc3RpbmF0aW9uID0gbV9mYm87CisgICAgfSBlbHNlIHsKKyAgICAgICAgZGVzYy0+ZlJlbmRl clRhcmdldEZsYWdzID0ga05vbmVfR3JQbGF0Zm9ybVJlbmRlclRhcmdldEZsYWdCaXQ7CisgICAg ICAgIGRlc2MtPmZQbGF0Zm9ybVJlbmRlclRhcmdldCA9IG1fZmJvOworICAgICAgICBkZXNjLT5m UGxhdGZvcm1SZXNvbHZlRGVzdGluYXRpb24gPSAwOworICAgIH0KKworICAgIGRlc2MtPmZXaWR0 aCA9IG1fc2l6ZS53aWR0aCgpOworICAgIGRlc2MtPmZIZWlnaHQgPSBtX3NpemUuaGVpZ2h0KCk7 CisgICAgZGVzYy0+ZkNvbmZpZyA9IGtSR0JBXzg4ODhfR3JQaXhlbENvbmZpZzsKKworICAgIGRl c2MtPmZTdGVuY2lsQml0cyA9IChtX2RlcHRoU3RlbmNpbEJ1ZmZlciB8fCBtX3N0ZW5jaWxCdWZm ZXIpID8gOCA6IDA7Cit9CisKICNlbmRpZgogCiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgJKHJldmlzaW9uIDgz NjAwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZm ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsNyBAQAogCiAjaWYgRU5BQkxFKFNLSUFf R1BVKQogY2xhc3MgR3JDb250ZXh0Oworc3RydWN0IEdyUGxhdGZvcm1TdXJmYWNlRGVzYzsKICNl bmRpZgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0xMDIsNiArMTAzLDcgQEAgcHVibGljOgog CiAjaWYgRU5BQkxFKFNLSUFfR1BVKQogICAgIHZvaWQgc2V0R3JDb250ZXh0KEdyQ29udGV4dCog Y3R4KTsKKyAgICB2b2lkIGdldEdyUGxhdGZvcm1TdXJmYWNlRGVzYyhHclBsYXRmb3JtU3VyZmFj ZURlc2MqKTsKICNlbmRpZgogCiAgICAgUGFzc1JlZlB0cjxHcmFwaGljc0NvbnRleHQzRD4gZ3Jh cGhpY3NDb250ZXh0M0QoKSBjb25zdCB7IHJldHVybiBtX2NvbnRleHQ7IH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0 Zm9ybUNvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gODM2MDApCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03NDcsNyArNzQ3LDEyIEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0U2hh cmVkR3JhcGgKICAgICAgICAgZ3ItPnJlc2V0Q29udGV4dCgpOwogICAgICAgICBkcmF3aW5nQnVm ZmVyLT5zZXRHckNvbnRleHQoZ3IpOwogCi0gICAgICAgIFNrRGV2aWNlRmFjdG9yeSogZmFjdG9y eSA9IG5ldyBTa0dwdURldmljZUZhY3RvcnkoZ3IsIFNrR3B1RGV2aWNlOjpDdXJyZW50M0RBcGlS ZW5kZXJUYXJnZXQoKSk7CisgICAgICAgIEdyUGxhdGZvcm1TdXJmYWNlRGVzYyBkcmF3QnVmRGVz YzsKKyAgICAgICAgZHJhd2luZ0J1ZmZlci0+Z2V0R3JQbGF0Zm9ybVN1cmZhY2VEZXNjKCZkcmF3 QnVmRGVzYyk7CisgICAgICAgIEdyVGV4dHVyZSogZHJhd0J1ZlRleCA9IHN0YXRpY19jYXN0PEdy VGV4dHVyZSo+KGdyLT5jcmVhdGVQbGF0Zm9ybVN1cmZhY2UoZHJhd0J1ZkRlc2MpKTsKKyAgICAg ICAgU2tEZXZpY2VGYWN0b3J5KiBmYWN0b3J5ID0gbmV3IFNrR3B1RGV2aWNlRmFjdG9yeShnciwg ZHJhd0J1ZlRleCk7CisgICAgICAgIGRyYXdCdWZUZXgtPnVucmVmKCk7CisKICAgICAgICAgU2tE ZXZpY2UqIGRldmljZSA9IGZhY3RvcnktPm5ld0RldmljZShtX2NhbnZhcywgU2tCaXRtYXA6OmtB UkdCXzg4ODhfQ29uZmlnLCBkcmF3aW5nQnVmZmVyLT5zaXplKCkud2lkdGgoKSwgZHJhd2luZ0J1 ZmZlci0+c2l6ZSgpLmhlaWdodCgpLCBmYWxzZSwgZmFsc2UpOwogICAgICAgICBtX2NhbnZhcy0+ c2V0RGV2aWNlKGRldmljZSktPnVucmVmKCk7CiAgICAgICAgIG1fY2FudmFzLT5zZXREZXZpY2VG YWN0b3J5KGZhY3RvcnkpOwo=