Remove VideoLayer and LayerCompositor APIs.

These were never implemented.

BUG=

Review URL: https://codereview.chromium.org/11036012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159775 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 4 insertions, 647 deletions

diff --git a/ppapi/api/dev/ppb_video_layer_dev.idl b/ppapi/api/dev/ppb_video_layer_dev.idl
deleted file mode 100644
index fb6ccfc..0000000
--- a/ppapi/api/dev/ppb_video_layer_dev.idl
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/**
- * This file defines the <code>PPB_VideoDecoder_Dev</code> interface.
- */
-label Chrome {
-  M14 = 0.1
-};
-
-/**
- * Enumeration for pixel format of the video layer.
- */
-[assert_size(4)]
-enum PP_VideoLayerPixelFormat_Dev {
-  PP_VIDEOLAYERPIXELFORMAT_RGBA = 0,
-  PP_VIDEOLAYERPIXELFORMAT_YV12 = 1
-};
-
-/** TODO(hclam): Add options to customize color conversion. */
-
-/**
- * Enumeration for operation mode of the video layer.
- * PPB_VideoLayer_Dev needs to be created with one of these enums in order to
- * determine the operation mode.
- */
-[assert_size(4)]
-enum PP_VideoLayerMode_Dev {
-  /**
-   * In this mode user needs to update content of the video layer manually by
-   * calling UpdateContent().
-   */
-  PP_VIDEOLAYERMODE_SOFTWARE = 0,
-
-  /**
-   * In this mode content of the video layer is updated by a hardware video
-   * decoder, calling UpdateContent() will always return PP_FALSE.
-   */
-  PP_VIDEOLAYERMODE_HARDWARE = 1
-};
-
-/**
- * PPB_VideoLayer is a mechanism to enhance rendering performance of video
- * content. Rendering is generally done by using PPB_Graphics3D or
- * PPB_Graphics2D, however for video content it is redundant to go through
- * PPB_Graphics3D or PPB_Graphics2D. PPB_VideoLayer allows video content to be
- * rendered directly.
- *
- * PPB_VideoLayer can be used in two modes:
- *
- * Software Decoding Mode
- * In this mode the video layer needs to be updated with system memory manually
- * using UpdateContent().
- *
- * Hardware Decoding Mode
- * In this mode the content of the video layer is updated by a hardware video
- * decoder.
- */
-interface PPB_VideoLayer_Dev {
-  /**
-   * Creates a video layer.
-   */
-  PP_Resource Create(
-      [in] PP_Instance instance,
-      [in] PP_VideoLayerMode_Dev mode);
-
-  /**
-   * Returns true if the input parameter is a video layer.
-   */
-  PP_Bool IsVideoLayer(
-      [in] PP_Resource layer);
-
-  /**
-   * Set the pixel format of this video layer. By default it is RGBA.
-   *
-   * This method must be called before the video layer can be displayed.
-   *
-   * The updated size will be effective after SwapBuffers() is called.
-   */
-  void SetPixelFormat(
-      [in] PP_Resource layer,
-      [in] PP_VideoLayerPixelFormat_Dev pixel_format);
-
-  /**
-   * Set the native size of the video layer. This method must be called before
-   * the video layer can be displayed.
-   *
-   * The updated size will be effective after SwapBuffers() is called.
-   */
-  void SetNativeSize(
-      [in] PP_Resource layer,
-      [in] PP_Size size);
-
-  /**
-   * Set the clipping rectangle for this video layer relative to the native
-   * size. Only content within this rect is displayed.
-   *
-   * The clip rectangle will be effective after SwapBuffers() is called.
-   */
-  void SetClipRect(
-      [in] PP_Resource layer,
-      [in] PP_Rect clip_rect);
-
-  /**
-   * Return PP_TRUE if this video layer can be displayed. If this returns
-   * PP_FALSE it can mean that the size is unknown or the video layer doesn't
-   * have video memory allocated or not initialized.
-   */
-  PP_Bool IsReady(
-      [in] PP_Resource layer);
-
-  /**
-   * Update the content of a video layer from system memory. SetNativeSize()
-   * must be called before making this method call.
-   *
-   * NOTE: This method has no effect in hardware decoding mode.
-   *
-   * |no_of_planes| is the number of planes in |planes|.
-   * |planes| is an array of memory planes to be uploaded.
-   *
-   * Number of planes and format for planes is based on pixel format.
-   *
-   * PP_VIDEOLAYERPIXELFORMAT_RGBA:
-   *
-   * There will be one memory plane in RGBA format.
-   *
-   * planes[0] - RGBA plane, packed
-   *
-   * PP_VIDEOLAYERPIXELFORMAT_YV12:
-   *
-   * There will be three planes. In the order of Y, U and V. U and V planes
-   * are 2x2 subsampled.
-   *
-   * planes[0] - Y plane
-   * planes[1] - U plane, 2x2 subsampled
-   * planes[2] - V plane, 2x2 subsampled
-   *
-   * Return true if successful.
-   */
-  PP_Bool UpdateContent(
-      [in] PP_Resource layer,
-      [in] uint32_t no_of_planes,
-      [in, size_as=no_of_planes] mem_t[] planes);
-};
diff --git a/ppapi/c/dev/ppb_layer_compositor_dev.h b/ppapi/c/dev/ppb_layer_compositor_dev.h
deleted file mode 100644
index a42737c..0000000
--- a/ppapi/c/dev/ppb_layer_compositor_dev.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef PPAPI_C_DEV_PPB_LAYER_COMPOSITOR_DEV_H_
-#define PPAPI_C_DEV_PPB_LAYER_COMPOSITOR_DEV_H_
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_completion_callback.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_size.h"
-
-#define PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2 "PPB_LayerCompositor(Dev);0.2"
-#define PPB_LAYER_COMPOSITOR_DEV_INTERFACE \
-    PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2
-
-// PPB_LayerCompositor allows multiple layers of PPB_Surface3D and
-// PPB_VideoLayer be bound to a plugin instance.
-//
-// Use PPB_Instance's BindGraphics() to bind a PPB_LayerCompositor to the
-// instance.
-//
-// This also allows each layer to be updated seperately to avoid excessive
-// compositing.
-struct PPB_LayerCompositor_Dev_0_2 {
-  // Creates a video layer.
-  PP_Resource (*Create)(PP_Instance instance);
-
-  // Returns PP_TRUE if the input parameter is a PPB_LayerCompositor_Dev object.
-  PP_Bool (*IsLayerCompositor)(PP_Resource resource);
-
-  // Add a layer to be composited. Return PP_TRUE if |layer| is accepted.
-  //
-  // Note that after a PPB_Surface3D is added to this compositor, calling to
-  // the layer's SwapBuffer() method will have no effect.
-  PP_Bool (*AddLayer)(PP_Resource compositor, PP_Resource layer);
-
-  // Remove a layer from the compositor.
-  void (*RemoveLayer)(PP_Resource compositor, PP_Resource layer);
-
-  // Assign the z-index for |layer| for z-ordering. A layer with greater
-  // number of z-index will be placed on top.
-  void (*SetZIndex)(PP_Resource compositor, PP_Resource layer, int32_t index);
-
-  // Set the target rectangle fo the layer relative to the plugin rectangle.
-  // The layer must have already been added to the compositor.
-  //
-  // The target rectangle will be effective after SwapBuffers() is called.
-  void (*SetRect)(PP_Resource compositor, PP_Resource layer,
-                  const struct PP_Rect* rect);
-
-  // Set if this video layer is displayed. By default each layer is displayed.
-  //
-  // This setting will be effective after SwapBuffers() is called.
-  void (*SetDisplay)(PP_Resource compositor, PP_Resource layer,
-                     PP_Bool is_displayed);
-
-  // If the content of |layer| has been updated this method must be called so
-  // that the compositor is aware of the change.
-  //
-  // SwapBuffers() must be called afterwards to make changes available for
-  // display.
-  void (*MarkAsDirty)(PP_Resource compositor, PP_Resource layer);
-
-  // Changes to z-index, rectangles will be submitted for display. Also for
-  // each PPB_Surface3D and PPB_VideoLayer marked as dirty will have the
-  // updates made available for compositing.
-  //
-  // Since this is an asynchronous operation, |callback| will be called when
-  // this operation is done.
-  //
-  // Returns an error code from pp_errors.h.
-  int32_t (*SwapBuffers)(PP_Resource compositor,
-                         struct PP_CompletionCallback callback);
-};
-
-typedef struct PPB_LayerCompositor_Dev_0_2 PPB_LayerCompositor_Dev;
-
-#endif  /* PPAPI_C_DEV_PPB_LAYER_COMPOSITOR_DEV_H_ */
diff --git a/ppapi/c/dev/ppb_video_layer_dev.h b/ppapi/c/dev/ppb_video_layer_dev.h
deleted file mode 100644
index 54798a3..0000000
--- a/ppapi/c/dev/ppb_video_layer_dev.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* From dev/ppb_video_layer_dev.idl modified Wed Dec 14 18:08:00 2011. */
-
-#ifndef PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_
-#define PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_
-
-#include "ppapi/c/pp_bool.h"
-#include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_macros.h"
-#include "ppapi/c/pp_point.h"
-#include "ppapi/c/pp_rect.h"
-#include "ppapi/c/pp_resource.h"
-#include "ppapi/c/pp_size.h"
-#include "ppapi/c/pp_stdint.h"
-
-#define PPB_VIDEOLAYER_DEV_INTERFACE_0_1 "PPB_VideoLayer(Dev);0.1"
-#define PPB_VIDEOLAYER_DEV_INTERFACE PPB_VIDEOLAYER_DEV_INTERFACE_0_1
-
-/**
- * @file
- * This file defines the <code>PPB_VideoDecoder_Dev</code> interface.
- */
-
-
-/**
- * @addtogroup Enums
- * @{
- */
-/**
- * Enumeration for pixel format of the video layer.
- */
-typedef enum {
-  PP_VIDEOLAYERPIXELFORMAT_RGBA = 0,
-  PP_VIDEOLAYERPIXELFORMAT_YV12 = 1
-} PP_VideoLayerPixelFormat_Dev;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoLayerPixelFormat_Dev, 4);
-
-/** TODO(hclam): Add options to customize color conversion. */
-/**
- * Enumeration for operation mode of the video layer.
- * PPB_VideoLayer_Dev needs to be created with one of these enums in order to
- * determine the operation mode.
- */
-typedef enum {
-  /**
-   * In this mode user needs to update content of the video layer manually by
-   * calling UpdateContent().
-   */
-  PP_VIDEOLAYERMODE_SOFTWARE = 0,
-  /**
-   * In this mode content of the video layer is updated by a hardware video
-   * decoder, calling UpdateContent() will always return PP_FALSE.
-   */
-  PP_VIDEOLAYERMODE_HARDWARE = 1
-} PP_VideoLayerMode_Dev;
-PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_VideoLayerMode_Dev, 4);
-/**
- * @}
- */
-
-/**
- * @addtogroup Interfaces
- * @{
- */
-/**
- * PPB_VideoLayer is a mechanism to enhance rendering performance of video
- * content. Rendering is generally done by using PPB_Graphics3D or
- * PPB_Graphics2D, however for video content it is redundant to go through
- * PPB_Graphics3D or PPB_Graphics2D. PPB_VideoLayer allows video content to be
- * rendered directly.
- *
- * PPB_VideoLayer can be used in two modes:
- *
- * Software Decoding Mode
- * In this mode the video layer needs to be updated with system memory manually
- * using UpdateContent().
- *
- * Hardware Decoding Mode
- * In this mode the content of the video layer is updated by a hardware video
- * decoder.
- */
-struct PPB_VideoLayer_Dev_0_1 {
-  /**
-   * Creates a video layer.
-   */
-  PP_Resource (*Create)(PP_Instance instance, PP_VideoLayerMode_Dev mode);
-  /**
-   * Returns true if the input parameter is a video layer.
-   */
-  PP_Bool (*IsVideoLayer)(PP_Resource layer);
-  /**
-   * Set the pixel format of this video layer. By default it is RGBA.
-   *
-   * This method must be called before the video layer can be displayed.
-   *
-   * The updated size will be effective after SwapBuffers() is called.
-   */
-  void (*SetPixelFormat)(PP_Resource layer,
-                         PP_VideoLayerPixelFormat_Dev pixel_format);
-  /**
-   * Set the native size of the video layer. This method must be called before
-   * the video layer can be displayed.
-   *
-   * The updated size will be effective after SwapBuffers() is called.
-   */
-  void (*SetNativeSize)(PP_Resource layer, const struct PP_Size* size);
-  /**
-   * Set the clipping rectangle for this video layer relative to the native
-   * size. Only content within this rect is displayed.
-   *
-   * The clip rectangle will be effective after SwapBuffers() is called.
-   */
-  void (*SetClipRect)(PP_Resource layer, const struct PP_Rect* clip_rect);
-  /**
-   * Return PP_TRUE if this video layer can be displayed. If this returns
-   * PP_FALSE it can mean that the size is unknown or the video layer doesn't
-   * have video memory allocated or not initialized.
-   */
-  PP_Bool (*IsReady)(PP_Resource layer);
-  /**
-   * Update the content of a video layer from system memory. SetNativeSize()
-   * must be called before making this method call.
-   *
-   * NOTE: This method has no effect in hardware decoding mode.
-   *
-   * |no_of_planes| is the number of planes in |planes|.
-   * |planes| is an array of memory planes to be uploaded.
-   *
-   * Number of planes and format for planes is based on pixel format.
-   *
-   * PP_VIDEOLAYERPIXELFORMAT_RGBA:
-   *
-   * There will be one memory plane in RGBA format.
-   *
-   * planes[0] - RGBA plane, packed
-   *
-   * PP_VIDEOLAYERPIXELFORMAT_YV12:
-   *
-   * There will be three planes. In the order of Y, U and V. U and V planes
-   * are 2x2 subsampled.
-   *
-   * planes[0] - Y plane
-   * planes[1] - U plane, 2x2 subsampled
-   * planes[2] - V plane, 2x2 subsampled
-   *
-   * Return true if successful.
-   */
-  PP_Bool (*UpdateContent)(PP_Resource layer,
-                           uint32_t no_of_planes,
-                           const void* planes[]);
-};
-
-typedef struct PPB_VideoLayer_Dev_0_1 PPB_VideoLayer_Dev;
-/**
- * @}
- */
-
-#endif  /* PPAPI_C_DEV_PPB_VIDEO_LAYER_DEV_H_ */
-
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
index bd1398b..8589cdb 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
@@ -18,7 +18,6 @@
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_opengles2ext_dev.h"
 #include "ppapi/c/ppb_graphics_3d.h"
 #include "ppapi/c/ppb_opengles2.h"
@@ -211,8 +210,7 @@ const void* GetBrowserInterface(const char* interface_name) {
       PPB_OPENGLES2_FRAMEBUFFERMULTISAMPLE_INTERFACE,
       PPB_OPENGLES2_CHROMIUMENABLEFEATURE_INTERFACE,
       PPB_OPENGLES2_CHROMIUMMAPSUB_INTERFACE,
-      PPB_OPENGLES2_QUERY_INTERFACE,
-      PPB_LAYER_COMPOSITOR_DEV_INTERFACE
+      PPB_OPENGLES2_QUERY_INTERFACE
     };
     for (size_t i = 0; i < NACL_ARRAY_SIZE(disabled_interface_names); i++) {
       if (strcmp(interface_name, disabled_interface_names[i]) == 0)
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
index 9e1c189..2d38115 100644
--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* Last generated from IDL: Mon Oct  1 14:26:12 2012. */
+/* Last generated from IDL: Tue Oct  2 11:33:39 2012. */
 #include "ppapi/generators/pnacl_shim.h"
 
 #include "ppapi/c/ppb.h"
@@ -28,7 +28,6 @@
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/dev/ppb_video_capture_dev.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
-#include "ppapi/c/dev/ppb_video_layer_dev.h"
 #include "ppapi/c/dev/ppb_view_dev.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
@@ -188,7 +187,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_URLUtil_Dev_0_6;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16;
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoLayer_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_View_Dev_0_1;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Widget_Dev_0_3;
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Widget_Dev_0_4;
@@ -1924,8 +1922,6 @@ void Pnacl_M14_PPB_VideoDecoder_Dev_Destroy(PP_Resource video_decoder) {
 
 /* End wrapper methods for PPB_VideoDecoder_Dev_0_16 */
 
-/* Not generating wrapper methods for PPB_VideoLayer_Dev_0_1 */
-
 /* Not generating wrapper methods for PPB_View_Dev_0_1 */
 
 /* Not generating wrapper methods for PPB_Widget_Dev_0_3 */
@@ -3787,8 +3783,6 @@ struct PPB_VideoDecoder_Dev_0_16 Pnacl_Wrappers_PPB_VideoDecoder_Dev_0_16 = {
     .Destroy = (void (*)(PP_Resource video_decoder))&Pnacl_M14_PPB_VideoDecoder_Dev_Destroy
 };
 
-/* Not generating wrapper interface for PPB_VideoLayer_Dev_0_1 */
-
 /* Not generating wrapper interface for PPB_View_Dev_0_1 */
 
 /* Not generating wrapper interface for PPB_Widget_Dev_0_3 */
@@ -4590,12 +4584,6 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16 = {
   .real_iface = NULL
 };
 
-static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_VideoLayer_Dev_0_1 = {
-  .iface_macro = PPB_VIDEOLAYER_DEV_INTERFACE_0_1,
-  .wrapped_iface = NULL /* Still need slot for real_iface */,
-  .real_iface = NULL
-};
-
 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_View_Dev_0_1 = {
   .iface_macro = PPB_VIEW_DEV_INTERFACE_0_1,
   .wrapped_iface = NULL /* Still need slot for real_iface */,
@@ -4951,7 +4939,6 @@ static struct __PnaclWrapperInfo *s_ppb_wrappers[] = {
   &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_1,
   &Pnacl_WrapperInfo_PPB_VideoCapture_Dev_0_2,
   &Pnacl_WrapperInfo_PPB_VideoDecoder_Dev_0_16,
-  &Pnacl_WrapperInfo_PPB_VideoLayer_Dev_0_1,
   &Pnacl_WrapperInfo_PPB_View_Dev_0_1,
   &Pnacl_WrapperInfo_PPB_Widget_Dev_0_3,
   &Pnacl_WrapperInfo_PPB_Widget_Dev_0_4,
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
index 2e585b5..23659db 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_get_ppp_instance_crash.cc
@@ -12,7 +12,6 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 
 #include "ppapi/c/ppp.h"
 
diff --git a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.cc b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.cc
index c0f2540..699cd46 100644
--- a/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.cc
+++ b/ppapi/native_client/tests/ppapi_browser/bad/ppapi_bad_no_ppp_instance.cc
@@ -11,7 +11,6 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 
 #include "ppapi/c/ppp.h"
 
@@ -20,7 +19,7 @@ int32_t PPP_InitializeModule(PP_Module module_id,
   printf("PPP_InitializeModule\n");
 
   // Request an unsupported interface.
-  CHECK(NULL == get_browser_interface(PPB_LAYER_COMPOSITOR_DEV_INTERFACE));
+  CHECK(NULL == get_browser_interface("UnsupportedInterface;1.0"));
   // Request a supported interface with a bad revision number.
   CHECK(NULL == get_browser_interface("PPB_Instance;0.0"));
 
diff --git a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_bad.cc b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_bad.cc
index c0f2540..4618272 100644
--- a/ppapi/native_client/tests/ppapi_browser/manifest/manifest_bad.cc
+++ b/ppapi/native_client/tests/ppapi_browser/manifest/manifest_bad.cc
@@ -11,7 +11,6 @@
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/ppb.h"
 #include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 
 #include "ppapi/c/ppp.h"
 
@@ -20,7 +19,7 @@ int32_t PPP_InitializeModule(PP_Module module_id,
   printf("PPP_InitializeModule\n");
 
   // Request an unsupported interface.
-  CHECK(NULL == get_browser_interface(PPB_LAYER_COMPOSITOR_DEV_INTERFACE));
+  CHECK(NULL == get_browser_interface("UnimplementedInterface;1.0"));
   // Request a supported interface with a bad revision number.
   CHECK(NULL == get_browser_interface("PPB_Instance;0.0"));
 
diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
index e43870c..7832527 100644
--- a/ppapi/ppapi_shared.gypi
+++ b/ppapi/ppapi_shared.gypi
@@ -192,8 +192,6 @@
           'thunk/ppb_input_event_thunk.cc',
           'thunk/ppb_instance_api.h',
           'thunk/ppb_instance_thunk.cc',
-          'thunk/ppb_layer_compositor_api.h',
-          'thunk/ppb_layer_compositor_thunk.cc',
           'thunk/ppb_message_loop_api.h',
           'thunk/ppb_messaging_thunk.cc',
           'thunk/ppb_mouse_cursor_thunk.cc',
@@ -229,8 +227,6 @@
           'thunk/ppb_video_capture_thunk.cc',
           'thunk/ppb_video_decoder_api.h',
           'thunk/ppb_video_decoder_thunk.cc',
-          'thunk/ppb_video_layer_api.h',
-          'thunk/ppb_video_layer_thunk.cc',
           'thunk/ppb_view_api.h',
           'thunk/ppb_view_thunk.cc',
           'thunk/ppb_websocket_api.h',
@@ -283,7 +279,6 @@
               'thunk/ppb_gles_chromium_texture_mapping_thunk.cc',
               'thunk/ppb_graphics_3d_trusted_thunk.cc',
               'thunk/ppb_image_data_trusted_thunk.cc',
-              'thunk/ppb_layer_compositor_thunk.cc',
               'thunk/ppb_printing_thunk.cc',
               'thunk/ppb_scrollbar_thunk.cc',
               'thunk/ppb_talk_private_thunk.cc',
@@ -291,7 +286,6 @@
               'thunk/ppb_url_util_thunk.cc',
               'thunk/ppb_video_capture_thunk.cc',
               'thunk/ppb_video_decoder_thunk.cc',
-              'thunk/ppb_video_layer_thunk.cc',
               'thunk/ppb_websocket_thunk.cc',
             ],
           }],
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index 7f3c809..373b9d7 100644
--- a/ppapi/proxy/resource_creation_proxy.cc
+++ b/ppapi/proxy/resource_creation_proxy.cc
@@ -351,13 +351,6 @@ PP_Resource ResourceCreationProxy::CreateVideoDecoder(
       instance, context3d_id, profile);
 }
 
-PP_Resource ResourceCreationProxy::CreateVideoLayer(
-    PP_Instance instance,
-    PP_VideoLayerMode_Dev mode) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
 PP_Resource ResourceCreationProxy::CreateWebSocket(PP_Instance instance) {
   NOTIMPLEMENTED();
   return 0;
diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h
index 714441c..7ab07e0 100644
--- a/ppapi/proxy/resource_creation_proxy.h
+++ b/ppapi/proxy/resource_creation_proxy.h
@@ -155,8 +155,6 @@ class ResourceCreationProxy : public InterfaceProxy,
       PP_Instance instance,
       PP_Resource context3d_id,
       PP_VideoDecoder_Profile profile) OVERRIDE;
-  virtual PP_Resource CreateVideoLayer(PP_Instance instance,
-                                       PP_VideoLayerMode_Dev mode) OVERRIDE;
   virtual PP_Resource CreateWebSocket(PP_Instance instance) OVERRIDE;
 #endif  // !defined(OS_NACL)
 
diff --git a/ppapi/tests/all_c_includes.h b/ppapi/tests/all_c_includes.h
index 0237f18..0cc5de6 100644
--- a/ppapi/tests/all_c_includes.h
+++ b/ppapi/tests/all_c_includes.h
@@ -23,7 +23,6 @@
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_graphics_2d_dev.h"
 #include "ppapi/c/dev/ppb_ime_input_event_dev.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppb_printing_dev.h"
 #include "ppapi/c/dev/ppb_resource_array_dev.h"
@@ -33,7 +32,6 @@
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
-#include "ppapi/c/dev/ppb_video_layer_dev.h"
 #include "ppapi/c/dev/ppb_widget_dev.h"
 #include "ppapi/c/dev/ppb_zoom_dev.h"
 #include "ppapi/c/dev/ppp_class_deprecated.h"
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h
index 4c7cd01..8998e24 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev.h
@@ -10,7 +10,6 @@
 PROXIED_API(PPB_AudioInput)
 PROXIED_API(PPB_Buffer)
 UNPROXIED_API(PPB_DirectoryReader)
-UNPROXIED_API(PPB_LayerCompositor)
 UNPROXIED_API(PPB_Scrollbar)
 PROXIED_API(PPB_VideoCapture)
 PROXIED_API(PPB_VideoDecoder)
@@ -48,8 +47,6 @@ PROXIED_IFACE(PPB_Instance, PPB_URLUTIL_DEV_INTERFACE_0_6, PPB_URLUtil_Dev_0_6)
 UNPROXIED_IFACE(PPB_Instance, PPB_ZOOM_DEV_INTERFACE_0_2, PPB_Zoom_Dev_0_2)
 PROXIED_IFACE(NoAPIName, PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE_0_1,
               PPB_KeyboardInputEvent_Dev_0_1)
-UNPROXIED_IFACE(PPB_LayerCompositor, PPB_LAYER_COMPOSITOR_DEV_INTERFACE_0_2,
-                PPB_LayerCompositor_Dev_0_2)
 PROXIED_IFACE(NoAPIName, PPB_MEMORY_DEV_INTERFACE_0_1, PPB_Memory_Dev_0_1)
 PROXIED_IFACE(NoAPIName, PPB_PRINTING_DEV_INTERFACE_0_7,
               PPB_Printing_Dev_0_7)
@@ -69,8 +66,6 @@ PROXIED_IFACE(PPB_VideoCapture, PPB_VIDEOCAPTURE_DEV_INTERFACE_0_2,
               PPB_VideoCapture_Dev_0_2)
 PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16,
               PPB_VideoDecoder_Dev_0_16)
-UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE_0_1,
-                PPB_VideoLayer_Dev_0_1)
 PROXIED_IFACE(NoAPIName, PPB_VIEW_DEV_INTERFACE_0_1,
               PPB_View_Dev_0_1)
 UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_INTERFACE_1_0,
diff --git a/ppapi/thunk/ppb_layer_compositor_api.h b/ppapi/thunk/ppb_layer_compositor_api.h
deleted file mode 100644
index 883334f..0000000
--- a/ppapi/thunk/ppb_layer_compositor_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_PPB_LAYER_COMPOSITOR_API_H_
-#define PPAPI_THUNK_PPB_LAYER_COMPOSITOR_API_H_
-
-#include "base/memory/ref_counted.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
-
-namespace ppapi {
-
-class TrackedCallback;
-
-namespace thunk {
-
-class PPB_LayerCompositor_API {
- public:
-  virtual ~PPB_LayerCompositor_API() {}
-
-  virtual PP_Bool AddLayer(PP_Resource layer) = 0;
-  virtual void RemoveLayer(PP_Resource layer) = 0;
-  virtual void SetZIndex(PP_Resource layer, int32_t index) = 0;
-  virtual void SetRect(PP_Resource layer, const PP_Rect* rect) = 0;
-  virtual void SetDisplay(PP_Resource layer, PP_Bool is_displayed) = 0;
-  virtual void MarkAsDirty(PP_Resource layer) = 0;
-  virtual int32_t SwapBuffers(scoped_refptr<TrackedCallback> callback) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_PPB_LAYER_COMPOSITOR_API_H_
diff --git a/ppapi/thunk/ppb_layer_compositor_thunk.cc b/ppapi/thunk/ppb_layer_compositor_thunk.cc
deleted file mode 100644
index 98007d3..0000000
--- a/ppapi/thunk/ppb_layer_compositor_thunk.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/dev/ppb_layer_compositor_dev.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/ppb_layer_compositor_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-PP_Resource Create(PP_Instance instance) {
-  return 0;
-}
-
-PP_Bool IsLayerCompositor(PP_Resource resource) {
-  return PP_FALSE;
-}
-
-PP_Bool AddLayer(PP_Resource compositor, PP_Resource layer) {
-  return PP_FALSE;
-}
-
-void RemoveLayer(PP_Resource compositor, PP_Resource layer) {
-}
-
-void SetZIndex(PP_Resource compositor, PP_Resource layer, int32_t index) {
-}
-
-void SetRect(PP_Resource compositor, PP_Resource layer,
-             const struct PP_Rect* rect) {
-}
-
-void SetDisplay(PP_Resource compositor, PP_Resource layer,
-                PP_Bool is_displayed) {
-}
-
-void MarkAsDirty(PP_Resource compositor, PP_Resource layer) {
-}
-
-int32_t SwapBuffers(PP_Resource compositor,
-                    struct PP_CompletionCallback callback) {
-  return PP_ERROR_NOINTERFACE;
-}
-
-const PPB_LayerCompositor_Dev g_ppb_layer_compositor_thunk = {
-  &Create,
-  &IsLayerCompositor,
-  &AddLayer,
-  &RemoveLayer,
-  &SetZIndex,
-  &SetRect,
-  &SetDisplay,
-  &MarkAsDirty,
-  &SwapBuffers,
-};
-
-}  // namespace
-
-const PPB_LayerCompositor_Dev_0_2* GetPPB_LayerCompositor_Dev_0_2_Thunk() {
-  return &g_ppb_layer_compositor_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/ppb_video_layer_api.h b/ppapi/thunk/ppb_video_layer_api.h
deleted file mode 100644
index b82506b..0000000
--- a/ppapi/thunk/ppb_video_layer_api.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_THUNK_VIDEO_LAYER_API_H_
-#define PPAPI_THUNK_VIDEO_LAYER_API_H_
-
-#include "ppapi/c/dev/ppb_video_layer_dev.h"
-
-namespace ppapi {
-namespace thunk {
-
-class PPB_VideoLayer_API {
- public:
-  virtual ~PPB_VideoLayer_API() {}
-
-  virtual void SetPixelFormat(PP_VideoLayerPixelFormat_Dev pixel_format) = 0;
-  virtual void SetNativeSize(const PP_Size* size) = 0;
-  virtual void SetClipRect(const PP_Rect* clip_rect) = 0;
-  virtual PP_Bool IsReady() = 0;
-  virtual PP_Bool UpdateContent(uint32_t no_of_planes, const void** planes) = 0;
-};
-
-}  // namespace thunk
-}  // namespace ppapi
-
-#endif  // PPAPI_THUNK_VIDEO_LAYER_API_H_
diff --git a/ppapi/thunk/ppb_video_layer_thunk.cc b/ppapi/thunk/ppb_video_layer_thunk.cc
deleted file mode 100644
index 8b97364..0000000
--- a/ppapi/thunk/ppb_video_layer_thunk.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ppapi/thunk/thunk.h"
-#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_video_layer_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-
-namespace ppapi {
-namespace thunk {
-
-namespace {
-
-typedef EnterResource<PPB_VideoLayer_API> EnterVideoLayer;
-
-PP_Resource Create(PP_Instance instance, PP_VideoLayerMode_Dev mode) {
-  EnterResourceCreation enter(instance);
-  if (enter.failed())
-    return 0;
-  return enter.functions()->CreateVideoLayer(instance, mode);
-}
-
-PP_Bool IsVideoLayer(PP_Resource resource) {
-  EnterVideoLayer enter(resource, false);
-  return PP_FromBool(enter.succeeded());
-}
-
-void SetPixelFormat(PP_Resource resource,
-                    PP_VideoLayerPixelFormat_Dev pixel_format) {
-  EnterVideoLayer enter(resource, true);
-  if (enter.succeeded())
-    enter.object()->SetPixelFormat(pixel_format);
-}
-
-void SetNativeSize(PP_Resource resource, const struct PP_Size* size) {
-  EnterVideoLayer enter(resource, true);
-  if (enter.succeeded())
-    enter.object()->SetNativeSize(size);
-}
-
-void SetClipRect(PP_Resource resource, const struct PP_Rect* clip_rect) {
-  EnterVideoLayer enter(resource, true);
-  if (enter.succeeded())
-    enter.object()->SetClipRect(clip_rect);
-}
-
-PP_Bool IsReady(PP_Resource resource) {
-  EnterVideoLayer enter(resource, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->IsReady();
-}
-
-PP_Bool UpdateContent(PP_Resource resource,
-                      uint32_t no_of_planes,
-                      const void** planes) {
-  EnterVideoLayer enter(resource, true);
-  if (enter.failed())
-    return PP_FALSE;
-  return enter.object()->UpdateContent(no_of_planes, planes);
-}
-
-const PPB_VideoLayer_Dev g_ppb_videolayer_thunk = {
-  &Create,
-  &IsVideoLayer,
-  &SetPixelFormat,
-  &SetNativeSize,
-  &SetClipRect,
-  &IsReady,
-  &UpdateContent
-};
-
-}  // namespace
-
-const PPB_VideoLayer_Dev_0_1* GetPPB_VideoLayer_Dev_0_1_Thunk() {
-  return &g_ppb_videolayer_thunk;
-}
-
-}  // namespace thunk
-}  // namespace ppapi
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index f513a60..b0e1069 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -7,7 +7,6 @@
 
 #include "ppapi/c/dev/ppb_audio_input_dev.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
-#include "ppapi/c/dev/ppb_video_layer_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
@@ -155,8 +154,6 @@ class ResourceCreationAPI {
       PP_Instance instance,
       PP_Resource context3d_id,
       PP_VideoDecoder_Profile profile) = 0;
-  virtual PP_Resource CreateVideoLayer(PP_Instance instance,
-                                       PP_VideoLayerMode_Dev mode) = 0;
   virtual PP_Resource CreateWebSocket(PP_Instance instance) = 0;
 #endif  // !defined(OS_NACL)