[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:21:30 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit e7e9ff7b3478ff4a4f0f8c7822f1b7508294ddcf
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 20 10:23:02 2010 +0000
2010-01-20 Daniel Bates <dbates at webkit.org>
Reviewed by Eric Seidel.
https://bugs.webkit.org/show_bug.cgi?id=33885
Fixes style errors exposed by the style bot in the patch
for bug #33770. Moreover, fixes all style errors reported
by check-webkit-style.
No functionality was changed. So, no new tests.
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::dataFunctionf):
(WebCore::dataFunctioni):
(WebCore::dataFunctionMatrix):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53536 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dcec16d..d63e92b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-01-20 Daniel Bates <dbates at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ https://bugs.webkit.org/show_bug.cgi?id=33885
+
+ Fixes style errors exposed by the style bot in the patch
+ for bug #33770. Moreover, fixes all style errors reported
+ by check-webkit-style.
+
+ No functionality was changed. So, no new tests.
+
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::dataFunctionf):
+ (WebCore::dataFunctioni):
+ (WebCore::dataFunctionMatrix):
+
2010-01-19 Steve Block <steveblock at google.com>
Reviewed by David Levin.
diff --git a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
index d8dd837..e336027 100644
--- a/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -29,7 +29,6 @@
#include "JSWebGLRenderingContext.h"
-#include "WebGLRenderingContext.h"
#include "ExceptionCode.h"
#include "HTMLCanvasElement.h"
#include "HTMLImageElement.h"
@@ -51,11 +50,12 @@
#include "JSWebKitCSSMatrix.h"
#include "NotImplemented.h"
#include "WebGLBuffer.h"
-#include "WebGLGetInfo.h"
#include "WebGLFloatArray.h"
#include "WebGLFramebuffer.h"
+#include "WebGLGetInfo.h"
#include "WebGLIntArray.h"
#include "WebGLProgram.h"
+#include "WebGLRenderingContext.h"
#include <runtime/Error.h>
#include <wtf/FastMalloc.h>
#include <wtf/OwnFastMallocPtr.h>
@@ -570,15 +570,31 @@ static JSC::JSValue dataFunctionf(DataFunctionToCall f, JSC::ExecState* exec, co
ExceptionCode ec = 0;
if (webGLArray) {
- switch(f) {
- case f_uniform1v: context->uniform1fv(location, webGLArray.get(), ec); break;
- case f_uniform2v: context->uniform2fv(location, webGLArray.get(), ec); break;
- case f_uniform3v: context->uniform3fv(location, webGLArray.get(), ec); break;
- case f_uniform4v: context->uniform4fv(location, webGLArray.get(), ec); break;
- case f_vertexAttrib1v: context->vertexAttrib1fv(index, webGLArray.get()); break;
- case f_vertexAttrib2v: context->vertexAttrib2fv(index, webGLArray.get()); break;
- case f_vertexAttrib3v: context->vertexAttrib3fv(index, webGLArray.get()); break;
- case f_vertexAttrib4v: context->vertexAttrib4fv(index, webGLArray.get()); break;
+ switch (f) {
+ case f_uniform1v:
+ context->uniform1fv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform2v:
+ context->uniform2fv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform3v:
+ context->uniform3fv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform4v:
+ context->uniform4fv(location, webGLArray.get(), ec);
+ break;
+ case f_vertexAttrib1v:
+ context->vertexAttrib1fv(index, webGLArray.get());
+ break;
+ case f_vertexAttrib2v:
+ context->vertexAttrib2fv(index, webGLArray.get());
+ break;
+ case f_vertexAttrib3v:
+ context->vertexAttrib3fv(index, webGLArray.get());
+ break;
+ case f_vertexAttrib4v:
+ context->vertexAttrib4fv(index, webGLArray.get());
+ break;
}
setDOMException(exec, ec);
@@ -590,14 +606,30 @@ static JSC::JSValue dataFunctionf(DataFunctionToCall f, JSC::ExecState* exec, co
return throwError(exec, TypeError);
switch (f) {
- case f_uniform1v: context->uniform1fv(location, array.data(), array.size(), ec); break;
- case f_uniform2v: context->uniform2fv(location, array.data(), array.size(), ec); break;
- case f_uniform3v: context->uniform3fv(location, array.data(), array.size(), ec); break;
- case f_uniform4v: context->uniform4fv(location, array.data(), array.size(), ec); break;
- case f_vertexAttrib1v: context->vertexAttrib1fv(index, array.data(), array.size()); break;
- case f_vertexAttrib2v: context->vertexAttrib2fv(index, array.data(), array.size()); break;
- case f_vertexAttrib3v: context->vertexAttrib3fv(index, array.data(), array.size()); break;
- case f_vertexAttrib4v: context->vertexAttrib4fv(index, array.data(), array.size()); break;
+ case f_uniform1v:
+ context->uniform1fv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform2v:
+ context->uniform2fv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform3v:
+ context->uniform3fv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform4v:
+ context->uniform4fv(location, array.data(), array.size(), ec);
+ break;
+ case f_vertexAttrib1v:
+ context->vertexAttrib1fv(index, array.data(), array.size());
+ break;
+ case f_vertexAttrib2v:
+ context->vertexAttrib2fv(index, array.data(), array.size());
+ break;
+ case f_vertexAttrib3v:
+ context->vertexAttrib3fv(index, array.data(), array.size());
+ break;
+ case f_vertexAttrib4v:
+ context->vertexAttrib4fv(index, array.data(), array.size());
+ break;
}
setDOMException(exec, ec);
@@ -620,12 +652,21 @@ static JSC::JSValue dataFunctioni(DataFunctionToCall f, JSC::ExecState* exec, co
ExceptionCode ec = 0;
if (webGLArray) {
- switch(f) {
- case f_uniform1v: context->uniform1iv(location, webGLArray.get(), ec); break;
- case f_uniform2v: context->uniform2iv(location, webGLArray.get(), ec); break;
- case f_uniform3v: context->uniform3iv(location, webGLArray.get(), ec); break;
- case f_uniform4v: context->uniform4iv(location, webGLArray.get(), ec); break;
- default: break;
+ switch (f) {
+ case f_uniform1v:
+ context->uniform1iv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform2v:
+ context->uniform2iv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform3v:
+ context->uniform3iv(location, webGLArray.get(), ec);
+ break;
+ case f_uniform4v:
+ context->uniform4iv(location, webGLArray.get(), ec);
+ break;
+ default:
+ break;
}
setDOMException(exec, ec);
@@ -638,11 +679,20 @@ static JSC::JSValue dataFunctioni(DataFunctionToCall f, JSC::ExecState* exec, co
return throwError(exec, TypeError);
switch (f) {
- case f_uniform1v: context->uniform1iv(location, array.data(), array.size(), ec); break;
- case f_uniform2v: context->uniform2iv(location, array.data(), array.size(), ec); break;
- case f_uniform3v: context->uniform3iv(location, array.data(), array.size(), ec); break;
- case f_uniform4v: context->uniform4iv(location, array.data(), array.size(), ec); break;
- default: break;
+ case f_uniform1v:
+ context->uniform1iv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform2v:
+ context->uniform2iv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform3v:
+ context->uniform3iv(location, array.data(), array.size(), ec);
+ break;
+ case f_uniform4v:
+ context->uniform4iv(location, array.data(), array.size(), ec);
+ break;
+ default:
+ break;
}
setDOMException(exec, ec);
@@ -669,10 +719,16 @@ static JSC::JSValue dataFunctionMatrix(DataFunctionMatrixToCall f, JSC::ExecStat
ExceptionCode ec = 0;
if (webGLArray) {
- switch(f) {
- case f_uniformMatrix2fv: context->uniformMatrix2fv(location, transpose, webGLArray.get(), ec); break;
- case f_uniformMatrix3fv: context->uniformMatrix3fv(location, transpose, webGLArray.get(), ec); break;
- case f_uniformMatrix4fv: context->uniformMatrix4fv(location, transpose, webGLArray.get(), ec); break;
+ switch (f) {
+ case f_uniformMatrix2fv:
+ context->uniformMatrix2fv(location, transpose, webGLArray.get(), ec);
+ break;
+ case f_uniformMatrix3fv:
+ context->uniformMatrix3fv(location, transpose, webGLArray.get(), ec);
+ break;
+ case f_uniformMatrix4fv:
+ context->uniformMatrix4fv(location, transpose, webGLArray.get(), ec);
+ break;
}
setDOMException(exec, ec);
@@ -684,9 +740,15 @@ static JSC::JSValue dataFunctionMatrix(DataFunctionMatrixToCall f, JSC::ExecStat
return throwError(exec, TypeError);
switch (f) {
- case f_uniformMatrix2fv: context->uniformMatrix2fv(location, transpose, array.data(), array.size(), ec); break;
- case f_uniformMatrix3fv: context->uniformMatrix3fv(location, transpose, array.data(), array.size(), ec); break;
- case f_uniformMatrix4fv: context->uniformMatrix4fv(location, transpose, array.data(), array.size(), ec); break;
+ case f_uniformMatrix2fv:
+ context->uniformMatrix2fv(location, transpose, array.data(), array.size(), ec);
+ break;
+ case f_uniformMatrix3fv:
+ context->uniformMatrix3fv(location, transpose, array.data(), array.size(), ec);
+ break;
+ case f_uniformMatrix4fv:
+ context->uniformMatrix4fv(location, transpose, array.data(), array.size(), ec);
+ break;
}
setDOMException(exec, ec);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list