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

hclam at chromium.org hclam at chromium.org
Wed Dec 22 13:50:30 UTC 2010


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

    Build fix. Not reviewed.
    
    Use if instead of switch to avoid compilation error.
    
    * src/VideoFrameChromiumImpl.cpp:
    (WebKit::VideoFrameChromiumImpl::requiredTextureSize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 07eab39..9211559 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -2,6 +2,15 @@
 
         Build fix. Not reviewed.
 
+        Use if instead of switch to avoid compilation error.
+
+        * src/VideoFrameChromiumImpl.cpp:
+        (WebKit::VideoFrameChromiumImpl::requiredTextureSize):
+
+2010-09-27  Alpha Lam  <hclam at chromium.org>
+
+        Build fix. Not reviewed.
+
         Remove constant definitions from this file.
 
         * src/VideoFrameChromiumImpl.cpp:
diff --git a/WebKit/chromium/src/VideoFrameChromiumImpl.cpp b/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
index e92321b..a60fe28 100644
--- a/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
+++ b/WebKit/chromium/src/VideoFrameChromiumImpl.cpp
@@ -106,16 +106,12 @@ const IntSize VideoFrameChromiumImpl::requiredTextureSize(unsigned plane) const
     case RGBA:
         return IntSize(stride(plane), height());
     case YV12:
-        switch (plane) {
-        case yPlane:
+        if (plane == static_cast<unsigned>(yPlane))
             return IntSize(stride(plane), height());
-        case uPlane:
+        else if (plane == static_cast<unsigned>(uPlane))
             return IntSize(stride(plane), height() / 2);
-        case vPlane:
+        else if (plane == static_cast<unsigned>(vPlane))
             return IntSize(stride(plane), height() / 2);
-        default:
-            break;
-        }
     default:
         break;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list