[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 a3995f44c5868f96422a22226bdbf3c427da4a60
Author: hclam at chromium.org <hclam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 02:37:38 2010 +0000

    Build fix. Not reviewed.
    
    WebCore:
    
    Move constant definitions to VideoLayerChromium.cpp.
    A proper fix should come later.
    
    * platform/graphics/chromium/VideoLayerChromium.cpp:
    
    WebKit/chromium:
    
    Remove constant definitions from this file.
    
    * src/VideoFrameChromiumImpl.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68477 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9ad757..81cffa5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-27  Alpha Lam  <hclam at chromium.org>
+
+        Build fix. Not reviewed.
+
+        Move constant definitions to VideoLayerChromium.cpp.
+        A proper fix should come later.
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+
 2010-09-23  Antonio Gomes  <agomes at rim.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
index 26641a9..ed59a2d 100644
--- a/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
+++ b/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp
@@ -49,6 +49,15 @@ const float VideoLayerChromium::yuv2RGB[9] = {
     1.403f, -.714f, 0.f,
 };
 
+// FIXME: These constants should be defined in a different file.
+const unsigned VideoFrameChromium::maxPlanes = 3;
+const unsigned VideoFrameChromium::numRGBPlanes = 1;
+const unsigned VideoFrameChromium::rgbPlane = 0;
+const unsigned VideoFrameChromium::numYUVPlanes = 3;
+const unsigned VideoFrameChromium::yPlane = 0;
+const unsigned VideoFrameChromium::uPlane = 1;
+const unsigned VideoFrameChromium::vPlane = 2;
+
 VideoLayerChromium::SharedValues::SharedValues(GraphicsContext3D* context)
     : m_context(context)
     , m_yuvShaderProgram(0)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index b8f554b..07eab39 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,14 @@
 
         Build fix. Not reviewed.
 
+        Remove constant definitions from this file.
+
+        * src/VideoFrameChromiumImpl.cpp:
+
+2010-09-27  Alpha Lam  <hclam at chromium.org>
+
+        Build fix. Not reviewed.
+
         Fix warnings again.
 
         * src/VideoFrameChromiumImpl.cpp:
diff --git a/WebKit/chromium/src/VideoFrameChromiumImpl.cpp b/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
index 27c1138..e92321b 100644
--- a/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
+++ b/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
@@ -36,14 +36,6 @@
 
 using namespace WebCore;
 
-const unsigned VideoFrameChromium::maxPlanes = 3;
-const unsigned VideoFrameChromium::numRGBPlanes = 1;
-const unsigned VideoFrameChromium::rgbPlane = 0;
-const unsigned VideoFrameChromium::numYUVPlanes = 3;
-const unsigned VideoFrameChromium::yPlane = 0;
-const unsigned VideoFrameChromium::uPlane = 1;
-const unsigned VideoFrameChromium::vPlane = 2;
-
 namespace WebKit {
 
 WebVideoFrame* VideoFrameChromiumImpl::toWebVideoFrame(VideoFrameChromium* videoFrame)

-- 
WebKit Debian packaging