[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[hclam at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit e97883b275d669381d5dd59f605365b8b00bd368
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 01:18:59 2010 +0000

    Unreviewed. Build fix.
    
    Reorder member declarations and fix other warnings.
    
    * platform/graphics/chromium/VideoLayerChromium.cpp:
    (WebCore::VideoLayerChromium::VideoLayerChromium):
    (WebCore::VideoLayerChromium::~VideoLayerChromium):
    (WebCore::VideoLayerChromium::updateContents):
    (WebCore::VideoLayerChromium::determineTextureFormat):
    (WebCore::VideoLayerChromium::allocateTexturesIfNeeded):
    * platform/graphics/chromium/VideoLayerChromium.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68464 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 97203b2..8a01298 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-27  Alpha Lam  <hclam at chromium.org>
+
+        Unreviewed. Build fix.
+
+        Reorder member declarations and fix other warnings.
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::VideoLayerChromium):
+        (WebCore::VideoLayerChromium::~VideoLayerChromium):
+        (WebCore::VideoLayerChromium::updateContents):
+        (WebCore::VideoLayerChromium::determineTextureFormat):
+        (WebCore::VideoLayerChromium::allocateTexturesIfNeeded):
+        * platform/graphics/chromium/VideoLayerChromium.h:
+
 2010-09-27  Kenneth Russell  <kbr at google.com>
 
         Unreviewed, Qt build fix. Stub out CanvasRenderingContext::checkOrigin(const HTMLVideoElement*)
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 71761b7..26641a9 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -176,7 +176,7 @@ VideoLayerChromium::VideoLayerChromium(GraphicsLayerChromium* owner, VideoFrameP
     , m_frameFormat(VideoFrameChromium::Invalid)
     , m_provider(provider)
 {
-    for (int plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
+    for (unsigned plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
         m_textures[plane] = 0;
         m_textureSizes[plane] = IntSize();
         m_frameSizes[plane] = IntSize();
@@ -186,7 +186,7 @@ VideoLayerChromium::VideoLayerChromium(GraphicsLayerChromium* owner, VideoFrameP
 VideoLayerChromium::~VideoLayerChromium()
 {
     GraphicsContext3D* context = layerRendererContext();
-    for (int plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
+    for (unsigned plane = 0; plane < VideoFrameChromium::maxPlanes; plane++) {
         if (m_textures[plane])
             GLC(context, context->deleteTexture(m_textures[plane]));
     }
@@ -229,7 +229,7 @@ void VideoLayerChromium::updateContents()
     }
 
     // Update texture planes.
-    for (int plane = 0; plane < frame->planes(); plane++) {
+    for (unsigned plane = 0; plane < frame->planes(); plane++) {
         ASSERT(frame->requiredTextureSize(plane) == m_textureSizes[plane]);
         updateTexture(context, m_textures[plane], frame->requiredTextureSize(plane), textureFormat, frame->data(plane));
     }
@@ -246,6 +246,8 @@ unsigned VideoLayerChromium::determineTextureFormat(VideoFrameChromium* frame)
         return GraphicsContext3D::LUMINANCE;
     case VideoFrameChromium::RGBA:
         return GraphicsContext3D::RGBA;
+    default:
+        break;
     }
     return GraphicsContext3D::INVALID_VALUE;
 }
@@ -255,7 +257,7 @@ bool VideoLayerChromium::allocateTexturesIfNeeded(GraphicsContext3D* context, Vi
     ASSERT(context);
     ASSERT(frame);
 
-    for (int plane = 0; plane < frame->planes(); plane++) {
+    for (unsigned plane = 0; plane < frame->planes(); plane++) {
         IntSize planeTextureSize = frame->requiredTextureSize(plane);
 
         // If the renderer cannot handle this large of a texture, return false.
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.h b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
index 0c7bf73..620d1a7 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.h
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.h
@@ -72,14 +72,14 @@ public:
         unsigned m_yuvShaderProgram;
         unsigned m_rgbaShaderProgram;
         int m_yuvShaderMatrixLocation;
-        int m_rgbaShaderMatrixLocation;
         int m_yuvWidthScaleFactorLocation;
+        int m_rgbaShaderMatrixLocation;
         int m_rgbaWidthScaleFactorLocation;
+        int m_ccMatrixLocation;
         int m_yTextureLocation;
         int m_uTextureLocation;
         int m_vTextureLocation;
         int m_rgbaTextureLocation;
-        int m_ccMatrixLocation;
         int m_yuvAlphaLocation;
         int m_rgbaAlphaLocation;
         bool m_initialized;
@@ -98,9 +98,9 @@ private:
 
     static const float yuv2RGB[9];
 
+    bool m_skipsDraw;
     VideoFrameChromium::Format m_frameFormat;
     OwnPtr<VideoFrameProvider> m_provider;
-    bool m_skipsDraw;
     unsigned m_textures[3];
     IntSize m_textureSizes[3];
     IntSize m_frameSizes[3];

-- 
WebKit Debian packaging