45534 2010-09-10 05:34:51 -0700 WebGL: Fix GCC warnings about suggested parentheses around && within || 2010-09-10 08:51:02 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kling webkit-unassigned enne jamesr kbr zmo oldest_to_newest 277132 0 kling 2010-09-10 05:34:51 -0700 ../../../WebCore/html/canvas/WebGLRenderingContext.cpp: In member function ‘WebCore::WebGLGetInfo WebCore::WebGLRenderingContext::getVertexAttrib(long unsigned int, long unsigned int, WebCore::ExceptionCode&)’: ../../../WebCore/html/canvas/WebGLRenderingContext.cpp:1760: error: suggest parentheses around ‘&&’ within ‘||’ ../../../WebCore/html/canvas/WebGLRenderingContext.cpp: In member function ‘void WebCore::WebGLRenderingContext::readPixels(long int, long int, long int, long int, long unsigned int, long unsigned int, WebCore::ArrayBufferView*)’: ../../../WebCore/html/canvas/WebGLRenderingContext.cpp:1947: error: suggest parentheses around ‘&&’ within ‘||’ ../../../WebCore/html/canvas/WebGLRenderingContext.cpp: In member function ‘void WebCore::WebGLRenderingContext::texParameter(long unsigned int, long unsigned int, float, int, bool)’: ../../../WebCore/html/canvas/WebGLRenderingContext.cpp:2225: error: suggest parentheses around ‘&&’ within ‘||’ ../../../WebCore/html/canvas/WebGLRenderingContext.cpp: In member function ‘void WebCore::WebGLRenderingContext::handleNPOTTextures(bool)’: ../../../WebCore/html/canvas/WebGLRenderingContext.cpp:3016: error: suggest parentheses around ‘&&’ within ‘||’ 277133 1 67170 kling 2010-09-10 05:36:03 -0700 Created attachment 67170 Proposed patch 277149 2 67170 kling 2010-09-10 05:54:24 -0700 Comment on attachment 67170 Proposed patch Clearing flags on attachment: 67170 Committed r67194: <http://trac.webkit.org/changeset/67194> 277150 3 kling 2010-09-10 05:54:34 -0700 All reviewed patches have been landed. Closing bug. 67170 2010-09-10 05:36:03 -0700 2010-09-10 05:54:23 -0700 Proposed patch bug-45534.diff text/plain 4004 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YThiNTNhOC4uMmExZTI4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0xMCAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdlYkdMOiBGaXggR0NDIHdhcm5pbmdzIGFib3V0IHN1Z2dl c3RlZCBwYXJlbnRoZXNlcyBhcm91bmQgJiYgd2l0aGluIHx8CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTUzNAorCisgICAgICAgICogaHRtbC9jYW52 YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVu ZGVyaW5nQ29udGV4dDo6Z2V0VmVydGV4QXR0cmliKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdM UmVuZGVyaW5nQ29udGV4dDo6cmVhZFBpeGVscyk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OnRleFBhcmFtZXRlcik6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJl bmRlcmluZ0NvbnRleHQ6OmhhbmRsZU5QT1RUZXh0dXJlcyk6CisKIDIwMTAtMDktMDkgIEFsZXhh bmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBZdXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH TFJlbmRlcmluZ0NvbnRleHQuY3BwIGIvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmlu Z0NvbnRleHQuY3BwCmluZGV4IGJkYTM1NjkuLjY4YTY5NTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcAorKysgYi9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAKQEAgLTE3NTYsNyArMTc1Niw3IEBAIFdl YkdMR2V0SW5mbyBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmdldFZlcnRleEF0dHJpYih1bnNpZ25l ZCBsb25nIGluZGV4LCB1bnNpZ25lCiAgICAgfQogICAgIHN3aXRjaCAocG5hbWUpIHsKICAgICBj YXNlIEdyYXBoaWNzQ29udGV4dDNEOjpWRVJURVhfQVRUUklCX0FSUkFZX0JVRkZFUl9CSU5ESU5H OgotICAgICAgICBpZiAoIWlzR0xFUzJDb21wbGlhbnQoKSAmJiAhaW5kZXggJiYgbV92ZXJ0ZXhB dHRyaWJTdGF0ZVswXS5idWZmZXJCaW5kaW5nID09IG1fdmVydGV4QXR0cmliMEJ1ZmZlcgorICAg ICAgICBpZiAoKCFpc0dMRVMyQ29tcGxpYW50KCkgJiYgIWluZGV4ICYmIG1fdmVydGV4QXR0cmli U3RhdGVbMF0uYnVmZmVyQmluZGluZyA9PSBtX3ZlcnRleEF0dHJpYjBCdWZmZXIpCiAgICAgICAg ICAgICB8fCBpbmRleCA+PSBtX3ZlcnRleEF0dHJpYlN0YXRlLnNpemUoKQogICAgICAgICAgICAg fHwgIW1fdmVydGV4QXR0cmliU3RhdGVbaW5kZXhdLmJ1ZmZlckJpbmRpbmcKICAgICAgICAgICAg IHx8ICFtX3ZlcnRleEF0dHJpYlN0YXRlW2luZGV4XS5idWZmZXJCaW5kaW5nLT5vYmplY3QoKSkK QEAgLTE5NDMsOCArMTk0Myw4IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0OjpyZWFkUGl4 ZWxzKGxvbmcgeCwgbG9uZyB5LCBsb25nIHdpZHRoLCBsb25nIGhlaWdodCwKICAgICAgICAgcmV0 dXJuOwogICAgIH0KICAgICAvLyBWYWxpZGF0ZSBhcnJheSB0eXBlIGFnYWluc3QgcGl4ZWwgdHlw ZS4KLSAgICBpZiAodHlwZSA9PSBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSAmJiAh cGl4ZWxzLT5pc1Vuc2lnbmVkQnl0ZUFycmF5KCkKLSAgICAgICAgfHwgdHlwZSAhPSBHcmFwaGlj c0NvbnRleHQzRDo6VU5TSUdORURfQllURSAmJiAhcGl4ZWxzLT5pc1Vuc2lnbmVkU2hvcnRBcnJh eSgpKSB7CisgICAgaWYgKCh0eXBlID09IEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9CWVRF ICYmICFwaXhlbHMtPmlzVW5zaWduZWRCeXRlQXJyYXkoKSkKKyAgICAgICAgfHwgKHR5cGUgIT0g R3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lHTkVEX0JZVEUgJiYgIXBpeGVscy0+aXNVbnNpZ25lZFNo b3J0QXJyYXkoKSkpIHsKICAgICAgICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihHcmFw aGljc0NvbnRleHQzRDo6SU5WQUxJRF9PUEVSQVRJT04pOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMjIyMSw4ICsyMjIxLDggQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnRleFBh cmFtZXRlcih1bnNpZ25lZCBsb25nIHRhcmdldCwgdW5zaWduZWQgbG9uZyBwbmEKICAgICAgICAg YnJlYWs7CiAgICAgY2FzZSBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1M6CiAgICAg Y2FzZSBHcmFwaGljc0NvbnRleHQzRDo6VEVYVFVSRV9XUkFQX1Q6Ci0gICAgICAgIGlmIChpc0Zs b2F0ICYmIHBhcmFtZiAhPSBHcmFwaGljc0NvbnRleHQzRDo6Q0xBTVBfVE9fRURHRSAmJiBwYXJh bWYgIT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok1JUlJPUkVEX1JFUEVBVCAmJiBwYXJhbWYgIT0gR3Jh cGhpY3NDb250ZXh0M0Q6OlJFUEVBVAotICAgICAgICAgICAgfHwgIWlzRmxvYXQgJiYgcGFyYW1p ICE9IEdyYXBoaWNzQ29udGV4dDNEOjpDTEFNUF9UT19FREdFICYmIHBhcmFtaSAhPSBHcmFwaGlj c0NvbnRleHQzRDo6TUlSUk9SRURfUkVQRUFUICYmIHBhcmFtaSAhPSBHcmFwaGljc0NvbnRleHQz RDo6UkVQRUFUKSB7CisgICAgICAgIGlmICgoaXNGbG9hdCAmJiBwYXJhbWYgIT0gR3JhcGhpY3ND b250ZXh0M0Q6OkNMQU1QX1RPX0VER0UgJiYgcGFyYW1mICE9IEdyYXBoaWNzQ29udGV4dDNEOjpN SVJST1JFRF9SRVBFQVQgJiYgcGFyYW1mICE9IEdyYXBoaWNzQ29udGV4dDNEOjpSRVBFQVQpCisg ICAgICAgICAgICB8fCAoIWlzRmxvYXQgJiYgcGFyYW1pICE9IEdyYXBoaWNzQ29udGV4dDNEOjpD TEFNUF9UT19FREdFICYmIHBhcmFtaSAhPSBHcmFwaGljc0NvbnRleHQzRDo6TUlSUk9SRURfUkVQ RUFUICYmIHBhcmFtaSAhPSBHcmFwaGljc0NvbnRleHQzRDo6UkVQRUFUKSkgewogICAgICAgICAg ICAgbV9jb250ZXh0LT5zeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJ RF9FTlVNKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMzAxMiw4ICszMDEy LDggQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OmhhbmRsZU5QT1RUZXh0dXJlcyhib29s IHByZXBhcmVUb0RyYXcpCiB7CiAgICAgYm9vbCByZXNldEFjdGl2ZVVuaXQgPSBmYWxzZTsKICAg ICBmb3IgKHVuc2lnbmVkIGlpID0gMDsgaWkgPCBtX3RleHR1cmVVbml0cy5zaXplKCk7ICsraWkp IHsKLSAgICAgICAgaWYgKG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmUyREJpbmRpbmcgJiYg bV90ZXh0dXJlVW5pdHNbaWldLm1fdGV4dHVyZTJEQmluZGluZy0+bmVlZFRvVXNlQmxhY2tUZXh0 dXJlKCkKLSAgICAgICAgICAgIHx8IG1fdGV4dHVyZVVuaXRzW2lpXS5tX3RleHR1cmVDdWJlTWFw QmluZGluZyAmJiBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlQ3ViZU1hcEJpbmRpbmctPm5l ZWRUb1VzZUJsYWNrVGV4dHVyZSgpKSB7CisgICAgICAgIGlmICgobV90ZXh0dXJlVW5pdHNbaWld Lm1fdGV4dHVyZTJEQmluZGluZyAmJiBtX3RleHR1cmVVbml0c1tpaV0ubV90ZXh0dXJlMkRCaW5k aW5nLT5uZWVkVG9Vc2VCbGFja1RleHR1cmUoKSkKKyAgICAgICAgICAgIHx8IChtX3RleHR1cmVV bml0c1tpaV0ubV90ZXh0dXJlQ3ViZU1hcEJpbmRpbmcgJiYgbV90ZXh0dXJlVW5pdHNbaWldLm1f dGV4dHVyZUN1YmVNYXBCaW5kaW5nLT5uZWVkVG9Vc2VCbGFja1RleHR1cmUoKSkpIHsKICAgICAg ICAgICAgIGlmIChpaSAhPSBtX2FjdGl2ZVRleHR1cmVVbml0KSB7CiAgICAgICAgICAgICAgICAg bV9jb250ZXh0LT5hY3RpdmVUZXh0dXJlKGlpKTsKICAgICAgICAgICAgICAgICByZXNldEFjdGl2 ZVVuaXQgPSB0cnVlOwo=