author | Nicolas Silva <nical@mozilla.com> |
Sun, 13 Oct 2013 17:24:12 -0700 | |
changeset 164509 | 03dfed6090091fcc2777b5744a02b979d80c669b |
parent 164508 | a699560fa7d375d49c0ae6c8c37e778e125fdcbc |
child 164510 | 1954202491f15f673717fef76eecaaee762af9db |
push id | 3066 |
push user | akeybl@mozilla.com |
push date | Mon, 09 Dec 2013 19:58:46 +0000 |
treeherder | mozilla-beta@a31a0dce83aa [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nrc |
bugs | 919022 |
milestone | 27.0a1 |
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
|
--- a/gfx/layers/client/CanvasClient.cpp +++ b/gfx/layers/client/CanvasClient.cpp @@ -94,20 +94,20 @@ CanvasClient2D::Update(gfx::IntSize aSiz if (surface) { GetForwarder()->UpdatedTexture(this, mBuffer, nullptr); GetForwarder()->UseTexture(this, mBuffer); } } TemporaryRef<BufferTextureClient> -CanvasClient2D::CreateBufferTextureClient(gfx::SurfaceFormat aFormat) +CanvasClient2D::CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFlags aFlags) { return CompositableClient::CreateBufferTextureClient(aFormat, - mTextureInfo.mTextureFlags); + mTextureInfo.mTextureFlags | aFlags); } void DeprecatedCanvasClient2D::Updated() { mForwarder->UpdateTexture(this, 1, mDeprecatedTextureClient->LockSurfaceDescriptor()); }
--- a/gfx/layers/client/CanvasClient.h +++ b/gfx/layers/client/CanvasClient.h @@ -78,17 +78,18 @@ public: virtual bool AddTextureClient(TextureClient* aTexture) MOZ_OVERRIDE { MOZ_ASSERT((mTextureInfo.mTextureFlags & aTexture->GetFlags()) == mTextureInfo.mTextureFlags); return CompositableClient::AddTextureClient(aTexture); } virtual TemporaryRef<BufferTextureClient> - CreateBufferTextureClient(gfx::SurfaceFormat aFormat) MOZ_OVERRIDE; + CreateBufferTextureClient(gfx::SurfaceFormat aFormat, + TextureFlags aFlags = TEXTURE_FLAGS_DEFAULT) MOZ_OVERRIDE; virtual void OnDetach() MOZ_OVERRIDE { mBuffer = nullptr; } private: RefPtr<TextureClient> mBuffer;
--- a/gfx/layers/client/CompositableClient.cpp +++ b/gfx/layers/client/CompositableClient.cpp @@ -202,22 +202,16 @@ CompositableClient::CreateBufferTextureC if (gfxPlatform::GetPlatform()->PreferMemoryOverShmem()) { RefPtr<BufferTextureClient> result = new MemoryTextureClient(this, aFormat, aTextureFlags); return result.forget(); } RefPtr<BufferTextureClient> result = new ShmemTextureClient(this, aFormat, aTextureFlags); return result.forget(); } -TemporaryRef<BufferTextureClient> -CompositableClient::CreateBufferTextureClient(gfx::SurfaceFormat aFormat) -{ - return CreateBufferTextureClient(aFormat, TEXTURE_FLAGS_DEFAULT); -} - bool CompositableClient::AddTextureClient(TextureClient* aClient) { ++mNextTextureID; // 0 is always an invalid ID if (mNextTextureID == 0) { ++mNextTextureID; }
--- a/gfx/layers/client/CompositableClient.h +++ b/gfx/layers/client/CompositableClient.h @@ -80,20 +80,18 @@ public: LayersBackend GetCompositorBackendType() const; TemporaryRef<DeprecatedTextureClient> CreateDeprecatedTextureClient(DeprecatedTextureClientType aDeprecatedTextureClientType, gfxContentType aContentType = GFX_CONTENT_SENTINEL); virtual TemporaryRef<BufferTextureClient> - CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFlags aFlags); - - virtual TemporaryRef<BufferTextureClient> - CreateBufferTextureClient(gfx::SurfaceFormat aFormat); + CreateBufferTextureClient(gfx::SurfaceFormat aFormat, + TextureFlags aFlags = TEXTURE_FLAGS_DEFAULT); virtual void SetDescriptorFromReply(TextureIdentifier aTextureId, const SurfaceDescriptor& aDescriptor) { MOZ_CRASH("If you want to call this, you should have implemented it"); } /**
--- a/gfx/layers/client/ImageClient.cpp +++ b/gfx/layers/client/ImageClient.cpp @@ -288,23 +288,16 @@ ImageClientSingle::AddTextureClient(Text } TemporaryRef<BufferTextureClient> ImageClientSingle::CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFlags aFlags) { return CompositableClient::CreateBufferTextureClient(aFormat, mTextureFlags | aFlags); } -TemporaryRef<BufferTextureClient> -ImageClientSingle::CreateBufferTextureClient(gfx::SurfaceFormat aFormat) -{ - return CompositableClient::CreateBufferTextureClient(aFormat, - mTextureFlags | TEXTURE_FLAGS_DEFAULT); -} - void ImageClientSingle::OnDetach() { mFrontBuffer = nullptr; } void ImageClientBuffered::OnDetach()
--- a/gfx/layers/client/ImageClient.h +++ b/gfx/layers/client/ImageClient.h @@ -87,20 +87,18 @@ public: virtual bool UpdateImage(ImageContainer* aContainer, uint32_t aContentFlags); virtual void OnDetach() MOZ_OVERRIDE; virtual bool AddTextureClient(TextureClient* aTexture) MOZ_OVERRIDE; virtual TemporaryRef<BufferTextureClient> - CreateBufferTextureClient(gfx::SurfaceFormat aFormat, TextureFlags aFlags) MOZ_OVERRIDE; - - virtual TemporaryRef<BufferTextureClient> - CreateBufferTextureClient(gfx::SurfaceFormat aFormat) MOZ_OVERRIDE; + CreateBufferTextureClient(gfx::SurfaceFormat aFormat, + TextureFlags aFlags = TEXTURE_FLAGS_DEFAULT) MOZ_OVERRIDE; virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE; virtual already_AddRefed<Image> CreateImage(const uint32_t *aFormats, uint32_t aNumFormats) MOZ_OVERRIDE; virtual void FlushImage() MOZ_OVERRIDE;