mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
cbff465051
- Bug 1167420 - Handle fallible AppendElement call in netwerk/base/Dashboard.cpp. r=valentin (a485b8990) - Bug 968520 - Add mozilla::fallible to FallibleTArray::AppendElement calls. r=froydnj (12a529a0e) - Bug 1172584 - Avoid coping FallibleTArray in SendRequestRunnable constructor. r=dragana (c3a4a4253) - Bug 948466: Rename gfxPangoFonts to gfxFontconfigFonts. r=nical (43eed1f5f) - Bug 968520 - Add mozilla::fallible to more FallibleTArray calls. r=froydnj (339968a1d) - Bug 1166544 - Assume successful InsertElementAt calls in DOMSVG*List::MaybeInsertNullInAnimValListAt. r=dholbert (cf687dad7) - Bug 968520 - Add mozilla::fallible to FallibleTArray::InsertElementAt calls. r=froydnj (cc5c68ff2) - Bug 968520 - Add mozilla::fallible to more FallibleTArray::InsertElementsAt calls. r=froydnj (66df1d034) - Bug 1165735 - Make ThreadSharedFloatArrayBufferList::mContents infallible. r=roc (eda2839db) - Bug 1166544 - Use ReplaceElementAt instead of Clear and InsertElementAt in SVGMotionSMILType::Add. r=dholbert (474887a8c) - Bug 1167418 - Check AppendElement call in MediaQueryList. r=heycam (b6ed6d153) - Bug 1167418 - Use nsTArray instead of FallibleTArray in MediaQueryList. r=heycam (c9e3816d0) - Bug 1167418 - Follow-up: Fix bustage (5015e91ce) - Bug 1174220 - Part 1: Remove capacity constructor of MediaLargeByteBuffer. r=jya (66819d3e4) - Bug 1179282 - Use nsTArray::Assign instead of the assignment operator in dom/svg/. r=dholbert (cb3d43c19) - Bug 968520 - Add nsTArray::Assign. r=froydnj (e5eccf354) - Bug 1182277, don't leak when using nsAutoTArray inside nsTArray, r=nfroyd (bba32394c) - Bug 1143575. Avoid including Android's GraphicBuffer.h from LayersTypes.h. r=nical (99e4e2816) - Bug 1143575. Avoid use of COMPARE macro which can clash with Android headers. r=bent (99cfc74c4) - Bug 1143575. Add RefBase #include to stagefright stubs. r=cpearce (f9e327600) - Bug 1143575. test_HaveMetadataUnbufferedSeek should not wait for canplay since preload='metadata' elements may not fire canplay. r=cpearce (f1b0eee27) - Bug 1143575. Make GL context current before cleaning up programs. r=nical (d7b05b2bd) - partial Bug 1143575. Android's screenshotting code should invalidate the LayrManagerComposite to ensure composition will actually happen. r=nical (58fb296ab) - Bug 1143575. Remove unused Image::IsSentToCompositor tracking. r=nical (808d0b3f0) - Bug 1143575. Remove unused CompositionNotifySink. r=nical (98a332305) - Bug 1143575. Remove unused VideoFrameContainer::Reset. r=nical (e292bc722) - Bug 1143575. Rename mAsyncTransactionTrackeres to mAsyncTransactionTrackers. r=nical (df71ebf4f) - Bug 1143575. Remove unused ImageContainer::ResetPaintCount. r=nical (a92c5bf6e) - Bug 1143575. Remove unused VideoFrameContainer::ClearCurrentFrame aResetSize parameter. r=nical (5d3c9b83a) - Bug 1143575. Remove unused ReturnReleaseFence. r=nical (9d6ea92b5) - Bug 1143575. LayerManagerComposite can't get END_NO_COMPOSITE. r=mattwoodrow (0c5c364b5) - Bug 1143575. Remove unused AttachAsyncCompositable overload. r=nical (5fd3d4f6d) - Bug 1143575. Rename ImageBridgeChild's AutoRemoteTextures to AutoRemoveTexturesFromImageBridge to avoid clashes with later work. r=nical (34d67fcc0) - Bug 1143575. Fix some code formatting. r=nical (1d7f30f60) - Bug 1143575. Move mLayer from ImageClientBridge up into its superclass ImageClient. r=nical (40c902a36) - Bug 1127336 - Label HW-decoded frames with correct origin. - r=vlad (fd1580bcd) - Bug 1167504 - Part 1: Remove BindableName - Framebuffer. r=jgilbert (b3133eee6) - Bug 1167504 - Part 2: Remove BindableName - Renderbuffer. r=jgilbert (155a7e796) - Bug 1167504 - Part 3: Remove BindableName - Sampler. r=jgilbert (8c5c68960) - Bug 1167504 - Part 4: Remove BindableName - Texture. r=jgilbert (28077db04) - Bug 1167504 - Part 5: Remove BindableName - Transform Feedback. r=jgilbert (4fd839598) - Bug 1170454: Fix up instance type for VAOs. r=smaug,r=jgilbert (cc62d993a) - Bug 1167504 - Part 6: Remove BindableName - Vertex Array. r=jgilbert (1d54d5bc1) - Bug 1048724 - Implement GetBufferSubData. r=jgilbert, r=smaug (06570aa84) - Bug 1167504 - Part 7: Remove BindableName - Buffer. r=jgilbert (b2ddf3fc6)
183 lines
5.1 KiB
C++
183 lines
5.1 KiB
C++
/* -*- Mode: C++; tab-width: 2; 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/. */
|
|
|
|
#include "ClientLayerManager.h" // for ClientLayerManager, etc
|
|
#include "ImageContainer.h" // for AutoLockImage, etc
|
|
#include "ImageLayers.h" // for ImageLayer
|
|
#include "mozilla/Attributes.h" // for override
|
|
#include "mozilla/RefPtr.h" // for RefPtr
|
|
#include "mozilla/layers/CompositorTypes.h"
|
|
#include "mozilla/layers/ImageClient.h" // for ImageClient, etc
|
|
#include "mozilla/layers/LayersMessages.h" // for ImageLayerAttributes, etc
|
|
#include "mozilla/mozalloc.h" // for operator delete, etc
|
|
#include "nsAutoPtr.h" // for nsRefPtr, getter_AddRefs, etc
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
#include "nsDebug.h" // for NS_ASSERTION
|
|
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
|
|
#include "nsRegion.h" // for nsIntRegion
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
class ClientImageLayer : public ImageLayer,
|
|
public ClientLayer {
|
|
public:
|
|
explicit ClientImageLayer(ClientLayerManager* aLayerManager)
|
|
: ImageLayer(aLayerManager, static_cast<ClientLayer*>(this))
|
|
, mImageClientTypeContainer(CompositableType::UNKNOWN)
|
|
{
|
|
MOZ_COUNT_CTOR(ClientImageLayer);
|
|
}
|
|
|
|
protected:
|
|
virtual ~ClientImageLayer()
|
|
{
|
|
DestroyBackBuffer();
|
|
MOZ_COUNT_DTOR(ClientImageLayer);
|
|
}
|
|
|
|
virtual void SetContainer(ImageContainer* aContainer) override
|
|
{
|
|
ImageLayer::SetContainer(aContainer);
|
|
mImageClientTypeContainer = CompositableType::UNKNOWN;
|
|
}
|
|
|
|
virtual void SetVisibleRegion(const nsIntRegion& aRegion) override
|
|
{
|
|
NS_ASSERTION(ClientManager()->InConstruction(),
|
|
"Can only set properties in construction phase");
|
|
ImageLayer::SetVisibleRegion(aRegion);
|
|
}
|
|
|
|
virtual void RenderLayer() override;
|
|
|
|
virtual void ClearCachedResources() override
|
|
{
|
|
DestroyBackBuffer();
|
|
}
|
|
|
|
virtual void FillSpecificAttributes(SpecificLayerAttributes& aAttrs) override
|
|
{
|
|
aAttrs = ImageLayerAttributes(mFilter, mScaleToSize, mScaleMode);
|
|
}
|
|
|
|
virtual Layer* AsLayer() override { return this; }
|
|
virtual ShadowableLayer* AsShadowableLayer() override { return this; }
|
|
|
|
virtual void Disconnect() override
|
|
{
|
|
DestroyBackBuffer();
|
|
ClientLayer::Disconnect();
|
|
}
|
|
|
|
void DestroyBackBuffer()
|
|
{
|
|
if (mImageClient) {
|
|
mImageClient->SetLayer(nullptr);
|
|
mImageClient->OnDetach();
|
|
mImageClient = nullptr;
|
|
}
|
|
}
|
|
|
|
virtual CompositableClient* GetCompositableClient() override
|
|
{
|
|
return mImageClient;
|
|
}
|
|
|
|
protected:
|
|
ClientLayerManager* ClientManager()
|
|
{
|
|
return static_cast<ClientLayerManager*>(mManager);
|
|
}
|
|
|
|
CompositableType GetImageClientType()
|
|
{
|
|
if (mImageClientTypeContainer != CompositableType::UNKNOWN) {
|
|
return mImageClientTypeContainer;
|
|
}
|
|
|
|
if (mContainer->IsAsync()) {
|
|
mImageClientTypeContainer = CompositableType::IMAGE_BRIDGE;
|
|
return mImageClientTypeContainer;
|
|
}
|
|
|
|
AutoLockImage autoLock(mContainer);
|
|
|
|
#ifdef MOZ_WIDGET_GONK
|
|
if (autoLock.GetImage()->GetFormat() == ImageFormat::OVERLAY_IMAGE) {
|
|
mImageClientTypeContainer = CompositableType::IMAGE_OVERLAY;
|
|
return mImageClientTypeContainer;
|
|
}
|
|
#endif
|
|
|
|
mImageClientTypeContainer = autoLock.GetImage()
|
|
? CompositableType::IMAGE
|
|
: CompositableType::UNKNOWN;
|
|
return mImageClientTypeContainer;
|
|
}
|
|
|
|
RefPtr<ImageClient> mImageClient;
|
|
CompositableType mImageClientTypeContainer;
|
|
};
|
|
|
|
void
|
|
ClientImageLayer::RenderLayer()
|
|
{
|
|
RenderMaskLayers(this);
|
|
|
|
if (!mContainer) {
|
|
return;
|
|
}
|
|
|
|
if (mImageClient) {
|
|
mImageClient->OnTransaction();
|
|
}
|
|
|
|
if (!mImageClient ||
|
|
!mImageClient->UpdateImage(mContainer, GetContentFlags())) {
|
|
CompositableType type = GetImageClientType();
|
|
if (type == CompositableType::UNKNOWN) {
|
|
return;
|
|
}
|
|
TextureFlags flags = TextureFlags::DEFAULT;
|
|
if (mDisallowBigImage) {
|
|
flags |= TextureFlags::DISALLOW_BIGIMAGE;
|
|
}
|
|
mImageClient = ImageClient::CreateImageClient(type,
|
|
ClientManager()->AsShadowForwarder(),
|
|
flags);
|
|
if (!mImageClient) {
|
|
return;
|
|
}
|
|
mImageClient->SetLayer(this);
|
|
if (HasShadow() && !mContainer->IsAsync()) {
|
|
mImageClient->Connect();
|
|
ClientManager()->AsShadowForwarder()->Attach(mImageClient, this);
|
|
}
|
|
if (!mImageClient->UpdateImage(mContainer, GetContentFlags())) {
|
|
return;
|
|
}
|
|
}
|
|
if (mImageClient) {
|
|
mImageClient->OnTransaction();
|
|
}
|
|
ClientManager()->Hold(this);
|
|
}
|
|
|
|
already_AddRefed<ImageLayer>
|
|
ClientLayerManager::CreateImageLayer()
|
|
{
|
|
NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
|
|
nsRefPtr<ClientImageLayer> layer =
|
|
new ClientImageLayer(this);
|
|
CREATE_SHADOW(Image);
|
|
return layer.forget();
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|