Remove unused WebVideoFrame::Format values

https://bugs.webkit.org/show_bug.cgi?id=83625

Reviewed by Kenneth Russell.

Source/WebCore:

Covered by existing tests.

* platform/graphics/chromium/VideoFrameChromium.h:
* platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
(WebCore::convertVFCFormatToGC3DFormat):

Source/WebKit/chromium:

* public/WebVideoFrame.h:
(WebKit):
* src/AssertMatchingEnums.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 391627a..417c4ae 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-11  Ami Fischman  <fischman@chromium.org>
+
+        Remove unused WebVideoFrame::Format values
+        https://bugs.webkit.org/show_bug.cgi?id=83625
+
+        Reviewed by Kenneth Russell.
+
+        Covered by existing tests.
+
+        * platform/graphics/chromium/VideoFrameChromium.h:
+        * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
+        (WebCore::convertVFCFormatToGC3DFormat):
+
 2012-04-11  Pavel Feldman  <pfeldman@chromium.org>
 
         Web Inspector: extracting NetworkRequest from Resource (step 1)

diff --git a/Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h b/Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h
index 2d76c47..77af07c 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h
+++ b/Source/WebCore/platform/graphics/chromium/VideoFrameChromium.h
@@ -48,19 +48,13 @@ public:
 
     // These enums must be kept in sync with WebKit::WebVideoFrame.
     enum Format {
-        Invalid,
-        RGB555,
-        RGB565,
-        RGB24,
-        RGB32,
-        RGBA,
-        YV12,
-        YV16,
-        NV12,
-        Empty,
-        ASCII,
-        I420,
-        NativeTexture,
+        Invalid = 0,
+        RGB32 = 4,
+        YV12 = 6,
+        YV16 = 7,
+        Empty = 9,
+        I420 = 11,
+        NativeTexture = 12,
     };
 
     virtual ~VideoFrameChromium();

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
index a56cf58..0e6dca7 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
@@ -106,18 +106,11 @@ static GC3Denum convertVFCFormatToGC3DFormat(const VideoFrameChromium* frame)
     case VideoFrameChromium::YV12:
     case VideoFrameChromium::YV16:
         return GraphicsContext3D::LUMINANCE;
-    case VideoFrameChromium::RGBA:
-        return GraphicsContext3D::RGBA;
     case VideoFrameChromium::NativeTexture:
         return frame->textureTarget();
     case VideoFrameChromium::Invalid:
-    case VideoFrameChromium::RGB555:
-    case VideoFrameChromium::RGB565:
-    case VideoFrameChromium::RGB24:
     case VideoFrameChromium::RGB32:
-    case VideoFrameChromium::NV12:
     case VideoFrameChromium::Empty:
-    case VideoFrameChromium::ASCII:
     case VideoFrameChromium::I420:
         notImplemented();
     }

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 0706b76..d019262 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-11  Ami Fischman  <fischman@chromium.org>
+
+        Remove unused WebVideoFrame::Format values
+        https://bugs.webkit.org/show_bug.cgi?id=83625
+
+        Reviewed by Kenneth Russell.
+
+        * public/WebVideoFrame.h:
+        (WebKit):
+        * src/AssertMatchingEnums.cpp:
+
 2012-04-11  'Pavel Feldman'  <pfeldman@chromium.org>
 
         Follow up to r113863: fix chromium inspector interactive test harness.

diff --git a/Source/WebKit/chromium/public/WebVideoFrame.h b/Source/WebKit/chromium/public/WebVideoFrame.h
index 7879062..4fab1f2 100644 (file)
--- a/Source/WebKit/chromium/public/WebVideoFrame.h
+++ b/Source/WebKit/chromium/public/WebVideoFrame.h
@@ -35,22 +35,17 @@ namespace WebKit {
 
 // A proxy video frame interface to communicate frame data between chromium
 // and WebKit.
+// Keep in sync with VideoFrameChromium and chromium's media::VideoFrame::Format.
 class WebVideoFrame {
 public:
     enum Format {
-        FormatInvalid,
-        FormatRGB555,
-        FormatRGB565,
-        FormatRGB24,
-        FormatRGB32,
-        FormatRGBA,
-        FormatYV12,
-        FormatYV16,
-        FormatNV12,
-        FormatEmpty,
-        FormatASCII,
-        FormatI420,
-        FormatNativeTexture,
+        FormatInvalid = 0,
+        FormatRGB32 = 4,
+        FormatYV12 = 6,
+        FormatYV16 = 7,
+        FormatEmpty = 9,
+        FormatI420 = 11,
+        FormatNativeTexture = 12,
     };
 
     virtual ~WebVideoFrame() { }

diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
index bf8069a..293f489 100644 (file)
--- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -395,16 +395,10 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::KeySystemNotSupported, MediaPlayer:
 #endif
 
 COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatInvalid, VideoFrameChromium::Invalid);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatRGB555, VideoFrameChromium::RGB555);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatRGB565, VideoFrameChromium::RGB565);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatRGB24, VideoFrameChromium::RGB24);
 COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatRGB32, VideoFrameChromium::RGB32);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatRGBA, VideoFrameChromium::RGBA);
 COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatYV12, VideoFrameChromium::YV12);
 COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatYV16, VideoFrameChromium::YV16);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatNV12, VideoFrameChromium::NV12);
 COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatEmpty, VideoFrameChromium::Empty);
-COMPILE_ASSERT_MATCHING_ENUM(WebVideoFrame::FormatASCII, VideoFrameChromium::ASCII);
 #endif
 
 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)