Backed out changeset 409e327b69c7 (bug 1288618)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 15 Sep 2016 16:34:04 +0200
changeset 355374 23a99e45a5d87e9c22e9c3e890ccdacf3eb35e0c
parent 355373 a665d0287143b560baae15925fd14da3aae42f4a
child 355375 d3daabe53a7121b16a6b2171dacca1d0052db84c
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1288618
milestone51.0a1
backs out409e327b69c7b2250453175aaa6d582acf56f378
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 409e327b69c7 (bug 1288618)
gfx/layers/GPUVideoImage.h
gfx/layers/ImageTypes.h
gfx/layers/moz.build
deleted file mode 100644
--- a/gfx/layers/GPUVideoImage.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef GFX_GPU_VIDEO_IMAGE_H
-#define GFX_GPU_VIDEO_IMAGE_H
-
-#include "mozilla/RefPtr.h"
-#include "ImageContainer.h"
-#include "mozilla/layers/GPUVideoTextureClient.h"
-#include "mozilla/layers/CompositableClient.h"
-#include "mozilla/layers/ImageBridgeChild.h"
-
-namespace mozilla {
-namespace layers {
-
-// Image class that refers to a decoded video frame within
-// the GPU process.
-class GPUVideoImage final : public Image {
-public:
-  GPUVideoImage(const SurfaceDescriptorGPUVideo& aSD,
-                const gfx::IntSize& aSize)
-    : Image(nullptr, ImageFormat::GPU_VIDEO)
-    , mSize(aSize)
-  {
-    // Create the TextureClient immediately since the GPUVideoTextureData
-    // is responsible for deallocating the SurfaceDescriptor.
-    mTextureClient =
-      TextureClient::CreateWithData(new GPUVideoTextureData(aSD, aSize),
-                                    TextureFlags::DEFAULT,
-                                    ImageBridgeChild::GetSingleton().get());
-  }
-
-  ~GPUVideoImage() override {}
-
-  gfx::IntSize GetSize() override { return mSize; }
-
-  // TODO: We really want to be able to support this, but it's complex, since we need to readback
-  // in the other process and send it across.
-  virtual already_AddRefed<gfx::SourceSurface> GetAsSourceSurface() override { return nullptr; }
-
-  virtual TextureClient* GetTextureClient(CompositableClient* aClient) override
-  {
-    MOZ_ASSERT(aClient->GetForwarder() == ImageBridgeChild::GetSingleton(), "Must only use GPUVideo on ImageBridge");
-    return mTextureClient;
-  }
-
-private:
-  gfx::IntSize mSize;
-  RefPtr<TextureClient> mTextureClient;
-};
-
-} // namepace layers
-} // namespace mozilla
-
-#endif // GFX_GPU_VIDEO_IMAGE_H
--- a/gfx/layers/ImageTypes.h
+++ b/gfx/layers/ImageTypes.h
@@ -92,23 +92,17 @@ enum class ImageFormat {
   /**
    * A share handle to a ID3D11Texture2D.
    */
   D3D11_SHARE_HANDLE_TEXTURE,
 
   /**
    * A wrapper around a drawable TextureClient.
    */
-  TEXTURE_WRAPPER,
-
-  /**
-   * An opaque handle that refers to an Image stored in the GPU
-   * process.
-   */
-  GPU_VIDEO
+  TEXTURE_WRAPPER
 };
 
 enum class StereoMode {
   MONO,
   LEFT_RIGHT,
   RIGHT_LEFT,
   BOTTOM_TOP,
   TOP_BOTTOM,
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -20,17 +20,16 @@ EXPORTS += [
     'client/ClientTiledPaintedLayer.h',
     'composite/CompositableHost.h',
     'composite/ImageHost.h',
     'CompositorTypes.h',
     'CopyableCanvasLayer.h',
     'D3D9SurfaceImage.h',
     'FrameMetrics.h',
     'GLImages.h',
-    'GPUVideoImage.h',
     'GrallocImages.h',
     'ImageContainer.h',
     'ImageLayers.h',
     'ImageTypes.h',
     'IMFYCbCrImage.h',
     'ipc/ThreadSafeRefcountingWithMainThreadDestruction.h',
     'Layers.h',
     'LayerScope.h',