Changeset 53536 in webkit
- Timestamp:
- Jan 20, 2010 2:23:02 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r53533 r53536 1 2010-01-20 Daniel Bates <dbates@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 https://bugs.webkit.org/show_bug.cgi?id=33885 6 7 Fixes style errors exposed by the style bot in the patch 8 for bug #33770. Moreover, fixes all style errors reported 9 by check-webkit-style. 10 11 No functionality was changed. So, no new tests. 12 13 * bindings/js/JSWebGLRenderingContextCustom.cpp: 14 (WebCore::dataFunctionf): 15 (WebCore::dataFunctioni): 16 (WebCore::dataFunctionMatrix): 17 1 18 2010-01-19 Steve Block <steveblock@google.com> 2 19 -
trunk/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
r53509 r53536 30 30 #include "JSWebGLRenderingContext.h" 31 31 32 #include "WebGLRenderingContext.h"33 32 #include "ExceptionCode.h" 34 33 #include "HTMLCanvasElement.h" … … 52 51 #include "NotImplemented.h" 53 52 #include "WebGLBuffer.h" 54 #include "WebGLGetInfo.h"55 53 #include "WebGLFloatArray.h" 56 54 #include "WebGLFramebuffer.h" 55 #include "WebGLGetInfo.h" 57 56 #include "WebGLIntArray.h" 58 57 #include "WebGLProgram.h" 58 #include "WebGLRenderingContext.h" 59 59 #include <runtime/Error.h> 60 60 #include <wtf/FastMalloc.h> … … 571 571 ExceptionCode ec = 0; 572 572 if (webGLArray) { 573 switch(f) { 574 case f_uniform1v: context->uniform1fv(location, webGLArray.get(), ec); break; 575 case f_uniform2v: context->uniform2fv(location, webGLArray.get(), ec); break; 576 case f_uniform3v: context->uniform3fv(location, webGLArray.get(), ec); break; 577 case f_uniform4v: context->uniform4fv(location, webGLArray.get(), ec); break; 578 case f_vertexAttrib1v: context->vertexAttrib1fv(index, webGLArray.get()); break; 579 case f_vertexAttrib2v: context->vertexAttrib2fv(index, webGLArray.get()); break; 580 case f_vertexAttrib3v: context->vertexAttrib3fv(index, webGLArray.get()); break; 581 case f_vertexAttrib4v: context->vertexAttrib4fv(index, webGLArray.get()); break; 573 switch (f) { 574 case f_uniform1v: 575 context->uniform1fv(location, webGLArray.get(), ec); 576 break; 577 case f_uniform2v: 578 context->uniform2fv(location, webGLArray.get(), ec); 579 break; 580 case f_uniform3v: 581 context->uniform3fv(location, webGLArray.get(), ec); 582 break; 583 case f_uniform4v: 584 context->uniform4fv(location, webGLArray.get(), ec); 585 break; 586 case f_vertexAttrib1v: 587 context->vertexAttrib1fv(index, webGLArray.get()); 588 break; 589 case f_vertexAttrib2v: 590 context->vertexAttrib2fv(index, webGLArray.get()); 591 break; 592 case f_vertexAttrib3v: 593 context->vertexAttrib3fv(index, webGLArray.get()); 594 break; 595 case f_vertexAttrib4v: 596 context->vertexAttrib4fv(index, webGLArray.get()); 597 break; 582 598 } 583 599 … … 591 607 592 608 switch (f) { 593 case f_uniform1v: context->uniform1fv(location, array.data(), array.size(), ec); break; 594 case f_uniform2v: context->uniform2fv(location, array.data(), array.size(), ec); break; 595 case f_uniform3v: context->uniform3fv(location, array.data(), array.size(), ec); break; 596 case f_uniform4v: context->uniform4fv(location, array.data(), array.size(), ec); break; 597 case f_vertexAttrib1v: context->vertexAttrib1fv(index, array.data(), array.size()); break; 598 case f_vertexAttrib2v: context->vertexAttrib2fv(index, array.data(), array.size()); break; 599 case f_vertexAttrib3v: context->vertexAttrib3fv(index, array.data(), array.size()); break; 600 case f_vertexAttrib4v: context->vertexAttrib4fv(index, array.data(), array.size()); break; 609 case f_uniform1v: 610 context->uniform1fv(location, array.data(), array.size(), ec); 611 break; 612 case f_uniform2v: 613 context->uniform2fv(location, array.data(), array.size(), ec); 614 break; 615 case f_uniform3v: 616 context->uniform3fv(location, array.data(), array.size(), ec); 617 break; 618 case f_uniform4v: 619 context->uniform4fv(location, array.data(), array.size(), ec); 620 break; 621 case f_vertexAttrib1v: 622 context->vertexAttrib1fv(index, array.data(), array.size()); 623 break; 624 case f_vertexAttrib2v: 625 context->vertexAttrib2fv(index, array.data(), array.size()); 626 break; 627 case f_vertexAttrib3v: 628 context->vertexAttrib3fv(index, array.data(), array.size()); 629 break; 630 case f_vertexAttrib4v: 631 context->vertexAttrib4fv(index, array.data(), array.size()); 632 break; 601 633 } 602 634 … … 621 653 ExceptionCode ec = 0; 622 654 if (webGLArray) { 623 switch(f) { 624 case f_uniform1v: context->uniform1iv(location, webGLArray.get(), ec); break; 625 case f_uniform2v: context->uniform2iv(location, webGLArray.get(), ec); break; 626 case f_uniform3v: context->uniform3iv(location, webGLArray.get(), ec); break; 627 case f_uniform4v: context->uniform4iv(location, webGLArray.get(), ec); break; 628 default: break; 655 switch (f) { 656 case f_uniform1v: 657 context->uniform1iv(location, webGLArray.get(), ec); 658 break; 659 case f_uniform2v: 660 context->uniform2iv(location, webGLArray.get(), ec); 661 break; 662 case f_uniform3v: 663 context->uniform3iv(location, webGLArray.get(), ec); 664 break; 665 case f_uniform4v: 666 context->uniform4iv(location, webGLArray.get(), ec); 667 break; 668 default: 669 break; 629 670 } 630 671 … … 639 680 640 681 switch (f) { 641 case f_uniform1v: context->uniform1iv(location, array.data(), array.size(), ec); break; 642 case f_uniform2v: context->uniform2iv(location, array.data(), array.size(), ec); break; 643 case f_uniform3v: context->uniform3iv(location, array.data(), array.size(), ec); break; 644 case f_uniform4v: context->uniform4iv(location, array.data(), array.size(), ec); break; 645 default: break; 682 case f_uniform1v: 683 context->uniform1iv(location, array.data(), array.size(), ec); 684 break; 685 case f_uniform2v: 686 context->uniform2iv(location, array.data(), array.size(), ec); 687 break; 688 case f_uniform3v: 689 context->uniform3iv(location, array.data(), array.size(), ec); 690 break; 691 case f_uniform4v: 692 context->uniform4iv(location, array.data(), array.size(), ec); 693 break; 694 default: 695 break; 646 696 } 647 697 … … 670 720 ExceptionCode ec = 0; 671 721 if (webGLArray) { 672 switch(f) { 673 case f_uniformMatrix2fv: context->uniformMatrix2fv(location, transpose, webGLArray.get(), ec); break; 674 case f_uniformMatrix3fv: context->uniformMatrix3fv(location, transpose, webGLArray.get(), ec); break; 675 case f_uniformMatrix4fv: context->uniformMatrix4fv(location, transpose, webGLArray.get(), ec); break; 722 switch (f) { 723 case f_uniformMatrix2fv: 724 context->uniformMatrix2fv(location, transpose, webGLArray.get(), ec); 725 break; 726 case f_uniformMatrix3fv: 727 context->uniformMatrix3fv(location, transpose, webGLArray.get(), ec); 728 break; 729 case f_uniformMatrix4fv: 730 context->uniformMatrix4fv(location, transpose, webGLArray.get(), ec); 731 break; 676 732 } 677 733 … … 685 741 686 742 switch (f) { 687 case f_uniformMatrix2fv: context->uniformMatrix2fv(location, transpose, array.data(), array.size(), ec); break; 688 case f_uniformMatrix3fv: context->uniformMatrix3fv(location, transpose, array.data(), array.size(), ec); break; 689 case f_uniformMatrix4fv: context->uniformMatrix4fv(location, transpose, array.data(), array.size(), ec); break; 743 case f_uniformMatrix2fv: 744 context->uniformMatrix2fv(location, transpose, array.data(), array.size(), ec); 745 break; 746 case f_uniformMatrix3fv: 747 context->uniformMatrix3fv(location, transpose, array.data(), array.size(), ec); 748 break; 749 case f_uniformMatrix4fv: 750 context->uniformMatrix4fv(location, transpose, array.data(), array.size(), ec); 751 break; 690 752 } 691 753
Note: See TracChangeset
for help on using the changeset viewer.