47114 2010-10-04 14:32:36 -0700 Add ENABLE(ACCELERATED_2D_CANVAS) guard for m_uploadTexture 2010-10-09 11:11:34 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 skyul webkit-unassigned commit-queue oldest_to_newest 289145 0 skyul 2010-10-04 14:32:36 -0700 PlatformContextSkia's m_uploadTexture is used only in code guarded with ENABLE(ACCELERATED_2D_CANVAS). 289147 1 69683 skyul 2010-10-04 14:33:32 -0700 Created attachment 69683 Patch 290830 2 69683 kling 2010-10-06 23:45:11 -0700 Comment on attachment 69683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69683&action=review > WebCore/platform/graphics/skia/PlatformContextSkia.h:236 > +#if ENABLE(ACCELERATED_2D_CANVAS) > mutable RefPtr<Texture> m_uploadTexture; > +#endif There's an ENABLE(ACCELERATED_2D_CANVAS) guard just above, put both variables in there instead. 291191 3 70131 skyul 2010-10-07 12:43:22 -0700 Created attachment 70131 Patch Move m_uploadTexture to the ENABLE(ACCELERATED_2D_CANVAS) guard above. 292136 4 70131 kling 2010-10-09 10:43:16 -0700 Comment on attachment 70131 Patch LGTM. 292140 5 70131 commit-queue 2010-10-09 11:11:26 -0700 Comment on attachment 70131 Patch Clearing flags on attachment: 70131 Committed r69450: <http://trac.webkit.org/changeset/69450> 292142 6 commit-queue 2010-10-09 11:11:34 -0700 All reviewed patches have been landed. Closing bug. 69683 2010-10-04 14:33:32 -0700 2010-10-07 12:43:22 -0700 Patch guard.patch text/plain 1225 skyul SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTAzNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDQgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55 MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykgZ3VhcmQgZm9yIG1fdXBsb2FkVGV4 dHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcx MTQKKworICAgICAgICBQbGF0Zm9ybUNvbnRleHRTa2lhJ3MgbV91cGxvYWRUZXh0dXJlIGlzIHVz ZWQgb25seSBpbiBjb2RlIGd1YXJkZWQgd2l0aCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFT KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tp YS5oOgorCiAyMDEwLTEwLTA0ICBIdWFodWkgV3UgIDxtZWRpYWRlcGVuZGVudEBnbWFpbC5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgJKHJldmlz aW9uIDY5MDE3KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaAkod29ya2luZyBjb3B5KQpAQCAtMjMxLDcgKzIzMSw5IEBAIHByaXZhdGU6CiAg ICAgT3duUHRyPEdMRVMyQ2FudmFzPiBtX2dwdUNhbnZhczsKICNlbmRpZgogICAgIG11dGFibGUg ZW51bSB7IE5vbmUsIFNvZnR3YXJlLCBNaXhlZCwgSGFyZHdhcmUgfSBtX2JhY2tpbmdTdG9yZVN0 YXRlOworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAgICAgbXV0YWJsZSBSZWZQ dHI8VGV4dHVyZT4gbV91cGxvYWRUZXh0dXJlOworI2VuZGlmCiAgICAgbXV0YWJsZSBJbnRSZWN0 IG1fc29mdHdhcmVEaXJ0eVJlY3Q7CiB9OwogCg== 70131 2010-10-07 12:43:22 -0700 2010-10-09 11:11:26 -0700 Patch guard.patch text/plain 1283 skyul SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTMzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMTAtMDcgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55 MTAwLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykgZ3VhcmQgZm9yIG1fdXBsb2FkVGV4 dHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDcx MTQKKworICAgICAgICBQbGF0Zm9ybUNvbnRleHRTa2lhJ3MgbV91cGxvYWRUZXh0dXJlIGlzIHVz ZWQgb25seSBpbiBjb2RlIGd1YXJkZWQgd2l0aCBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFT KS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tp YS5oOgorCiAyMDEwLTEwLTA3ICBLd2FuZyBZdWwgU2VvICA8c2t5dWxAY29tcGFueTEwMC5uZXQ+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VudCBUYW11cmEuCkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgJKHJldmlz aW9uIDY5MzMwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaAkod29ya2luZyBjb3B5KQpAQCAtMjI5LDkgKzIyOSw5IEBAIHByaXZhdGU6CiAg ICAgYm9vbCBtX3VzZUdQVTsKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQogICAg IE93blB0cjxHTEVTMkNhbnZhcz4gbV9ncHVDYW52YXM7CisgICAgbXV0YWJsZSBSZWZQdHI8VGV4 dHVyZT4gbV91cGxvYWRUZXh0dXJlOwogI2VuZGlmCiAgICAgbXV0YWJsZSBlbnVtIHsgTm9uZSwg U29mdHdhcmUsIE1peGVkLCBIYXJkd2FyZSB9IG1fYmFja2luZ1N0b3JlU3RhdGU7Ci0gICAgbXV0 YWJsZSBSZWZQdHI8VGV4dHVyZT4gbV91cGxvYWRUZXh0dXJlOwogICAgIG11dGFibGUgSW50UmVj dCBtX3NvZnR3YXJlRGlydHlSZWN0OwogfTsKIAo=