Bug 858914 - Basic backend for the new textures. r=mattwoodrow

gfx/layers/basic/BasicCompositor.cpp

@@ -9,6 +9,7 @@
 #include "mozilla/layers/YCbCrImageDataSerializer.h"
 #include "nsIWidget.h"
 #include "gfx2DGlue.h"
+#include "mozilla/gfx/2D.h"
 #include "gfxUtils.h"
 #include <algorithm>
 
@@ -27,6 +28,46 @@ public:
   virtual gfx::SourceSurface* GetSurface() = 0;
 };
 
+class DataTextureSourceBasic : public DataTextureSource
+                             , public TextureSourceBasic
+{
+public:
+
+  virtual TextureSourceBasic* AsSourceBasic() MOZ_OVERRIDE { return this; }
+
+  virtual gfx::SourceSurface* GetSurface() MOZ_OVERRIDE { return mSurface; }
+
+  SurfaceFormat GetFormat() const MOZ_OVERRIDE
+  {
+    return mSurface->GetFormat();
+  }
+
+  virtual IntSize GetSize() const MOZ_OVERRIDE
+  {
+    return mSurface->GetSize();
+  }
+
+  virtual bool Update(gfx::DataSourceSurface* aSurface,
+                      TextureFlags aFlags,
+                      nsIntRegion* aDestRegion = nullptr,
+                      gfx::IntPoint* aSrcOffset = nullptr) MOZ_OVERRIDE
+  {
+    // XXX - For this to work with IncrementalContentHost we will need to support
+    // the aDestRegion and aSrcOffset parameters properly;
+    mSurface = aSurface;
+    return true;
+  }
+
+  virtual void DeallocateDeviceData() MOZ_OVERRIDE
+  {
+    mSurface = nullptr;
+    SetUpdateSerial(0);
+  }
+
+public:
+  RefPtr<gfx::DataSourceSurface> mSurface;
+};
+
 /**
  * Texture source and host implementaion for software compositing.
  */
@@ -34,6 +75,12 @@ class DeprecatedTextureHostBasic : public DeprecatedTextureHost
                                  , public TextureSourceBasic
 {
 public:
+  DeprecatedTextureHostBasic()
+  : mCompositor(nullptr)
+  {}
+
+  SurfaceFormat GetFormat() const MOZ_OVERRIDE { return mFormat; }
+
   virtual IntSize GetSize() const MOZ_OVERRIDE { return mSize; }
 
   virtual TextureSourceBasic* AsSourceBasic() MOZ_OVERRIDE { return this; }
@@ -88,6 +135,7 @@ protected:
   nsRefPtr<gfxImageSurface> mThebesImage;
   nsRefPtr<gfxASurface> mThebesSurface;
   IntSize mSize;
+  SurfaceFormat mFormat;
 };
 
 void
@@ -231,6 +279,19 @@ BasicCompositor::CreateRenderTargetFromSource(const IntRect &aRect,
   return rt.forget();
 }
 
+TemporaryRef<DataTextureSource>
+BasicCompositor::CreateDataTextureSource(TextureFlags aFlags)
+{
+  RefPtr<DataTextureSource> result = new DataTextureSourceBasic();
+  return result.forget();
+}
+
+bool
+BasicCompositor::SupportsEffect(EffectTypes aEffect)
+{
+  return static_cast<EffectTypes>(aEffect) != EFFECT_YCBCR;
+}
+
 static void
 DrawSurfaceWithTextureCoords(DrawTarget *aDest,
                              const gfx::Rect& aDestRect,

gfx/layers/basic/BasicCompositor.h

@@ -23,6 +23,12 @@ public:
 
   virtual gfx::IntSize GetSize() const MOZ_OVERRIDE { return mSize; }
 
+  virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE
+  {
+    return mDrawTarget ? mDrawTarget->GetFormat()
+                       : gfx::FORMAT_UNKNOWN;
+  }
+
   RefPtr<gfx::DrawTarget> mDrawTarget;
   gfx::IntSize mSize;
 };
@@ -39,9 +45,6 @@ public:
 
   virtual void Destroy() MOZ_OVERRIDE;
 
-  virtual TemporaryRef<DataTextureSource>
-  CreateDataTextureSource(TextureFlags aFlags = 0) MOZ_OVERRIDE { return nullptr; }
-
   virtual TextureFactoryIdentifier GetTextureFactoryIdentifier() MOZ_OVERRIDE
   {
     return TextureFactoryIdentifier(LAYERS_BASIC,
@@ -56,6 +59,11 @@ public:
   CreateRenderTargetFromSource(const gfx::IntRect &aRect,
                                const CompositingRenderTarget *aSource) MOZ_OVERRIDE;
 
+  virtual TemporaryRef<DataTextureSource>
+  CreateDataTextureSource(TextureFlags aFlags = 0) MOZ_OVERRIDE;
+
+  virtual bool SupportsEffect(EffectTypes aEffect) MOZ_OVERRIDE;
+
   virtual void SetRenderTarget(CompositingRenderTarget *aSource) MOZ_OVERRIDE
   {
     mRenderTarget = static_cast<BasicCompositingRenderTarget*>(aSource);