mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
96836f9b35
- Bug 1149185 - override GetMessageLoop() r=nical (42bec9405) - Add a "blacklisted" property to d3d11 telemetry. (bug 1187453, r=mattwoodrow) (83bcb0e8e) - Don't create a D3D11 compositor device on content processes. (bug 1183910 part 8, r=bas,mattwoodrow) (c03d496a6) - Bug 1168889 - ContentClientSingleBuffered needs to upload during the transaction. r=nical (35171fe14) - Bug 1176077 - Only recompute PaintedLayer item visibility when display list has changed. r=mattwoodrow (0ea691594) - Bug 1179298. ClientTiledPaintedLayer should allow empty transactions to succeed if it doesn't need to draw anything. r=mattwoodrow (4aaad97b2) - Bug 1169200 - Send OpRemoveTextureAsync before actor destroyed r=nical (86007156c) - Bug 1158838 - Add some gfxCriticalError logging. r=milan (32bf80848) - Bug 1129871 - Avoid copying TileClient when not necessary. r=BenWa (1ac30bcc2) - Bug 1186911 - Fix progressive paint when using tiled-drawtarget. r=nical (87649fb8d) - Bug 1118876 - Add edge padding with DrawTargetTiled. r=jrmuizel (64b12cf6a) - Bug 1157677 - Fix uninitialized members warning in ClientTiledLayerBuffer. r=nical (d11d0da30) - Bug 1151071 - Make sure low-resolution tiles are transparent. r=mattwoodrow (164446378) - Bug 1170390 - Use Optimal2DFormatForContent over OptimalFormatForContent to avoid enum conversions. r=jrmuizel (db7ee2c31) - Bug 1180326 - Part 1: Abstract parts of the client side tiling that we need. r=jrmuizel (0ad7651fe) - Bug 1179987 - Remove painted region from SurfaceDescriptorTiles since it isn't used any more. r=nical (653e9389e) - Bug 1180326 - Part 2: Add support for variable tile sizes. r=jrmuizel (081349a5e) - Bug 1180326 - Part 3: Move repeated code into GetBackBuffer. r=jrmuizel (2e9091ae1) - Bug 1180326 - Part 4: Add new content client. r=jrmuizel (7362d805b) - Bug 1180326 - Part 5: Support HWC with tiling when we only have 1 tile. r=jrmuizel (09ce93b7e) - Bug 1152461 - Don't use tiled layers for overflow:hidden scroll frames. r=tn (804a683a1) - Bug 961887 - Add some reftest fuzz. (dcd707004) - Bug 1186061 patch 1 - Add feature to reftest harness to allow skipping the flush. r=mattwoodrow (8cefe9640) - Bug 1176969 - Disable OMT animation for any frame in a preserve-3d scene rather than only frames whose parent and child are in a preserve-3d scene. r=mattwoodrow (693d0a518) - Bug 1176969 followup - Annotate new reftests as intermittently fuzzy on Mac. (0269d5d8f) - Bug 1176969 followup - Increase error amounts for intermittent fuzzy-if(cocoaWidget). (116039ed0) - Bug 1176969 followup - Mark test as random for now until I have a chance to rewrite it. (8ba561f83) - Bug 1176969 followup - Reorganize the timing of the reftest to make it more reliable. (f3ffc93cd) - Bug 1186061 patch 2 - Disable compositor thread animation of transforms when backface-visibility is hidden. r=mattwoodrow (e67bed9fb) - Bug 1169666 - Mark reftests failing due to scrollbar transparency random on GTK3. r=karlt (0c6080d55) - Bug 1180326 - Part 6: Use SingleTiledContentClient for non-scrollable layers on b2g and OSX. r=jrmuizel (079951f0a) - Bug 1189261 - Mark tile invalid region in coordinates relative to the tile. r=jrmuizel (7e696c911) - Bug 1187619 - Only optmimize FrameLayerBuilder visibility calculations if correct. r=mattwoodrow (05228ad31) - Bug 1190950: Check mappings and surfaces for UpdateFromSurface more robustly. r=mattwoodrow (c00adba10) - Remove the backend flag to TextureClient::CreateForDrawing. (bug 1183910 part 9, r=mattwoodrow) (5df1d964c) - Bug 1135935 - Part 1: Don't implement ISurfaceAllocator for the texture recycler. r=sotaro (bcba93d3d) - Bug 1135935 - Part 2: Merge TextureClientRecycleAllocator into base class. r=sotaro (8f4e7b6b1) - Bug 1135935 - Part 3: Allow overriding of allocations for texture client recycling. r=sotaro (35d7499e9) - Bug 1135935 - Part 4: Move IDirect3DTexture9 allocations and ownership into the TextureClient. r=jrmuizel (e62cf9acf) - Bug 1135935 - Part 5: Add D3D9 texture recycler. r=jrmuizel (8ab85b064) - Bug 1135935 - Part 6: Wait for the compositor to stop using textures before recycling them. r=jrmuizel (ae0c45cfd)
212 lines
6.5 KiB
C++
212 lines
6.5 KiB
C++
/* -*- 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/. */
|
|
|
|
#include "mozilla/layers/SingleTiledContentClient.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using namespace gfx;
|
|
|
|
namespace layers {
|
|
|
|
|
|
SingleTiledContentClient::SingleTiledContentClient(ClientTiledPaintedLayer* aPaintedLayer,
|
|
ClientLayerManager* aManager)
|
|
: TiledContentClient(aManager)
|
|
{
|
|
MOZ_COUNT_CTOR(SingleTiledContentClient);
|
|
|
|
mTiledBuffer = new ClientSingleTiledLayerBuffer(aPaintedLayer, this, aManager);
|
|
}
|
|
|
|
void
|
|
SingleTiledContentClient::ClearCachedResources()
|
|
{
|
|
CompositableClient::ClearCachedResources();
|
|
mTiledBuffer->DiscardBuffers();
|
|
}
|
|
|
|
void
|
|
SingleTiledContentClient::UpdatedBuffer(TiledBufferType aType)
|
|
{
|
|
// Take a ReadLock on behalf of the TiledContentHost. This
|
|
// reference will be adopted when the descriptor is opened in
|
|
// TiledLayerBufferComposite.
|
|
mTiledBuffer->ReadLock();
|
|
|
|
mForwarder->UseTiledLayerBuffer(this, mTiledBuffer->GetSurfaceDescriptorTiles());
|
|
mTiledBuffer->ClearPaintedRegion();
|
|
}
|
|
|
|
ClientSingleTiledLayerBuffer::ClientSingleTiledLayerBuffer(ClientTiledPaintedLayer* aPaintedLayer,
|
|
CompositableClient* aCompositableClient,
|
|
ClientLayerManager* aManager)
|
|
: ClientTiledLayerBuffer(aPaintedLayer, aCompositableClient)
|
|
, mManager(aManager)
|
|
{
|
|
}
|
|
|
|
void
|
|
ClientSingleTiledLayerBuffer::ReadLock() {
|
|
if (!mTile.IsPlaceholderTile()) {
|
|
mTile.ReadLock();
|
|
}
|
|
}
|
|
|
|
void
|
|
ClientSingleTiledLayerBuffer::ReleaseTiles()
|
|
{
|
|
if (!mTile.IsPlaceholderTile()) {
|
|
mTile.DiscardBuffers();
|
|
}
|
|
mTile.SetTextureAllocator(nullptr);
|
|
}
|
|
|
|
void
|
|
ClientSingleTiledLayerBuffer::DiscardBuffers()
|
|
{
|
|
if (!mTile.IsPlaceholderTile()) {
|
|
mTile.DiscardFrontBuffer();
|
|
mTile.DiscardBackBuffer();
|
|
}
|
|
}
|
|
|
|
SurfaceDescriptorTiles
|
|
ClientSingleTiledLayerBuffer::GetSurfaceDescriptorTiles()
|
|
{
|
|
InfallibleTArray<TileDescriptor> tiles;
|
|
|
|
TileDescriptor tileDesc = mTile.GetTileDescriptor();
|
|
tiles.AppendElement(tileDesc);
|
|
mTile.mUpdateRect = IntRect();
|
|
|
|
return SurfaceDescriptorTiles(mValidRegion,
|
|
tiles,
|
|
mTilingOrigin,
|
|
mSize,
|
|
0, 0, 1, 1,
|
|
1.0,
|
|
mFrameResolution.xScale,
|
|
mFrameResolution.yScale);
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
ClientSingleTiledLayerBuffer::GetTextureClient()
|
|
{
|
|
return mCompositableClient->CreateTextureClientForDrawing(
|
|
gfx::ImageFormatToSurfaceFormat(mFormat), mSize, BackendSelector::Content,
|
|
TextureFlags::IMMEDIATE_UPLOAD);
|
|
}
|
|
|
|
void
|
|
ClientSingleTiledLayerBuffer::PaintThebes(const nsIntRegion& aNewValidRegion,
|
|
const nsIntRegion& aPaintRegion,
|
|
const nsIntRegion& aDirtyRegion,
|
|
LayerManager::DrawPaintedLayerCallback aCallback,
|
|
void* aCallbackData)
|
|
{
|
|
// Compare layer visible region size to current backbuffer size, discard if not matching.
|
|
IntSize size = mPaintedLayer->GetVisibleRegion().GetBounds().Size();
|
|
IntPoint origin = mPaintedLayer->GetVisibleRegion().GetBounds().TopLeft();
|
|
nsIntRegion paintRegion = aPaintRegion;
|
|
if (mSize != size ||
|
|
mTilingOrigin != origin) {
|
|
ResetPaintedAndValidState();
|
|
mSize = size;
|
|
mTilingOrigin = origin;
|
|
paintRegion = aNewValidRegion;
|
|
}
|
|
|
|
SurfaceMode mode;
|
|
gfxContentType content = GetContentType(&mode);
|
|
mFormat = gfxPlatform::GetPlatform()->OptimalFormatForContent(content);
|
|
|
|
if (mTile.IsPlaceholderTile()) {
|
|
mTile.SetLayerManager(mManager);
|
|
mTile.SetTextureAllocator(this);
|
|
}
|
|
mTile.SetCompositableClient(mCompositableClient);
|
|
|
|
// The dirty region relative to the top-left of the tile.
|
|
nsIntRegion tileDirtyRegion = paintRegion.MovedBy(-mTilingOrigin);
|
|
|
|
nsIntRegion extraPainted;
|
|
RefPtr<TextureClient> backBufferOnWhite;
|
|
RefPtr<TextureClient> backBuffer =
|
|
mTile.GetBackBuffer(tileDirtyRegion,
|
|
content, mode,
|
|
extraPainted,
|
|
&backBufferOnWhite);
|
|
|
|
mTile.mUpdateRect = tileDirtyRegion.GetBounds().Union(extraPainted.GetBounds());
|
|
|
|
extraPainted.MoveBy(mTilingOrigin);
|
|
extraPainted.And(extraPainted, aNewValidRegion);
|
|
mPaintedRegion.OrWith(paintRegion);
|
|
mPaintedRegion.OrWith(extraPainted);
|
|
|
|
if (!backBuffer) {
|
|
return;
|
|
}
|
|
|
|
RefPtr<DrawTarget> dt = backBuffer->BorrowDrawTarget();
|
|
RefPtr<DrawTarget> dtOnWhite;
|
|
if (backBufferOnWhite) {
|
|
dtOnWhite = backBufferOnWhite->BorrowDrawTarget();
|
|
}
|
|
|
|
if (mode != SurfaceMode::SURFACE_OPAQUE) {
|
|
nsIntRegionRectIterator iter(tileDirtyRegion);
|
|
const IntRect *iterRect;
|
|
while ((iterRect = iter.Next())) {
|
|
if (dtOnWhite) {
|
|
dt->FillRect(Rect(iterRect->x, iterRect->y, iterRect->width, iterRect->height),
|
|
ColorPattern(Color(0.0, 0.0, 0.0, 1.0)));
|
|
dtOnWhite->FillRect(Rect(iterRect->x, iterRect->y, iterRect->width, iterRect->height),
|
|
ColorPattern(Color(1.0, 1.0, 1.0, 1.0)));
|
|
} else {
|
|
dt->ClearRect(Rect(iterRect->x, iterRect->y, iterRect->width, iterRect->height));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (dtOnWhite) {
|
|
dt = Factory::CreateDualDrawTarget(dt, dtOnWhite);
|
|
dtOnWhite = nullptr;
|
|
}
|
|
|
|
{
|
|
nsRefPtr<gfxContext> ctx = new gfxContext(dt);
|
|
ctx->SetMatrix(ctx->CurrentMatrix().Translate(-mTilingOrigin.x, -mTilingOrigin.y));
|
|
|
|
aCallback(mPaintedLayer, ctx, paintRegion, &paintRegion, DrawRegionClip::DRAW, nsIntRegion(), aCallbackData);
|
|
}
|
|
|
|
// Mark the area we just drew into the back buffer as invalid in the front buffer as they're
|
|
// now out of sync.
|
|
mTile.mInvalidFront.OrWith(tileDirtyRegion);
|
|
|
|
// The new buffer is now validated, remove the dirty region from it.
|
|
mTile.mInvalidBack.SubOut(tileDirtyRegion);
|
|
|
|
dt = nullptr;
|
|
|
|
mTile.Flip();
|
|
UnlockTile(mTile);
|
|
|
|
if (backBuffer->HasInternalBuffer()) {
|
|
// If our new buffer has an internal buffer, we don't want to keep another
|
|
// TextureClient around unnecessarily, so discard the back-buffer.
|
|
mTile.DiscardBackBuffer();
|
|
}
|
|
|
|
mValidRegion = aNewValidRegion;
|
|
mLastPaintSurfaceMode = mode;
|
|
mLastPaintContentType = content;
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|