[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[levin at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8c31f6f4a3354b1610ef52f43cd50e239ef28e17
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 06:26:23 2009 +0000

    Incorrect code in WebGLRenderingContext.cpp
    https://bugs.webkit.org/show_bug.cgi?id=32046
    
    Reviewed by Eric Seidel.
    
    Fix incorrect code that happened to work. != has higher precendence than &.
    The simplest fix is to remove the "!= 0" which violates WebKit style
    guidelines anyway.
    
    Also added periods to few comments in the same function.
    
    * html/canvas/WebGLRenderingContext.cpp:
    (WebCore::WebGLRenderingContext::validateIndexArray):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51588 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 309d7c9..78a5700 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-01  David Levin  <levin at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Incorrect code in WebGLRenderingContext.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=32046
+
+        Fix incorrect code that happened to work. != has higher precendence than &.
+        The simplest fix is to remove the "!= 0" which violates WebKit style
+        guidelines anyway.
+
+        Also added periods to few comments in the same function.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::validateIndexArray):
+
 2009-12-01  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 32222d4..a19d5c6 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -577,11 +577,11 @@ bool WebGLRenderingContext::validateIndexArray(unsigned long count, unsigned lon
     unsigned long uoffset = static_cast<unsigned long>(offset);
     
     if (type == GraphicsContext3D::UNSIGNED_SHORT) {
-        // For an unsigned short array, offset must be divisible by 2 for alignment reasons
-        if (uoffset & 1 != 0)
+        // For an unsigned short array, offset must be divisible by 2 for alignment reasons.
+        if (uoffset & 1)
             return false;
         
-        // Make uoffset an element offset
+        // Make uoffset an element offset.
         uoffset /= 2;
     
         unsigned long n = m_boundElementArrayBuffer->byteLength(GraphicsContext3D::ELEMENT_ARRAY_BUFFER) / 2;
@@ -607,7 +607,7 @@ bool WebGLRenderingContext::validateIndexArray(unsigned long count, unsigned lon
         }
     }    
         
-    // Then set the last index in the index array and make sure it is valid
+    // Then set the last index in the index array and make sure it is valid.
     numElements = lastIndex + 1;
     return numElements > 0;
 }

-- 
WebKit Debian packaging