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)
232 lines
8.4 KiB
C++
232 lines
8.4 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 "BasicPaintedLayer.h"
|
|
#include <stdint.h> // for uint32_t
|
|
#include "GeckoProfiler.h" // for PROFILER_LABEL
|
|
#include "ReadbackLayer.h" // for ReadbackLayer, ReadbackSink
|
|
#include "ReadbackProcessor.h" // for ReadbackProcessor::Update, etc
|
|
#include "RenderTrace.h" // for RenderTraceInvalidateEnd, etc
|
|
#include "BasicLayersImpl.h" // for AutoMaskData, etc
|
|
#include "gfxContext.h" // for gfxContext, etc
|
|
#include "gfxRect.h" // for gfxRect
|
|
#include "gfxUtils.h" // for gfxUtils
|
|
#include "mozilla/gfx/2D.h" // for DrawTarget
|
|
#include "mozilla/gfx/BaseRect.h" // for BaseRect
|
|
#include "mozilla/gfx/Matrix.h" // for Matrix
|
|
#include "mozilla/gfx/Rect.h" // for Rect, IntRect
|
|
#include "mozilla/gfx/Types.h" // for Float, etc
|
|
#include "mozilla/layers/LayersTypes.h"
|
|
#include "nsAutoPtr.h" // for nsRefPtr
|
|
#include "nsCOMPtr.h" // for already_AddRefed
|
|
#include "nsISupportsImpl.h" // for gfxContext::Release, etc
|
|
#include "nsPoint.h" // for nsIntPoint
|
|
#include "nsRect.h" // for mozilla::gfx::IntRect
|
|
#include "nsTArray.h" // for nsTArray, nsTArray_Impl
|
|
#include "AutoMaskData.h"
|
|
#include "gfx2DGlue.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
using namespace mozilla::gfx;
|
|
|
|
static nsIntRegion
|
|
IntersectWithClip(const nsIntRegion& aRegion, gfxContext* aContext)
|
|
{
|
|
gfxRect clip = aContext->GetClipExtents();
|
|
clip.RoundOut();
|
|
IntRect r(clip.X(), clip.Y(), clip.Width(), clip.Height());
|
|
nsIntRegion result;
|
|
result.And(aRegion, r);
|
|
return result;
|
|
}
|
|
|
|
void
|
|
BasicPaintedLayer::PaintThebes(gfxContext* aContext,
|
|
Layer* aMaskLayer,
|
|
LayerManager::DrawPaintedLayerCallback aCallback,
|
|
void* aCallbackData)
|
|
{
|
|
PROFILER_LABEL("BasicPaintedLayer", "PaintThebes",
|
|
js::ProfileEntry::Category::GRAPHICS);
|
|
|
|
NS_ASSERTION(BasicManager()->InDrawing(),
|
|
"Can only draw in drawing phase");
|
|
|
|
float opacity = GetEffectiveOpacity();
|
|
CompositionOp effectiveOperator = GetEffectiveOperator(this);
|
|
|
|
if (!BasicManager()->IsRetained()) {
|
|
mValidRegion.SetEmpty();
|
|
mContentClient->Clear();
|
|
|
|
nsIntRegion toDraw = IntersectWithClip(GetEffectiveVisibleRegion(), aContext);
|
|
|
|
RenderTraceInvalidateStart(this, "FFFF00", toDraw.GetBounds());
|
|
|
|
if (!toDraw.IsEmpty() && !IsHidden()) {
|
|
if (!aCallback) {
|
|
BasicManager()->SetTransactionIncomplete();
|
|
return;
|
|
}
|
|
|
|
aContext->Save();
|
|
|
|
bool needsClipToVisibleRegion = GetClipToVisibleRegion();
|
|
bool needsGroup = opacity != 1.0 ||
|
|
effectiveOperator != CompositionOp::OP_OVER ||
|
|
aMaskLayer;
|
|
nsRefPtr<gfxContext> groupContext;
|
|
if (needsGroup) {
|
|
groupContext =
|
|
BasicManager()->PushGroupForLayer(aContext, this, toDraw,
|
|
&needsClipToVisibleRegion);
|
|
if (effectiveOperator != CompositionOp::OP_OVER) {
|
|
needsClipToVisibleRegion = true;
|
|
}
|
|
} else {
|
|
groupContext = aContext;
|
|
}
|
|
SetAntialiasingFlags(this, groupContext->GetDrawTarget());
|
|
aCallback(this, groupContext, toDraw, &toDraw,
|
|
DrawRegionClip::NONE, nsIntRegion(), aCallbackData);
|
|
if (needsGroup) {
|
|
aContext->PopGroupToSource();
|
|
if (needsClipToVisibleRegion) {
|
|
gfxUtils::ClipToRegion(aContext, toDraw);
|
|
}
|
|
AutoSetOperator setOptimizedOperator(aContext, ThebesOp(effectiveOperator));
|
|
PaintWithMask(aContext, opacity, aMaskLayer);
|
|
}
|
|
|
|
aContext->Restore();
|
|
}
|
|
|
|
RenderTraceInvalidateEnd(this, "FFFF00");
|
|
return;
|
|
}
|
|
|
|
if (BasicManager()->IsTransactionIncomplete())
|
|
return;
|
|
|
|
gfxRect clipExtents;
|
|
clipExtents = aContext->GetClipExtents();
|
|
|
|
// Pull out the mask surface and transform here, because the mask
|
|
// is internal to basic layers
|
|
AutoMoz2DMaskData mask;
|
|
SourceSurface* maskSurface = nullptr;
|
|
Matrix maskTransform;
|
|
if (GetMaskData(aMaskLayer, aContext->GetDeviceOffset(), &mask)) {
|
|
maskSurface = mask.GetSurface();
|
|
maskTransform = mask.GetTransform();
|
|
}
|
|
|
|
if (!IsHidden() && !clipExtents.IsEmpty()) {
|
|
mContentClient->DrawTo(this, aContext->GetDrawTarget(), opacity,
|
|
effectiveOperator,
|
|
maskSurface, &maskTransform);
|
|
}
|
|
}
|
|
|
|
void
|
|
BasicPaintedLayer::Validate(LayerManager::DrawPaintedLayerCallback aCallback,
|
|
void* aCallbackData,
|
|
ReadbackProcessor* aReadback)
|
|
{
|
|
if (!mContentClient) {
|
|
// This client will have a null Forwarder, which means it will not have
|
|
// a ContentHost on the other side.
|
|
mContentClient = new ContentClientBasic();
|
|
}
|
|
|
|
if (!BasicManager()->IsRetained()) {
|
|
return;
|
|
}
|
|
|
|
nsTArray<ReadbackProcessor::Update> readbackUpdates;
|
|
if (aReadback && UsedForReadback()) {
|
|
aReadback->GetPaintedLayerUpdates(this, &readbackUpdates);
|
|
}
|
|
|
|
uint32_t flags = 0;
|
|
#ifndef MOZ_WIDGET_ANDROID
|
|
if (BasicManager()->CompositorMightResample()) {
|
|
flags |= RotatedContentBuffer::PAINT_WILL_RESAMPLE;
|
|
}
|
|
if (!(flags & RotatedContentBuffer::PAINT_WILL_RESAMPLE)) {
|
|
if (MayResample()) {
|
|
flags |= RotatedContentBuffer::PAINT_WILL_RESAMPLE;
|
|
}
|
|
}
|
|
#endif
|
|
if (mDrawAtomically) {
|
|
flags |= RotatedContentBuffer::PAINT_NO_ROTATION;
|
|
}
|
|
PaintState state =
|
|
mContentClient->BeginPaintBuffer(this, flags);
|
|
mValidRegion.Sub(mValidRegion, state.mRegionToInvalidate);
|
|
|
|
if (DrawTarget* target = mContentClient->BorrowDrawTargetForPainting(state)) {
|
|
// The area that became invalid and is visible needs to be repainted
|
|
// (this could be the whole visible area if our buffer switched
|
|
// from RGB to RGBA, because we might need to repaint with
|
|
// subpixel AA)
|
|
state.mRegionToInvalidate.And(state.mRegionToInvalidate,
|
|
GetEffectiveVisibleRegion());
|
|
SetAntialiasingFlags(this, target);
|
|
|
|
RenderTraceInvalidateStart(this, "FFFF00", state.mRegionToDraw.GetBounds());
|
|
|
|
nsRefPtr<gfxContext> ctx = gfxContext::ContextForDrawTarget(target);
|
|
PaintBuffer(ctx,
|
|
state.mRegionToDraw, state.mRegionToDraw, state.mRegionToInvalidate,
|
|
state.mDidSelfCopy,
|
|
state.mClip,
|
|
aCallback, aCallbackData);
|
|
MOZ_LAYERS_LOG_IF_SHADOWABLE(this, ("Layer::Mutated(%p) PaintThebes", this));
|
|
Mutated();
|
|
ctx = nullptr;
|
|
mContentClient->ReturnDrawTargetToBuffer(target);
|
|
|
|
RenderTraceInvalidateEnd(this, "FFFF00");
|
|
} else {
|
|
// It's possible that state.mRegionToInvalidate is nonempty here,
|
|
// if we are shrinking the valid region to nothing. So use mRegionToDraw
|
|
// instead.
|
|
NS_WARN_IF_FALSE(state.mRegionToDraw.IsEmpty(),
|
|
"No context when we have something to draw, resource exhaustion?");
|
|
}
|
|
|
|
for (uint32_t i = 0; i < readbackUpdates.Length(); ++i) {
|
|
ReadbackProcessor::Update& update = readbackUpdates[i];
|
|
nsIntPoint offset = update.mLayer->GetBackgroundLayerOffset();
|
|
nsRefPtr<gfxContext> ctx =
|
|
update.mLayer->GetSink()->BeginUpdate(update.mUpdateRect + offset,
|
|
update.mSequenceCounter);
|
|
if (ctx) {
|
|
NS_ASSERTION(GetEffectiveOpacity() == 1.0, "Should only read back opaque layers");
|
|
NS_ASSERTION(!GetMaskLayer(), "Should only read back layers without masks");
|
|
ctx->SetMatrix(ctx->CurrentMatrix().Translate(offset.x, offset.y));
|
|
mContentClient->DrawTo(this, ctx->GetDrawTarget(), 1.0,
|
|
CompositionOpForOp(ctx->CurrentOperator()),
|
|
nullptr, nullptr);
|
|
update.mLayer->GetSink()->EndUpdate(ctx, update.mUpdateRect + offset);
|
|
}
|
|
}
|
|
}
|
|
|
|
already_AddRefed<PaintedLayer>
|
|
BasicLayerManager::CreatePaintedLayer()
|
|
{
|
|
NS_ASSERTION(InConstruction(), "Only allowed in construction phase");
|
|
nsRefPtr<PaintedLayer> layer = new BasicPaintedLayer(this);
|
|
return layer.forget();
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|