[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit 149a9c922b99e31f0b345e01bb620d9106b193fa
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 02:46:25 2010 +0000

    2010-01-05  Rachel Petterson  <rlp at google.com>
    
            Reviewed by Adam Barth.
    
            Matches the texImage2D and texSubImage2D functions to their
            declarations. Elminates uncessary versions of those functions.
            https://bugs.webkit.org/show_bug.cgi?id=31562
            Also bug: https://bugs.webkit.org/show_bug.cgi?id=31493
    
            * src/GraphicsContext3D.cpp:
            (WebCore::GraphicsContext3D::texImage2D):
            (WebCore::GraphicsContext3D::texSubImage2D):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52845 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c03c559..ce19dbd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-05  Rachel Petterson  <rlp at google.com>
+
+        Reviewed by Adam Barth.
+
+        Matches the texImage2D and texSubImage2D functions to their
+        declarations. Elminates uncessary versions of those functions.
+        https://bugs.webkit.org/show_bug.cgi?id=31562
+        Also bug: https://bugs.webkit.org/show_bug.cgi?id=31493
+
+        * src/GraphicsContext3D.cpp:
+        (WebCore::GraphicsContext3D::texImage2D):
+        (WebCore::GraphicsContext3D::texSubImage2D):
+
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/GraphicsContext3D.cpp b/WebKit/chromium/src/GraphicsContext3D.cpp
index 2130b49..772f966 100644
--- a/WebKit/chromium/src/GraphicsContext3D.cpp
+++ b/WebKit/chromium/src/GraphicsContext3D.cpp
@@ -1856,7 +1856,7 @@ int GraphicsContext3D::texImage2D(unsigned target,
                                   unsigned border,
                                   unsigned format,
                                   unsigned type,
-                                  WebGLArray* pixels)
+                                  void* pixels)
 {
     // FIXME: must do validation similar to JOGL's to ensure that
     // the incoming array is of the appropriate length.
@@ -1868,25 +1868,10 @@ int GraphicsContext3D::texImage2D(unsigned target,
                  border,
                  format,
                  type,
-                 pixels->baseAddress());
+                 pixels);
     return 0;
 }
 
-int GraphicsContext3D::texImage2D(unsigned target,
-                                  unsigned level,
-                                  unsigned internalformat,
-                                  unsigned width,
-                                  unsigned height,
-                                  unsigned border,
-                                  unsigned format,
-                                  unsigned type,
-                                  ImageData* pixels)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
 // Remove premultiplied alpha from color channels.
 // FIXME: this is lossy. Must retrieve original values from HTMLImageElement.
 static void unmultiplyAlpha(unsigned char* rgbaData, int numPixels)
@@ -2061,14 +2046,6 @@ int GraphicsContext3D::texImage2D(unsigned target, unsigned level, Image* image,
     return res;
 }
 
-int GraphicsContext3D::texImage2D(unsigned target, unsigned level, HTMLVideoElement* video,
-                                  bool flipY, bool premultiplyAlpha)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
 GL_SAME_METHOD_3(TexParameterf, texParameterf, unsigned, unsigned, float);
 
 GL_SAME_METHOD_3(TexParameteri, texParameteri, unsigned, unsigned, int);
@@ -2081,7 +2058,7 @@ int GraphicsContext3D::texSubImage2D(unsigned target,
                                      unsigned height,
                                      unsigned format,
                                      unsigned type,
-                                     WebGLArray* pixels)
+                                     void* pixels)
 {
     // FIXME: implement.
     notImplemented();
@@ -2092,23 +2069,6 @@ int GraphicsContext3D::texSubImage2D(unsigned target,
                                      unsigned level,
                                      unsigned xoffset,
                                      unsigned yoffset,
-                                     unsigned width,
-                                     unsigned height,
-                                     unsigned format,
-                                     unsigned type,
-                                     ImageData* pixels)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
-int GraphicsContext3D::texSubImage2D(unsigned target,
-                                     unsigned level,
-                                     unsigned xoffset,
-                                     unsigned yoffset,
-                                     unsigned width,
-                                     unsigned height,
                                      Image* image,
                                      bool flipY,
                                      bool premultiplyAlpha)
@@ -2118,21 +2078,6 @@ int GraphicsContext3D::texSubImage2D(unsigned target,
     return -1;
 }
 
-int GraphicsContext3D::texSubImage2D(unsigned target,
-                                     unsigned level,
-                                     unsigned xoffset,
-                                     unsigned yoffset,
-                                     unsigned width,
-                                     unsigned height,
-                                     HTMLVideoElement* video,
-                                     bool flipY,
-                                     bool premultiplyAlpha)
-{
-    // FIXME: implement.
-    notImplemented();
-    return -1;
-}
-
 GL_SAME_METHOD_2(Uniform1f, uniform1f, long, float)
 
 void GraphicsContext3D::uniform1fv(long location, float* v, int size)

-- 
WebKit Debian packaging