59608 2011-04-27 08:31:26 -0700 Change TEXMAP_OPENGL_ES2 to TEXMAP_OPENGL_ES_2 2011-05-01 10:25:48 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 47068 0 joybro201 webkit-unassigned benjamin commit-queue eric kbr laszlo.gombos skyul oldest_to_newest 393560 0 joybro201 2011-04-27 08:31:26 -0700 Change TEXMAP_OPENGL_ES2 to TEXMAP_OPENGL_ES_2 393563 1 91288 joybro201 2011-04-27 08:33:29 -0700 Created attachment 91288 Patch 393566 2 joybro201 2011-04-27 08:36:09 -0700 TEXMAP_OPENGL_ES2 is a wrong name. TEXMAP_OPENGL_ES_2 is already defined in TextureMapper.h 395913 3 joybro201 2011-05-01 09:14:27 -0700 Is there anybody who can review this patch? This bug is very obvious and causes compile error in OPENGLES environment. >:~/Works/WebKit/Source/WebCore/platform$ grep -R TEXMAP_OPENGL_ES * graphics/opengl/TextureMapperGL.cpp:#if defined(TEXMAP_OPENGL_ES_2) graphics/opengl/TextureMapperGL.cpp:#ifndef TEXMAP_OPENGL_ES2 graphics/opengl/TextureMapperGL.cpp:#ifndef TEXMAP_OPENGL_ES2 graphics/texmap/TextureMapper.h: #if defined(QT_OPENGL_ES_2) && !defined(TEXMAP_OPENGL_ES_2) graphics/texmap/TextureMapper.h: #define TEXMAP_OPENGL_ES_2 395916 4 91288 eric 2011-05-01 09:40:32 -0700 Comment on attachment 91288 Patch Looks reasonable. 395943 5 91288 commit-queue 2011-05-01 10:25:43 -0700 Comment on attachment 91288 Patch Clearing flags on attachment: 91288 Committed r85417: <http://trac.webkit.org/changeset/85417> 395944 6 commit-queue 2011-05-01 10:25:48 -0700 All reviewed patches have been landed. Closing bug. 91288 2011-04-27 08:33:29 -0700 2011-05-01 10:25:42 -0700 Patch bug-59608-20110428003328.patch text/plain 1647 joybro201 U3VidmVyc2lvbiBSZXZpc2lvbjogODUwNDgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiNzA0NDgwOTZmYzUwMzNh ZDFkZTUwOWNmMzlmNGM4Mjk5YTAxZTc3Li4yMzNhOTk3MjM3MGM4M2IyNDlkMTQwNzA1MWFmZjA3 M2Y1ODI2YTNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMjcgIFlvdW5n IEhhbiBMZWUgIDxqb3licm9AY29tcGFueTEwMC5uZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2hhbmdlIFRFWE1BUF9PUEVOR0xfRVMyIHRvIFRF WE1BUF9PUEVOR0xfRVNfMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTk2MDgKKworICAgICAgICBURVhNQVBfT1BFTkdMX0VTMiBpcyBhIHdyb25nIG5h bWUuIFRFWE1BUF9PUEVOR0xfRVNfMiBpcyBhbHJlYWR5IGRlZmluZWQgaW4gVGV4dHVyZU1hcHBl ci5oCisKKyAgICAgICAgTm8gbmV3IGZ1bmN0aW9uYWxpdHksIG5vIG5ldyB0ZXN0cy4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9UZXh0dXJlTWFwcGVyR0wuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlckdMOjpUZXh0dXJlTWFwcGVyR0wpOgorCiAyMDEx LTA0LTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL1RleHR1cmVNYXBwZXJHTC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcAppbmRleCAx NDkzOTY2OWE1N2E1ZDIxZWUyMzAwNDU3YjZiMTZlMzY0Y2NhZmUwLi5jZjg1MjQxZTk1ZmYzODRi ZmU0NjlhNjA1Yjc5MWY3OTNiZWRlYTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGV4dHVyZU1hcHBlckdMLmNwcApAQCAtMzks NyArMzksNyBAQAogI2luY2x1ZGUgPEdML2dsLmg+CiAjZW5kaWYKIAotI2lmbmRlZiBURVhNQVBf T1BFTkdMX0VTMgorI2lmbmRlZiBURVhNQVBfT1BFTkdMX0VTXzIKIGV4dGVybiAiQyIgewogICAg IHZvaWQgZ2xVbmlmb3JtMWYoR0xpbnQsIEdMZmxvYXQpOwogICAgIHZvaWQgZ2xVbmlmb3JtMWko R0xpbnQsIEdMaW50KTsKQEAgLTI3MSw3ICsyNzEsNyBAQCBUZXh0dXJlTWFwcGVyR0w6OlRleHR1 cmVNYXBwZXJHTCgpCiAgICAgaWYgKHNoYWRlcnNDb21waWxlZCkKICAgICAgICAgcmV0dXJuOwog ICAgIHNoYWRlcnNDb21waWxlZCA9IHRydWU7Ci0jaWZuZGVmIFRFWE1BUF9PUEVOR0xfRVMyCisj aWZuZGVmIFRFWE1BUF9PUEVOR0xfRVNfMgogI2RlZmluZSBPRVMyX1BSRUNJU0lPTl9ERUZJTklU SU9OUyBcCiAgICAgIiNkZWZpbmUgbG93cFxuI2RlZmluZSBoaWdocFxuIgogI2Vsc2UK