Changeset 60881 in webkit

Timestamp:

Jun 8, 2010 10:23:23 PM (14 years ago)

Author:

rolandsteiner@chromium.org

Message:

2010-06-08 Roland Steiner <​rolandsteiner@chromium.org>

Unreviewed build fix

Bug 38145 - Validate *tex* functions input parameters according to ES2 conformance
​https://bugs.webkit.org/show_bug.cgi?id=38145
​https://bugs.webkit.org/show_bug.cgi?id=40346

Fix for 38145 broke the build ('log2 not found' on Windows),
the fix from 40346 also didn't catch ('log ambiguous').

2nd quick fix: add explicit casts to double and use double constants.

No new tests.

• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::validateTexFuncParameters):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContext.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-08  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Unreviewed build fix
+
+        Bug 38145 - Validate *tex* functions input parameters according to ES2 conformance
+        https://bugs.webkit.org/show_bug.cgi?id=38145
+        https://bugs.webkit.org/show_bug.cgi?id=40346
+
+        Fix for 38145 broke the build ('log2 not found' on Windows),
+        the fix from 40346 also didn't catch ('log ambiguous').
+
+        2nd quick fix: add explicit casts to double and use double constants.
+
+        No new tests.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::validateTexFuncParameters):
+
 2010-05-18  Yuzo Fujishima  <yuzo@google.com>
 

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -3225 +3225 @@
     switch (target) {
     case GraphicsContext3D::TEXTURE_2D:
-        if (width > m_maxTextureSize || height > m_maxTextureSize || level > log(m_maxTextureSize) / log(2)) {
+        if (width > m_maxTextureSize ||
+            height > m_maxTextureSize ||
+            level > log(static_cast<double>(m_maxTextureSize)) / log(2.0)) {
             m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE);
             return false;
@@ -3236 +3238 @@
     case GraphicsContext3D::TEXTURE_CUBE_MAP_POSITIVE_Z:
     case GraphicsContext3D::TEXTURE_CUBE_MAP_NEGATIVE_Z:
-        if (width != height || width > m_maxCubeMapTextureSize || level > log(m_maxCubeMapTextureSize) / log(2)) {
+        if (width != height ||
+            width > m_maxCubeMapTextureSize ||
+            level > log(static_cast<double>(m_maxCubeMapTextureSize)) / log(2.0)) {
             m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE);
             return false;