2010-07-21 22:06:33 +04:00
|
|
|
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
2012-05-21 15:12:37 +04:00
|
|
|
* 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/. */
|
2010-03-04 00:37:04 +03:00
|
|
|
|
2013-11-27 04:29:46 +04:00
|
|
|
#include "RotatedBuffer.h"
|
2013-08-12 03:17:23 +04:00
|
|
|
#include <sys/types.h> // for int32_t
|
|
|
|
#include <algorithm> // for max
|
|
|
|
#include "BasicImplData.h" // for BasicImplData
|
|
|
|
#include "BasicLayersImpl.h" // for ToData
|
2013-10-12 00:47:47 +04:00
|
|
|
#include "BufferUnrotate.h" // for BufferUnrotate
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
#include "GeckoProfiler.h" // for AUTO_PROFILER_LABEL
|
2014-09-26 21:06:08 +04:00
|
|
|
#include "Layers.h" // for PaintedLayer, Layer, etc
|
2013-08-12 03:17:23 +04:00
|
|
|
#include "gfxPlatform.h" // for gfxPlatform
|
2014-02-27 06:53:27 +04:00
|
|
|
#include "gfxPrefs.h" // for gfxPrefs
|
2013-08-12 03:17:23 +04:00
|
|
|
#include "gfxUtils.h" // for gfxUtils
|
2013-12-09 06:52:54 +04:00
|
|
|
#include "mozilla/ArrayUtils.h" // for ArrayLength
|
2013-08-12 03:17:23 +04:00
|
|
|
#include "mozilla/gfx/BasePoint.h" // for BasePoint
|
|
|
|
#include "mozilla/gfx/BaseRect.h" // for BaseRect
|
|
|
|
#include "mozilla/gfx/BaseSize.h" // for BaseSize
|
|
|
|
#include "mozilla/gfx/Matrix.h" // for Matrix
|
|
|
|
#include "mozilla/gfx/Point.h" // for Point, IntPoint
|
|
|
|
#include "mozilla/gfx/Rect.h" // for Rect, IntRect
|
2014-01-10 23:06:17 +04:00
|
|
|
#include "mozilla/gfx/Types.h" // for ExtendMode::ExtendMode::CLAMP, etc
|
2013-08-12 03:17:23 +04:00
|
|
|
#include "mozilla/layers/ShadowLayers.h" // for ShadowableLayer
|
2014-04-01 10:28:23 +04:00
|
|
|
#include "mozilla/layers/TextureClient.h" // for TextureClient
|
2015-05-29 18:01:46 +03:00
|
|
|
#include "mozilla/gfx/Point.h" // for IntSize
|
2013-10-08 03:15:59 +04:00
|
|
|
#include "gfx2DGlue.h"
|
2015-01-29 02:34:45 +03:00
|
|
|
#include "nsLayoutUtils.h" // for invalidation debugging
|
2017-08-03 18:50:32 +03:00
|
|
|
#include "PaintThread.h"
|
2010-03-04 00:37:04 +03:00
|
|
|
|
|
|
|
namespace mozilla {
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
|
|
|
|
using namespace gfx;
|
|
|
|
|
2010-03-04 00:37:04 +03:00
|
|
|
namespace layers {
|
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
void
|
|
|
|
BorrowDrawTarget::ReturnDrawTarget(gfx::DrawTarget*& aReturned)
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(mLoanedDrawTarget);
|
|
|
|
MOZ_ASSERT(aReturned == mLoanedDrawTarget);
|
|
|
|
if (mLoanedDrawTarget) {
|
|
|
|
if (mSetTransform) {
|
|
|
|
mLoanedDrawTarget->SetTransform(mLoanedTransform);
|
|
|
|
}
|
|
|
|
mLoanedDrawTarget = nullptr;
|
|
|
|
}
|
|
|
|
aReturned = nullptr;
|
|
|
|
}
|
|
|
|
|
2015-04-21 18:04:57 +03:00
|
|
|
IntRect
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
RotatedBuffer::GetQuadrantRectangle(XSide aXSide, YSide aYSide) const
|
2010-03-04 00:37:04 +03:00
|
|
|
{
|
|
|
|
// quadrantTranslation is the amount we translate the top-left
|
|
|
|
// of the quadrant by to get coordinates relative to the layer
|
2015-04-21 18:04:57 +03:00
|
|
|
IntPoint quadrantTranslation = -mBufferRotation;
|
2017-08-14 15:29:28 +03:00
|
|
|
quadrantTranslation.x += aXSide == LEFT ? mBufferRect.Width() : 0;
|
|
|
|
quadrantTranslation.y += aYSide == TOP ? mBufferRect.Height() : 0;
|
2010-03-04 00:37:04 +03:00
|
|
|
return mBufferRect + quadrantTranslation;
|
|
|
|
}
|
|
|
|
|
2013-11-05 08:50:57 +04:00
|
|
|
Rect
|
|
|
|
RotatedBuffer::GetSourceRectangle(XSide aXSide, YSide aYSide) const
|
|
|
|
{
|
|
|
|
Rect result;
|
|
|
|
if (aXSide == LEFT) {
|
|
|
|
result.x = 0;
|
2017-08-14 15:29:28 +03:00
|
|
|
result.SetWidth(mBufferRotation.x);
|
2013-11-05 08:50:57 +04:00
|
|
|
} else {
|
|
|
|
result.x = mBufferRotation.x;
|
2017-08-14 15:29:28 +03:00
|
|
|
result.SetWidth(mBufferRect.Width() - mBufferRotation.x);
|
2013-11-05 08:50:57 +04:00
|
|
|
}
|
|
|
|
if (aYSide == TOP) {
|
|
|
|
result.y = 0;
|
2017-08-14 15:29:28 +03:00
|
|
|
result.SetHeight(mBufferRotation.y);
|
2013-11-05 08:50:57 +04:00
|
|
|
} else {
|
|
|
|
result.y = mBufferRotation.y;
|
2017-08-14 15:29:28 +03:00
|
|
|
result.SetHeight(mBufferRect.Height() - mBufferRotation.y);
|
2013-11-05 08:50:57 +04:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
/**
|
|
|
|
* @param aXSide LEFT means we draw from the left side of the buffer (which
|
|
|
|
* is drawn on the right side of mBufferRect). RIGHT means we draw from
|
|
|
|
* the right side of the buffer (which is drawn on the left side of
|
|
|
|
* mBufferRect).
|
|
|
|
* @param aYSide TOP means we draw from the top side of the buffer (which
|
|
|
|
* is drawn on the bottom side of mBufferRect). BOTTOM means we draw from
|
|
|
|
* the bottom side of the buffer (which is drawn on the top side of
|
|
|
|
* mBufferRect).
|
|
|
|
*/
|
2010-03-04 00:37:04 +03:00
|
|
|
void
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
RotatedBuffer::DrawBufferQuadrant(gfx::DrawTarget* aTarget,
|
|
|
|
XSide aXSide, YSide aYSide,
|
2013-04-22 06:40:52 +04:00
|
|
|
ContextSource aSource,
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
float aOpacity,
|
2013-09-11 09:08:53 +04:00
|
|
|
gfx::CompositionOp aOperator,
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
gfx::SourceSurface* aMask,
|
|
|
|
const gfx::Matrix* aMaskTransform) const
|
|
|
|
{
|
|
|
|
// The rectangle that we're going to fill. Basically we're going to
|
|
|
|
// render the buffer at mBufferRect + quadrantTranslation to get the
|
|
|
|
// pixels in the right place, but we're only going to paint within
|
|
|
|
// mBufferRect
|
2015-04-21 18:04:57 +03:00
|
|
|
IntRect quadrantRect = GetQuadrantRectangle(aXSide, aYSide);
|
|
|
|
IntRect fillRect;
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
if (!fillRect.IntersectRect(mBufferRect, quadrantRect))
|
|
|
|
return;
|
|
|
|
|
|
|
|
gfx::Point quadrantTranslation(quadrantRect.x, quadrantRect.y);
|
|
|
|
|
2014-07-30 17:38:46 +04:00
|
|
|
MOZ_ASSERT(aSource != BUFFER_BOTH);
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<SourceSurface> snapshot = GetSourceSurface(aSource);
|
2014-07-30 17:38:46 +04:00
|
|
|
|
2016-04-13 10:56:00 +03:00
|
|
|
if (!snapshot) {
|
|
|
|
gfxCriticalError() << "Invalid snapshot in RotatedBuffer::DrawBufferQuadrant";
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-05 08:50:56 +04:00
|
|
|
// direct2d is much slower when using OP_SOURCE so use OP_OVER and
|
|
|
|
// (maybe) a clear instead. Normally we need to draw in a single operation
|
|
|
|
// (to avoid flickering) but direct2d is ok since it defers rendering.
|
|
|
|
// We should try abstract this logic in a helper when we have other use
|
|
|
|
// cases.
|
2014-09-15 01:51:28 +04:00
|
|
|
if ((aTarget->GetBackendType() == BackendType::DIRECT2D ||
|
|
|
|
aTarget->GetBackendType() == BackendType::DIRECT2D1_1) &&
|
|
|
|
aOperator == CompositionOp::OP_SOURCE) {
|
2014-01-10 23:06:17 +04:00
|
|
|
aOperator = CompositionOp::OP_OVER;
|
2014-07-30 17:38:46 +04:00
|
|
|
if (snapshot->GetFormat() == SurfaceFormat::B8G8R8A8) {
|
2015-11-12 01:23:14 +03:00
|
|
|
aTarget->ClearRect(IntRectToRect(fillRect));
|
2013-11-05 08:50:56 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-15 23:57:30 +03:00
|
|
|
// OP_SOURCE is unbounded in Azure, and we really don't want that behaviour here.
|
|
|
|
// We also can't do a ClearRect+FillRect since we need the drawing to happen
|
|
|
|
// as an atomic operation (to prevent flickering).
|
|
|
|
// We also need this clip in the case where we have a mask, since the mask surface
|
|
|
|
// might cover more than fillRect, but we only want to touch the pixels inside
|
|
|
|
// fillRect.
|
2015-11-12 01:23:14 +03:00
|
|
|
aTarget->PushClipRect(IntRectToRect(fillRect));
|
2013-09-11 09:08:53 +04:00
|
|
|
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
if (aMask) {
|
2014-02-28 23:51:17 +04:00
|
|
|
Matrix oldTransform = aTarget->GetTransform();
|
|
|
|
|
2013-11-05 08:50:57 +04:00
|
|
|
// Transform from user -> buffer space.
|
2014-09-10 17:26:12 +04:00
|
|
|
Matrix transform =
|
|
|
|
Matrix::Translation(quadrantTranslation.x, quadrantTranslation.y);
|
2013-11-05 08:50:57 +04:00
|
|
|
|
2014-02-28 23:51:17 +04:00
|
|
|
Matrix inverseMask = *aMaskTransform;
|
|
|
|
inverseMask.Invert();
|
|
|
|
|
|
|
|
transform *= oldTransform;
|
|
|
|
transform *= inverseMask;
|
|
|
|
|
2013-11-05 08:50:57 +04:00
|
|
|
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
|
2016-05-25 19:01:18 +03:00
|
|
|
SurfacePattern source(snapshot, ExtendMode::CLAMP, transform, SamplingFilter::POINT);
|
2013-11-05 08:50:57 +04:00
|
|
|
#else
|
2014-01-10 23:06:17 +04:00
|
|
|
SurfacePattern source(snapshot, ExtendMode::CLAMP, transform);
|
2013-11-05 08:50:57 +04:00
|
|
|
#endif
|
|
|
|
|
2013-09-13 13:06:21 +04:00
|
|
|
aTarget->SetTransform(*aMaskTransform);
|
|
|
|
aTarget->MaskSurface(source, aMask, Point(0, 0), DrawOptions(aOpacity, aOperator));
|
|
|
|
aTarget->SetTransform(oldTransform);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
} else {
|
2013-11-05 08:50:57 +04:00
|
|
|
#ifdef MOZ_GFX_OPTIMIZE_MOBILE
|
2016-05-25 19:01:18 +03:00
|
|
|
DrawSurfaceOptions options(SamplingFilter::POINT);
|
2013-11-05 08:50:57 +04:00
|
|
|
#else
|
|
|
|
DrawSurfaceOptions options;
|
|
|
|
#endif
|
2015-11-12 01:23:14 +03:00
|
|
|
aTarget->DrawSurface(snapshot, IntRectToRect(fillRect),
|
2013-11-05 08:50:57 +04:00
|
|
|
GetSourceRectangle(aXSide, aYSide),
|
|
|
|
options,
|
|
|
|
DrawOptions(aOpacity, aOperator));
|
2013-09-11 09:08:53 +04:00
|
|
|
}
|
|
|
|
|
2015-06-15 23:57:30 +03:00
|
|
|
aTarget->PopClip();
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-04-22 06:40:52 +04:00
|
|
|
RotatedBuffer::DrawBufferWithRotation(gfx::DrawTarget *aTarget, ContextSource aSource,
|
|
|
|
float aOpacity,
|
2013-09-11 09:08:53 +04:00
|
|
|
gfx::CompositionOp aOperator,
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
gfx::SourceSurface* aMask,
|
|
|
|
const gfx::Matrix* aMaskTransform) const
|
|
|
|
{
|
Bug 1375392 - Tweak the PROFILER_LABEL* macros. r=mstange.
This patch makes the following changes to the macros.
- Removes PROFILER_LABEL_FUNC. It's only suitable for use in functions outside
classes, due to PROFILER_FUNCTION_NAME not getting class names, and it was
mostly misused.
- Removes PROFILER_FUNCTION_NAME. It's no longer used, and __func__ is
universally available now anyway.
- Combines the first two string literal arguments of PROFILER_LABEL and
PROFILER_LABEL_DYNAMIC into a single argument. There was no good reason for
them to be separate, and it forced a '::' in the label, which isn't always
appropriate. Also, the meaning of the "name_space" argument was interpreted
in an interesting variety of ways.
- Adds an "AUTO_" prefix to PROFILER_LABEL and PROFILER_LABEL_DYNAMIC, to make
it clearer they construct RAII objects rather than just being function calls.
(I myself have screwed up the scoping because of this in the past.)
- Fills in the 'js::ProfileEntry::Category::' qualifier within the macro, so
the caller doesn't need to. This makes a *lot* more of the uses fit onto a
single line.
The patch also makes the following changes to the macro uses (beyond those
required by the changes described above).
- Fixes a bunch of labels that had gotten out of sync with the name of the
class and/or function that encloses them.
- Removes a useless PROFILER_LABEL use within a trivial scope in
EventStateManager::DispatchMouseOrPointerEvent(). It clearly wasn't serving
any useful purpose. It also serves as extra evidence that the AUTO_ prefix is
a good idea.
- Tweaks DecodePool::SyncRunIf{Preferred,Possible} so that the labelling is
done within them, instead of at their callsites, because that's a more
standard way of doing things.
--HG--
extra : rebase_source : 318d1bc6fc1425a94aacbf489dd46e4f83211de4
2017-06-22 10:08:53 +03:00
|
|
|
AUTO_PROFILER_LABEL("RotatedBuffer::DrawBufferWithRotation", GRAPHICS);
|
2014-05-24 01:12:29 +04:00
|
|
|
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
// See above, in Azure Repeat should always be a safe, even faster choice
|
|
|
|
// though! Particularly on D2D Repeat should be a lot faster, need to look
|
|
|
|
// into that. TODO[Bas]
|
2013-09-11 09:08:53 +04:00
|
|
|
DrawBufferQuadrant(aTarget, LEFT, TOP, aSource, aOpacity, aOperator, aMask, aMaskTransform);
|
|
|
|
DrawBufferQuadrant(aTarget, RIGHT, TOP, aSource, aOpacity, aOperator, aMask, aMaskTransform);
|
|
|
|
DrawBufferQuadrant(aTarget, LEFT, BOTTOM, aSource, aOpacity, aOperator, aMask, aMaskTransform);
|
|
|
|
DrawBufferQuadrant(aTarget, RIGHT, BOTTOM, aSource, aOpacity, aOperator,aMask, aMaskTransform);
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
}
|
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
bool IsClippingCheap(gfx::DrawTarget* aTarget, const nsIntRegion& aRegion)
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
{
|
2014-01-08 01:09:34 +04:00
|
|
|
// Assume clipping is cheap if the draw target just has an integer
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
// translation, and the visible region is simple.
|
2014-01-08 01:09:34 +04:00
|
|
|
return !aTarget->GetTransform().HasNonIntegerTranslation() &&
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
aRegion.GetNumRects() <= 1;
|
|
|
|
}
|
|
|
|
|
2017-10-11 22:31:20 +03:00
|
|
|
void
|
|
|
|
RotatedBuffer::DrawTo(PaintedLayer* aLayer,
|
|
|
|
DrawTarget* aTarget,
|
|
|
|
float aOpacity,
|
|
|
|
CompositionOp aOp,
|
|
|
|
SourceSurface* aMask,
|
|
|
|
const Matrix* aMaskTransform)
|
|
|
|
{
|
|
|
|
bool clipped = false;
|
|
|
|
|
|
|
|
// If the entire buffer is valid, we can just draw the whole thing,
|
|
|
|
// no need to clip. But we'll still clip if clipping is cheap ---
|
|
|
|
// that might let us copy a smaller region of the buffer.
|
|
|
|
// Also clip to the visible region if we're told to.
|
|
|
|
if (!aLayer->GetValidRegion().Contains(BufferRect()) ||
|
|
|
|
(ToData(aLayer)->GetClipToVisibleRegion() &&
|
|
|
|
!aLayer->GetVisibleRegion().ToUnknownRegion().Contains(BufferRect())) ||
|
|
|
|
IsClippingCheap(aTarget, aLayer->GetLocalVisibleRegion().ToUnknownRegion())) {
|
|
|
|
// We don't want to draw invalid stuff, so we need to clip. Might as
|
|
|
|
// well clip to the smallest area possible --- the visible region.
|
|
|
|
// Bug 599189 if there is a non-integer-translation transform in aTarget,
|
|
|
|
// we might sample pixels outside GetLocalVisibleRegion(), which is wrong
|
|
|
|
// and may cause gray lines.
|
|
|
|
gfxUtils::ClipToRegion(aTarget, aLayer->GetLocalVisibleRegion().ToUnknownRegion());
|
|
|
|
clipped = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
DrawBufferWithRotation(aTarget, BUFFER_BLACK, aOpacity, aOp, aMask, aMaskTransform);
|
|
|
|
if (clipped) {
|
|
|
|
aTarget->PopClip();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
void
|
2017-10-11 20:40:16 +03:00
|
|
|
RotatedBuffer::UpdateDestinationFrom(const RotatedBuffer& aSource,
|
|
|
|
const nsIntRegion& aUpdateRegion)
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
{
|
2017-10-11 20:40:16 +03:00
|
|
|
DrawIterator iter;
|
|
|
|
while (DrawTarget* destDT =
|
|
|
|
BorrowDrawTargetForQuadrantUpdate(aUpdateRegion.GetBounds(), BUFFER_BLACK, &iter)) {
|
|
|
|
bool isClippingCheap = IsClippingCheap(destDT, iter.mDrawRegion);
|
|
|
|
if (isClippingCheap) {
|
|
|
|
gfxUtils::ClipToRegion(destDT, iter.mDrawRegion);
|
|
|
|
}
|
2017-10-11 20:40:16 +03:00
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
aSource.DrawBufferWithRotation(destDT, BUFFER_BLACK, 1.0, CompositionOp::OP_SOURCE);
|
|
|
|
if (isClippingCheap) {
|
|
|
|
destDT->PopClip();
|
|
|
|
}
|
|
|
|
// Flush the destination before the sources become inaccessible (Unlock).
|
|
|
|
destDT->Flush();
|
|
|
|
ReturnDrawTarget(destDT);
|
2017-10-24 00:44:09 +03:00
|
|
|
}
|
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
if (aSource.HaveBufferOnWhite()) {
|
|
|
|
MOZ_ASSERT(HaveBufferOnWhite());
|
|
|
|
DrawIterator whiteIter;
|
|
|
|
while (DrawTarget* destDT =
|
|
|
|
BorrowDrawTargetForQuadrantUpdate(aUpdateRegion.GetBounds(), BUFFER_WHITE, &whiteIter)) {
|
|
|
|
bool isClippingCheap = IsClippingCheap(destDT, whiteIter.mDrawRegion);
|
|
|
|
if (isClippingCheap) {
|
|
|
|
gfxUtils::ClipToRegion(destDT, whiteIter.mDrawRegion);
|
|
|
|
}
|
|
|
|
|
|
|
|
aSource.DrawBufferWithRotation(destDT, BUFFER_WHITE, 1.0, CompositionOp::OP_SOURCE);
|
|
|
|
if (isClippingCheap) {
|
|
|
|
destDT->PopClip();
|
|
|
|
}
|
|
|
|
// Flush the destination before the sources become inaccessible (Unlock).
|
|
|
|
destDT->Flush();
|
|
|
|
ReturnDrawTarget(destDT);
|
|
|
|
}
|
2013-11-27 04:29:45 +04:00
|
|
|
}
|
2013-04-22 06:40:52 +04:00
|
|
|
}
|
|
|
|
|
2014-01-08 01:09:34 +04:00
|
|
|
DrawTarget*
|
2017-10-11 20:40:16 +03:00
|
|
|
RotatedBuffer::BorrowDrawTargetForQuadrantUpdate(const IntRect& aBounds,
|
|
|
|
ContextSource aSource,
|
|
|
|
DrawIterator* aIter,
|
|
|
|
bool aSetTransform,
|
|
|
|
Matrix* aOutMatrix)
|
2010-11-05 10:17:07 +03:00
|
|
|
{
|
2015-04-21 18:04:57 +03:00
|
|
|
IntRect bounds = aBounds;
|
2014-04-10 12:42:29 +04:00
|
|
|
if (aIter) {
|
|
|
|
// If an iterator was provided, then BeginPaint must have been run with
|
|
|
|
// PAINT_CAN_DRAW_ROTATED, and the draw region might cover multiple quadrants.
|
|
|
|
// Iterate over each of them, and return an appropriate buffer each time we find
|
|
|
|
// one that intersects the draw region. The iterator mCount value tracks which
|
|
|
|
// quadrants we have considered across multiple calls to this function.
|
|
|
|
aIter->mDrawRegion.SetEmpty();
|
|
|
|
while (aIter->mCount < 4) {
|
2015-04-21 18:04:57 +03:00
|
|
|
IntRect quadrant = GetQuadrantRectangle((aIter->mCount & 1) ? LEFT : RIGHT,
|
2014-04-10 12:42:29 +04:00
|
|
|
(aIter->mCount & 2) ? TOP : BOTTOM);
|
|
|
|
aIter->mDrawRegion.And(aBounds, quadrant);
|
|
|
|
aIter->mCount++;
|
|
|
|
if (!aIter->mDrawRegion.IsEmpty()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (aIter->mDrawRegion.IsEmpty()) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
bounds = aIter->mDrawRegion.GetBounds();
|
|
|
|
}
|
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
gfx::DrawTarget* dtBuffer = GetDTBuffer();
|
|
|
|
gfx::DrawTarget* dtBufferOnWhite = GetDTBufferOnWhite();
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
|
2014-01-08 01:09:34 +04:00
|
|
|
MOZ_ASSERT(!mLoanedDrawTarget, "draw target has been borrowed and not returned");
|
2013-04-22 06:40:52 +04:00
|
|
|
if (aSource == BUFFER_BOTH && HaveBufferOnWhite()) {
|
2017-10-11 20:40:16 +03:00
|
|
|
MOZ_ASSERT(dtBuffer && dtBuffer->IsValid() && dtBufferOnWhite && dtBufferOnWhite->IsValid());
|
|
|
|
mLoanedDrawTarget = Factory::CreateDualDrawTarget(dtBuffer, dtBufferOnWhite);
|
2013-04-22 06:40:52 +04:00
|
|
|
} else if (aSource == BUFFER_WHITE) {
|
2017-10-11 20:40:16 +03:00
|
|
|
mLoanedDrawTarget = dtBufferOnWhite;
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
} else {
|
2013-04-22 06:40:52 +04:00
|
|
|
// BUFFER_BLACK, or BUFFER_BOTH with a single buffer.
|
2017-10-11 20:40:16 +03:00
|
|
|
mLoanedDrawTarget = dtBuffer;
|
Bug 825928: Land layers refactoring. r=jrmuizel,bas,nical,mattwoodrow,roc,nrc,benwa,bjacob,jgilbert,kchen CLOSED TREE
Please contact Bas Schouten <bschouten@mozilla.com>, Nicolas Silva <nsilva@mozilla.com> or Nicholas Cameron <ncameron@mozilla.com> with general questions. Below is a rough list of authors to contact with specific questions.
Authors:
gfx/layers/Compositor.* gfx/layers/Effects.h - Compositor Interface - bas,nrc,nical
gfx/layers/d3d* - D3D9/D3D10 - bas
gfx/layers/ThebesLayer* - ThebesLayers - nrc,bas
gfx/layers/composite/* - CompositeLayers - nrc,nical
gfx/layers/client/* - Client - nrc,nical,bas
gfx/layers/*Image* - nical
gfx/layers/ipc ipc - IPC - nical
gfx/layers/opengl - CompositorOGL - nrc,nical
gfx/2d - bas,nrc
gfx/gl - GLContext - bjacob
dom/* layout/* - DOM - mattwoodrow
2013-04-10 13:20:52 +04:00
|
|
|
}
|
2010-11-05 10:17:07 +03:00
|
|
|
|
|
|
|
// Figure out which quadrant to draw in
|
2012-08-22 19:56:38 +04:00
|
|
|
int32_t xBoundary = mBufferRect.XMost() - mBufferRotation.x;
|
|
|
|
int32_t yBoundary = mBufferRect.YMost() - mBufferRotation.y;
|
2014-04-10 12:42:29 +04:00
|
|
|
XSide sideX = bounds.XMost() <= xBoundary ? RIGHT : LEFT;
|
|
|
|
YSide sideY = bounds.YMost() <= yBoundary ? BOTTOM : TOP;
|
2015-04-21 18:04:57 +03:00
|
|
|
IntRect quadrantRect = GetQuadrantRectangle(sideX, sideY);
|
2014-04-10 12:42:29 +04:00
|
|
|
NS_ASSERTION(quadrantRect.Contains(bounds), "Messed up quadrants");
|
2010-11-05 10:17:07 +03:00
|
|
|
|
2017-08-04 06:51:30 +03:00
|
|
|
if (aSetTransform) {
|
2017-09-05 16:13:40 +03:00
|
|
|
mLoanedTransform = mLoanedDrawTarget->GetTransform();
|
|
|
|
Matrix transform = Matrix(mLoanedTransform)
|
|
|
|
.PreTranslate(-quadrantRect.x,
|
|
|
|
-quadrantRect.y);
|
2017-08-04 06:51:30 +03:00
|
|
|
mLoanedDrawTarget->SetTransform(transform);
|
2017-08-24 21:03:16 +03:00
|
|
|
mSetTransform = true;
|
2017-08-04 06:51:30 +03:00
|
|
|
} else {
|
|
|
|
MOZ_ASSERT(aOutMatrix);
|
2017-09-05 16:13:40 +03:00
|
|
|
*aOutMatrix = Matrix::Translation(-quadrantRect.x, -quadrantRect.y);
|
2017-08-24 21:03:16 +03:00
|
|
|
mSetTransform = false;
|
2017-08-04 06:51:30 +03:00
|
|
|
}
|
2017-08-09 19:39:07 +03:00
|
|
|
|
2014-01-08 01:09:34 +04:00
|
|
|
return mLoanedDrawTarget;
|
|
|
|
}
|
2013-05-10 01:02:50 +04:00
|
|
|
|
2017-10-11 21:34:41 +03:00
|
|
|
bool
|
|
|
|
RemoteRotatedBuffer::Lock(OpenMode aMode)
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(!mTarget);
|
|
|
|
MOZ_ASSERT(!mTargetOnWhite);
|
|
|
|
|
|
|
|
bool locked = mClient->Lock(aMode) &&
|
|
|
|
(!mClientOnWhite || mClientOnWhite->Lock(aMode));
|
|
|
|
if (!locked) {
|
|
|
|
Unlock();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
mTarget = mClient->BorrowDrawTarget();
|
|
|
|
if (!mTarget || !mTarget->IsValid()) {
|
|
|
|
gfxCriticalNote << "Invalid draw target " << hexa(mTarget)
|
|
|
|
<< "in RemoteRotatedBuffer::Lock";
|
|
|
|
Unlock();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mClientOnWhite) {
|
|
|
|
mTargetOnWhite = mClientOnWhite->BorrowDrawTarget();
|
|
|
|
if (!mTargetOnWhite || !mTargetOnWhite->IsValid()) {
|
|
|
|
gfxCriticalNote << "Invalid draw target(s) " << hexa(mTarget)
|
|
|
|
<< " and " << hexa(mTargetOnWhite)
|
|
|
|
<< "in RemoteRotatedBuffer::Lock";
|
|
|
|
Unlock();
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
RemoteRotatedBuffer::Unlock()
|
|
|
|
{
|
|
|
|
mTarget = nullptr;
|
|
|
|
mTargetOnWhite = nullptr;
|
|
|
|
|
|
|
|
if (mClient->IsLocked()) {
|
|
|
|
mClient->Unlock();
|
|
|
|
}
|
|
|
|
if (mClientOnWhite && mClientOnWhite->IsLocked()) {
|
|
|
|
mClientOnWhite->Unlock();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-11 22:22:57 +03:00
|
|
|
void
|
|
|
|
RemoteRotatedBuffer::Clear()
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(!mTarget && !mTargetOnWhite);
|
|
|
|
mClient = nullptr;
|
|
|
|
mClientOnWhite = nullptr;
|
|
|
|
}
|
|
|
|
|
2017-10-11 21:34:41 +03:00
|
|
|
already_AddRefed<gfx::SourceSurface>
|
|
|
|
RemoteRotatedBuffer::GetSourceSurface(ContextSource aSource) const
|
|
|
|
{
|
|
|
|
if (aSource == ContextSource::BUFFER_BLACK) {
|
|
|
|
return mTarget->Snapshot();
|
|
|
|
} else {
|
|
|
|
MOZ_ASSERT(aSource == ContextSource::BUFFER_WHITE);
|
|
|
|
return mTargetOnWhite->Snapshot();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
gfx::DrawTarget*
|
|
|
|
RemoteRotatedBuffer::GetDTBuffer() const
|
|
|
|
{
|
|
|
|
return mTarget;
|
|
|
|
}
|
|
|
|
|
|
|
|
gfx::DrawTarget*
|
|
|
|
RemoteRotatedBuffer::GetDTBufferOnWhite() const
|
|
|
|
{
|
|
|
|
return mTargetOnWhite;
|
|
|
|
}
|
|
|
|
|
2017-10-11 20:40:16 +03:00
|
|
|
already_AddRefed<SourceSurface>
|
|
|
|
SourceRotatedBuffer::GetSourceSurface(ContextSource aSource) const
|
|
|
|
{
|
|
|
|
RefPtr<SourceSurface> surf;
|
|
|
|
if (aSource == BUFFER_BLACK) {
|
|
|
|
surf = mSource;
|
|
|
|
} else {
|
|
|
|
MOZ_ASSERT(aSource == BUFFER_WHITE);
|
|
|
|
surf = mSourceOnWhite;
|
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_ASSERT(surf);
|
|
|
|
return surf.forget();
|
|
|
|
}
|
|
|
|
|
2017-10-24 00:43:13 +03:00
|
|
|
gfxContentType
|
|
|
|
RotatedContentBuffer::BufferContentType()
|
|
|
|
{
|
|
|
|
if (mBufferProvider || (mDTBuffer && mDTBuffer->IsValid())) {
|
|
|
|
SurfaceFormat format = SurfaceFormat::B8G8R8A8;
|
|
|
|
|
|
|
|
if (mBufferProvider) {
|
|
|
|
format = mBufferProvider->GetFormat();
|
|
|
|
} else if (mDTBuffer && mDTBuffer->IsValid()) {
|
|
|
|
format = mDTBuffer->GetFormat();
|
|
|
|
}
|
|
|
|
|
|
|
|
return ContentForFormat(format);
|
|
|
|
}
|
|
|
|
return gfxContentType::SENTINEL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
RotatedContentBuffer::BufferSizeOkFor(const IntSize& aSize)
|
|
|
|
{
|
|
|
|
return (aSize == mBufferRect.Size() ||
|
|
|
|
(SizedToVisibleBounds != mBufferSizePolicy &&
|
|
|
|
aSize < mBufferRect.Size()));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
RotatedContentBuffer::EnsureBuffer()
|
|
|
|
{
|
|
|
|
NS_ASSERTION(!mLoanedDrawTarget, "Loaned draw target must be returned");
|
|
|
|
if (!mDTBuffer || !mDTBuffer->IsValid()) {
|
|
|
|
if (mBufferProvider) {
|
|
|
|
mDTBuffer = mBufferProvider->BorrowDrawTarget();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_WARNING_ASSERTION(mDTBuffer && mDTBuffer->IsValid(), "no buffer");
|
|
|
|
return !!mDTBuffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
RotatedContentBuffer::EnsureBufferOnWhite()
|
|
|
|
{
|
|
|
|
NS_ASSERTION(!mLoanedDrawTarget, "Loaned draw target must be returned");
|
|
|
|
if (!mDTBufferOnWhite) {
|
|
|
|
if (mBufferProviderOnWhite) {
|
|
|
|
mDTBufferOnWhite =
|
|
|
|
mBufferProviderOnWhite->BorrowDrawTarget();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
NS_WARNING_ASSERTION(mDTBufferOnWhite, "no buffer");
|
|
|
|
return !!mDTBufferOnWhite;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
RotatedContentBuffer::HaveBuffer() const
|
|
|
|
{
|
|
|
|
return mBufferProvider || (mDTBuffer && mDTBuffer->IsValid());
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
|
|
RotatedContentBuffer::HaveBufferOnWhite() const
|
|
|
|
{
|
|
|
|
return mBufferProviderOnWhite || (mDTBufferOnWhite && mDTBufferOnWhite->IsValid());
|
|
|
|
}
|
|
|
|
|
2017-10-24 00:43:24 +03:00
|
|
|
static void
|
|
|
|
WrapRotationAxis(int32_t* aRotationPoint, int32_t aSize)
|
|
|
|
{
|
|
|
|
if (*aRotationPoint < 0) {
|
|
|
|
*aRotationPoint += aSize;
|
|
|
|
} else if (*aRotationPoint >= aSize) {
|
|
|
|
*aRotationPoint -= aSize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static IntRect
|
|
|
|
ComputeBufferRect(const IntRect& aRequestedRect)
|
|
|
|
{
|
|
|
|
IntRect rect(aRequestedRect);
|
|
|
|
// Set a minimum width to guarantee a minimum size of buffers we
|
|
|
|
// allocate (and work around problems on some platforms with smaller
|
|
|
|
// dimensions). 64 used to be the magic number needed to work around
|
|
|
|
// a rendering glitch on b2g (see bug 788411). Now that we don't support
|
|
|
|
// this device anymore we should be fine with 8 pixels as the minimum.
|
|
|
|
rect.SetWidth(std::max(aRequestedRect.Width(), 8));
|
|
|
|
return rect;
|
|
|
|
}
|
|
|
|
|
2017-10-24 00:43:13 +03:00
|
|
|
void
|
|
|
|
RotatedContentBuffer::FlushBuffers()
|
|
|
|
{
|
|
|
|
if (mDTBuffer) {
|
|
|
|
mDTBuffer->Flush();
|
|
|
|
}
|
|
|
|
if (mDTBufferOnWhite) {
|
|
|
|
mDTBufferOnWhite->Flush();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
RotatedContentBuffer::PaintState
|
|
|
|
RotatedContentBuffer::BeginPaint(PaintedLayer* aLayer,
|
|
|
|
uint32_t aFlags)
|
|
|
|
{
|
|
|
|
PaintState result;
|
2017-10-24 00:43:24 +03:00
|
|
|
// We need to disable rotation if we're going to be resampled when
|
|
|
|
// drawing, because we might sample across the rotation boundary.
|
|
|
|
// Also disable buffer rotation when using webrender.
|
|
|
|
bool canHaveRotation = gfxPlatform::BufferRotationEnabled() &&
|
|
|
|
!(aFlags & (PAINT_WILL_RESAMPLE | PAINT_NO_ROTATION)) &&
|
|
|
|
!(aLayer->Manager()->AsWebRenderLayerManager());
|
2017-10-24 00:43:13 +03:00
|
|
|
|
2017-10-24 00:43:19 +03:00
|
|
|
nsIntRegion validRegion = aLayer->GetValidRegion();
|
2017-10-24 00:43:13 +03:00
|
|
|
|
2017-10-24 00:43:19 +03:00
|
|
|
bool canUseOpaqueSurface = aLayer->CanUseOpaqueSurface();
|
|
|
|
ContentType layerContentType =
|
|
|
|
canUseOpaqueSurface ? gfxContentType::COLOR :
|
|
|
|
gfxContentType::COLOR_ALPHA;
|
|
|
|
|
|
|
|
SurfaceMode mode;
|
|
|
|
nsIntRegion neededRegion;
|
|
|
|
IntRect destBufferRect;
|
|
|
|
|
|
|
|
bool canReuseBuffer = HaveBuffer();
|
|
|
|
|
|
|
|
while (true) {
|
|
|
|
mode = aLayer->GetSurfaceMode();
|
|
|
|
neededRegion = aLayer->GetVisibleRegion().ToUnknownRegion();
|
|
|
|
canReuseBuffer &= BufferSizeOkFor(neededRegion.GetBounds().Size());
|
|
|
|
result.mContentType = layerContentType;
|
|
|
|
|
|
|
|
if (canReuseBuffer) {
|
|
|
|
if (mBufferRect.Contains(neededRegion.GetBounds())) {
|
|
|
|
// We don't need to adjust mBufferRect.
|
|
|
|
destBufferRect = mBufferRect;
|
|
|
|
} else if (neededRegion.GetBounds().Size() <= mBufferRect.Size()) {
|
|
|
|
// The buffer's big enough but doesn't contain everything that's
|
|
|
|
// going to be visible. We'll move it.
|
|
|
|
destBufferRect = IntRect(neededRegion.GetBounds().TopLeft(), mBufferRect.Size());
|
|
|
|
} else {
|
|
|
|
destBufferRect = neededRegion.GetBounds();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// We won't be reusing the buffer. Compute a new rect.
|
|
|
|
destBufferRect = ComputeBufferRect(neededRegion.GetBounds());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
|
|
|
#if defined(MOZ_GFX_OPTIMIZE_MOBILE)
|
|
|
|
mode = SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA;
|
|
|
|
#else
|
|
|
|
if (!aLayer->GetParent() ||
|
|
|
|
!aLayer->GetParent()->SupportsComponentAlphaChildren() ||
|
|
|
|
!aLayer->AsShadowableLayer() ||
|
|
|
|
!aLayer->AsShadowableLayer()->HasShadow()) {
|
|
|
|
mode = SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA;
|
|
|
|
} else {
|
|
|
|
result.mContentType = gfxContentType::COLOR;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((aFlags & PAINT_WILL_RESAMPLE) &&
|
|
|
|
(!neededRegion.GetBounds().IsEqualInterior(destBufferRect) ||
|
|
|
|
neededRegion.GetNumRects() > 1))
|
|
|
|
{
|
|
|
|
// The area we add to neededRegion might not be painted opaquely.
|
|
|
|
if (mode == SurfaceMode::SURFACE_OPAQUE) {
|
|
|
|
result.mContentType = gfxContentType::COLOR_ALPHA;
|
|
|
|
mode = SurfaceMode::SURFACE_SINGLE_CHANNEL_ALPHA;
|
|
|
|
}
|
|
|
|
|
|
|
|
// We need to validate the entire buffer, to make sure that only valid
|
|
|
|
// pixels are sampled.
|
|
|
|
neededRegion = destBufferRect;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If we have an existing buffer, but the content type has changed or we
|
|
|
|
// have transitioned into/out of component alpha, then we need to recreate it.
|
|
|
|
if (canReuseBuffer &&
|
|
|
|
(result.mContentType != BufferContentType() ||
|
|
|
|
(mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) != HaveBufferOnWhite()))
|
|
|
|
{
|
|
|
|
// Restart the decision process; we won't re-enter since we guard on
|
|
|
|
// being able to re-use the buffer.
|
|
|
|
canReuseBuffer = false;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (HaveBuffer() &&
|
|
|
|
(result.mContentType != BufferContentType() ||
|
|
|
|
(mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) != HaveBufferOnWhite()))
|
|
|
|
{
|
2017-10-24 00:43:13 +03:00
|
|
|
// We're effectively clearing the valid region, so we need to draw
|
|
|
|
// the entire needed region now.
|
2017-10-24 00:43:19 +03:00
|
|
|
canReuseBuffer = false;
|
2017-10-24 00:43:13 +03:00
|
|
|
result.mRegionToInvalidate = aLayer->GetValidRegion();
|
2017-10-24 00:43:19 +03:00
|
|
|
validRegion.SetEmpty();
|
2017-10-24 00:43:13 +03:00
|
|
|
Clear();
|
|
|
|
|
|
|
|
#if defined(MOZ_DUMP_PAINTING)
|
|
|
|
if (nsLayoutUtils::InvalidationDebuggingIsEnabled()) {
|
|
|
|
if (result.mContentType != BufferContentType()) {
|
|
|
|
printf_stderr("Invalidating entire rotated buffer (layer %p): content type changed\n", aLayer);
|
2017-10-24 00:43:19 +03:00
|
|
|
} else if ((mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) != HaveBufferOnWhite()) {
|
2017-10-24 00:43:13 +03:00
|
|
|
printf_stderr("Invalidating entire rotated buffer (layer %p): component alpha changed\n", aLayer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-10-24 00:43:19 +03:00
|
|
|
NS_ASSERTION(destBufferRect.Contains(neededRegion.GetBounds()),
|
|
|
|
"Destination rect doesn't contain what we need to paint");
|
|
|
|
|
|
|
|
result.mRegionToDraw.Sub(neededRegion, validRegion);
|
2017-10-24 00:43:13 +03:00
|
|
|
|
|
|
|
if (result.mRegionToDraw.IsEmpty())
|
|
|
|
return result;
|
|
|
|
|
|
|
|
if (HaveBuffer()) {
|
|
|
|
if (LockBuffers()) {
|
|
|
|
// Do not modify result.mRegionToDraw or result.mContentType after this call.
|
|
|
|
// Do not modify mBufferRect, mBufferRotation, or mDidSelfCopy,
|
|
|
|
// or call CreateBuffer before this call.
|
|
|
|
FinalizeFrame(result.mRegionToDraw);
|
|
|
|
} else {
|
|
|
|
// Abandon everything and redraw it all. Ideally we'd reallocate and copy
|
|
|
|
// the old to the new and then call FinalizeFrame on the new buffer so that
|
|
|
|
// we only need to draw the latest bits, but we need a big refactor to support
|
|
|
|
// that ordering.
|
2017-10-24 00:43:19 +03:00
|
|
|
result.mRegionToDraw = neededRegion;
|
|
|
|
canReuseBuffer = false;
|
2017-10-24 00:43:13 +03:00
|
|
|
Clear();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
IntRect drawBounds = result.mRegionToDraw.GetBounds();
|
|
|
|
RefPtr<DrawTarget> destDTBuffer;
|
|
|
|
RefPtr<DrawTarget> destDTBufferOnWhite;
|
|
|
|
uint32_t bufferFlags = 0;
|
2017-10-24 00:43:19 +03:00
|
|
|
if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
2017-10-24 00:43:13 +03:00
|
|
|
bufferFlags |= BUFFER_COMPONENT_ALPHA;
|
|
|
|
}
|
2017-10-24 00:43:19 +03:00
|
|
|
if (canReuseBuffer) {
|
2017-10-24 00:43:24 +03:00
|
|
|
if (!EnsureBuffer()) {
|
2017-10-24 00:43:13 +03:00
|
|
|
return result;
|
|
|
|
}
|
2017-10-24 00:43:24 +03:00
|
|
|
IntRect keepArea;
|
|
|
|
if (keepArea.IntersectRect(destBufferRect, mBufferRect)) {
|
|
|
|
// Set mBufferRotation so that the pixels currently in mDTBuffer
|
|
|
|
// will still be rendered in the right place when mBufferRect
|
|
|
|
// changes to destBufferRect.
|
|
|
|
IntPoint newRotation = mBufferRotation +
|
|
|
|
(destBufferRect.TopLeft() - mBufferRect.TopLeft());
|
|
|
|
WrapRotationAxis(&newRotation.x, mBufferRect.Width());
|
|
|
|
WrapRotationAxis(&newRotation.y, mBufferRect.Height());
|
|
|
|
NS_ASSERTION(gfx::IntRect(gfx::IntPoint(0,0), mBufferRect.Size()).Contains(newRotation),
|
|
|
|
"newRotation out of bounds");
|
|
|
|
int32_t xBoundary = destBufferRect.XMost() - newRotation.x;
|
|
|
|
int32_t yBoundary = destBufferRect.YMost() - newRotation.y;
|
|
|
|
bool drawWrapsBuffer = (drawBounds.x < xBoundary && xBoundary < drawBounds.XMost()) ||
|
|
|
|
(drawBounds.y < yBoundary && yBoundary < drawBounds.YMost());
|
|
|
|
if ((drawWrapsBuffer && !(aFlags & PAINT_CAN_DRAW_ROTATED)) ||
|
|
|
|
(newRotation != IntPoint(0,0) && !canHaveRotation)) {
|
|
|
|
// The stuff we need to redraw will wrap around an edge of the
|
|
|
|
// buffer (and the caller doesn't know how to support that), so
|
|
|
|
// move the pixels we can keep into a position that lets us
|
|
|
|
// redraw in just one quadrant.
|
|
|
|
if (mBufferRotation == IntPoint(0,0)) {
|
|
|
|
IntRect srcRect(IntPoint(0, 0), mBufferRect.Size());
|
|
|
|
IntPoint dest = mBufferRect.TopLeft() - destBufferRect.TopLeft();
|
|
|
|
MOZ_ASSERT(mDTBuffer && mDTBuffer->IsValid());
|
|
|
|
mDTBuffer->CopyRect(srcRect, dest);
|
|
|
|
if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
|
|
|
if (!EnsureBufferOnWhite()) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(mDTBufferOnWhite && mDTBufferOnWhite->IsValid());
|
|
|
|
mDTBufferOnWhite->CopyRect(srcRect, dest);
|
|
|
|
}
|
2017-10-24 00:43:30 +03:00
|
|
|
result.mDidSelfCopy = true;
|
2017-10-24 00:43:24 +03:00
|
|
|
mDidSelfCopy = true;
|
|
|
|
// Don't set destBuffer; we special-case self-copies, and
|
|
|
|
// just did the necessary work above.
|
|
|
|
mBufferRect = destBufferRect;
|
|
|
|
} else {
|
|
|
|
// With azure and a data surface perform an buffer unrotate
|
|
|
|
// (SelfCopy).
|
|
|
|
unsigned char* data;
|
|
|
|
IntSize size;
|
|
|
|
int32_t stride;
|
|
|
|
SurfaceFormat format;
|
|
|
|
|
|
|
|
if (mDTBuffer->LockBits(&data, &size, &stride, &format)) {
|
|
|
|
uint8_t bytesPerPixel = BytesPerPixel(format);
|
|
|
|
BufferUnrotate(data,
|
|
|
|
size.width * bytesPerPixel,
|
|
|
|
size.height, stride,
|
|
|
|
newRotation.x * bytesPerPixel, newRotation.y);
|
|
|
|
mDTBuffer->ReleaseBits(data);
|
|
|
|
|
|
|
|
if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
|
|
|
if (!EnsureBufferOnWhite()) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(mDTBufferOnWhite && mDTBufferOnWhite->IsValid());
|
|
|
|
mDTBufferOnWhite->LockBits(&data, &size, &stride, &format);
|
|
|
|
uint8_t bytesPerPixel = BytesPerPixel(format);
|
|
|
|
BufferUnrotate(data,
|
|
|
|
size.width * bytesPerPixel,
|
|
|
|
size.height, stride,
|
|
|
|
newRotation.x * bytesPerPixel, newRotation.y);
|
|
|
|
mDTBufferOnWhite->ReleaseBits(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Buffer unrotate moves all the pixels, note that
|
|
|
|
// we self copied for SyncBackToFrontBuffer
|
2017-10-24 00:43:30 +03:00
|
|
|
result.mDidSelfCopy = true;
|
2017-10-24 00:43:24 +03:00
|
|
|
mDidSelfCopy = true;
|
|
|
|
mBufferRect = destBufferRect;
|
|
|
|
mBufferRotation = IntPoint(0, 0);
|
|
|
|
}
|
2017-10-24 00:43:13 +03:00
|
|
|
|
2017-10-24 00:43:30 +03:00
|
|
|
if (!result.mDidSelfCopy) {
|
2017-10-24 00:43:24 +03:00
|
|
|
destBufferRect = ComputeBufferRect(neededRegion.GetBounds());
|
|
|
|
CreateBuffer(result.mContentType, destBufferRect, bufferFlags,
|
|
|
|
&destDTBuffer, &destDTBufferOnWhite);
|
|
|
|
if (!destDTBuffer ||
|
|
|
|
(!destDTBufferOnWhite && (bufferFlags & BUFFER_COMPONENT_ALPHA))) {
|
|
|
|
if (Factory::ReasonableSurfaceSize(IntSize(destBufferRect.Width(), destBufferRect.Height()))) {
|
|
|
|
gfxCriticalNote << "Failed 1 buffer db=" << hexa(destDTBuffer.get()) << " dw=" << hexa(destDTBufferOnWhite.get()) << " for " << destBufferRect.x << ", " << destBufferRect.y << ", " << destBufferRect.Width() << ", " << destBufferRect.Height();
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
2017-10-24 00:43:24 +03:00
|
|
|
} else {
|
|
|
|
mBufferRect = destBufferRect;
|
|
|
|
mBufferRotation = newRotation;
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
2017-10-24 00:43:24 +03:00
|
|
|
} else {
|
|
|
|
// No pixels are going to be kept. The whole visible region
|
|
|
|
// will be redrawn, so we don't need to copy anything, so we don't
|
|
|
|
// set destBuffer.
|
|
|
|
mBufferRect = destBufferRect;
|
|
|
|
mBufferRotation = IntPoint(0,0);
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// The buffer's not big enough, so allocate a new one
|
2017-10-24 00:43:19 +03:00
|
|
|
CreateBuffer(result.mContentType, destBufferRect, bufferFlags,
|
2017-10-24 00:43:13 +03:00
|
|
|
&destDTBuffer, &destDTBufferOnWhite);
|
|
|
|
if (!destDTBuffer ||
|
|
|
|
(!destDTBufferOnWhite && (bufferFlags & BUFFER_COMPONENT_ALPHA))) {
|
2017-10-24 00:43:19 +03:00
|
|
|
if (Factory::ReasonableSurfaceSize(IntSize(destBufferRect.Width(), destBufferRect.Height()))) {
|
|
|
|
gfxCriticalNote << "Failed 2 buffer db=" << hexa(destDTBuffer.get()) << " dw=" << hexa(destDTBufferOnWhite.get()) << " for " << destBufferRect.x << ", " << destBufferRect.y << ", " << destBufferRect.Width() << ", " << destBufferRect.Height();
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-24 00:43:19 +03:00
|
|
|
NS_ASSERTION(!(aFlags & PAINT_WILL_RESAMPLE) || destBufferRect == neededRegion.GetBounds(),
|
2017-10-24 00:43:13 +03:00
|
|
|
"If we're resampling, we need to validate the entire buffer");
|
|
|
|
|
2017-10-24 00:43:41 +03:00
|
|
|
// If we have no buffered data already, then destBuffer will be a fresh buffer
|
|
|
|
// and we do not need to clear it below.
|
|
|
|
bool isClear = !HaveBuffer();
|
2017-10-24 00:43:13 +03:00
|
|
|
|
2017-10-24 00:43:41 +03:00
|
|
|
if (destDTBuffer) {
|
|
|
|
if (!isClear && (mode != SurfaceMode::SURFACE_COMPONENT_ALPHA || HaveBufferOnWhite())) {
|
|
|
|
// Copy the bits
|
|
|
|
IntPoint offset = -destBufferRect.TopLeft();
|
|
|
|
Matrix mat = Matrix::Translation(offset.x, offset.y);
|
|
|
|
destDTBuffer->SetTransform(mat);
|
|
|
|
if (!EnsureBuffer()) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(mDTBuffer && mDTBuffer->IsValid(), "Have we got a Thebes buffer for some reason?");
|
|
|
|
DrawBufferWithRotation(destDTBuffer, BUFFER_BLACK, 1.0, CompositionOp::OP_SOURCE);
|
|
|
|
destDTBuffer->SetTransform(Matrix());
|
2017-10-24 00:43:13 +03:00
|
|
|
|
2017-10-24 00:43:41 +03:00
|
|
|
if (mode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
|
|
|
if (!destDTBufferOnWhite || !EnsureBufferOnWhite()) {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(mDTBufferOnWhite && mDTBufferOnWhite->IsValid(), "Have we got a Thebes buffer for some reason?");
|
|
|
|
destDTBufferOnWhite->SetTransform(mat);
|
|
|
|
DrawBufferWithRotation(destDTBufferOnWhite, BUFFER_WHITE, 1.0, CompositionOp::OP_SOURCE);
|
|
|
|
destDTBufferOnWhite->SetTransform(Matrix());
|
|
|
|
}
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
2017-10-24 00:43:41 +03:00
|
|
|
|
|
|
|
mDTBuffer = destDTBuffer.forget();
|
|
|
|
mDTBufferOnWhite = destDTBufferOnWhite.forget();
|
|
|
|
mBufferRect = destBufferRect;
|
|
|
|
mBufferRotation = IntPoint(0,0);
|
2017-10-24 00:43:13 +03:00
|
|
|
}
|
|
|
|
NS_ASSERTION(canHaveRotation || mBufferRotation == IntPoint(0,0),
|
|
|
|
"Rotation disabled, but we have nonzero rotation?");
|
|
|
|
|
|
|
|
nsIntRegion invalidate;
|
2017-10-24 00:43:19 +03:00
|
|
|
invalidate.Sub(aLayer->GetValidRegion(), destBufferRect);
|
2017-10-24 00:43:13 +03:00
|
|
|
result.mRegionToInvalidate.Or(result.mRegionToInvalidate, invalidate);
|
|
|
|
result.mClip = DrawRegionClip::DRAW;
|
2017-10-24 00:43:19 +03:00
|
|
|
result.mMode = mode;
|
2017-10-24 00:43:13 +03:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
RefPtr<CapturedPaintState>
|
|
|
|
RotatedContentBuffer::BorrowDrawTargetForRecording(PaintState& aPaintState,
|
|
|
|
DrawIterator* aIter,
|
|
|
|
bool aSetTransform)
|
|
|
|
{
|
2017-10-11 20:40:16 +03:00
|
|
|
if (aPaintState.mMode == SurfaceMode::SURFACE_NONE ||
|
|
|
|
!EnsureBuffer() ||
|
|
|
|
(HaveBufferOnWhite() && !EnsureBufferOnWhite())) {
|
2017-10-24 00:43:13 +03:00
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
Matrix transform;
|
|
|
|
DrawTarget* result = BorrowDrawTargetForQuadrantUpdate(aPaintState.mRegionToDraw.GetBounds(),
|
|
|
|
BUFFER_BOTH, aIter,
|
|
|
|
aSetTransform,
|
|
|
|
&transform);
|
|
|
|
if (!result) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsIntRegion regionToDraw =
|
|
|
|
ExpandDrawRegion(aPaintState, aIter, result->GetBackendType());
|
|
|
|
|
|
|
|
RefPtr<CapturedPaintState> state =
|
|
|
|
new CapturedPaintState(regionToDraw,
|
|
|
|
result,
|
|
|
|
mDTBufferOnWhite,
|
|
|
|
transform,
|
|
|
|
aPaintState.mMode,
|
|
|
|
aPaintState.mContentType);
|
|
|
|
return state;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*static */ bool
|
|
|
|
RotatedContentBuffer::PrepareDrawTargetForPainting(CapturedPaintState* aState)
|
|
|
|
{
|
|
|
|
MOZ_ASSERT(aState);
|
|
|
|
RefPtr<DrawTarget> target = aState->mTarget;
|
|
|
|
RefPtr<DrawTarget> whiteTarget = aState->mTargetOnWhite;
|
|
|
|
|
|
|
|
if (aState->mSurfaceMode == SurfaceMode::SURFACE_COMPONENT_ALPHA) {
|
|
|
|
if (!target || !target->IsValid() ||
|
|
|
|
!whiteTarget || !whiteTarget->IsValid()) {
|
|
|
|
// This can happen in release builds if allocating one of the two buffers
|
|
|
|
// failed. This in turn can happen if unreasonably large textures are
|
|
|
|
// requested.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
for (auto iter = aState->mRegionToDraw.RectIter(); !iter.Done(); iter.Next()) {
|
|
|
|
const IntRect& rect = iter.Get();
|
|
|
|
target->FillRect(Rect(rect.x, rect.y, rect.Width(), rect.Height()),
|
|
|
|
ColorPattern(Color(0.0, 0.0, 0.0, 1.0)));
|
|
|
|
whiteTarget->FillRect(Rect(rect.x, rect.y, rect.Width(), rect.Height()),
|
|
|
|
ColorPattern(Color(1.0, 1.0, 1.0, 1.0)));
|
|
|
|
}
|
|
|
|
} else if (aState->mContentType == gfxContentType::COLOR_ALPHA &&
|
|
|
|
target->IsValid()) {
|
|
|
|
// HaveBuffer() => we have an existing buffer that we must clear
|
|
|
|
for (auto iter = aState->mRegionToDraw.RectIter(); !iter.Done(); iter.Next()) {
|
|
|
|
const IntRect& rect = iter.Get();
|
|
|
|
target->ClearRect(Rect(rect.x, rect.y, rect.Width(), rect.Height()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsIntRegion
|
|
|
|
RotatedContentBuffer::ExpandDrawRegion(PaintState& aPaintState,
|
|
|
|
DrawIterator* aIter,
|
|
|
|
BackendType aBackendType)
|
|
|
|
{
|
|
|
|
nsIntRegion* drawPtr = &aPaintState.mRegionToDraw;
|
|
|
|
if (aIter) {
|
|
|
|
// The iterators draw region currently only contains the bounds of the region,
|
|
|
|
// this makes it the precise region.
|
|
|
|
aIter->mDrawRegion.And(aIter->mDrawRegion, aPaintState.mRegionToDraw);
|
|
|
|
drawPtr = &aIter->mDrawRegion;
|
|
|
|
}
|
|
|
|
if (aBackendType == BackendType::DIRECT2D ||
|
|
|
|
aBackendType == BackendType::DIRECT2D1_1) {
|
|
|
|
// Simplify the draw region to avoid hitting expensive drawing paths
|
|
|
|
// for complex regions.
|
|
|
|
drawPtr->SimplifyOutwardByArea(100 * 100);
|
|
|
|
}
|
|
|
|
return *drawPtr;
|
|
|
|
}
|
|
|
|
|
|
|
|
DrawTarget*
|
|
|
|
RotatedContentBuffer::BorrowDrawTargetForPainting(PaintState& aPaintState,
|
|
|
|
DrawIterator* aIter /* = nullptr */)
|
|
|
|
{
|
|
|
|
RefPtr<CapturedPaintState> capturedState =
|
|
|
|
BorrowDrawTargetForRecording(aPaintState, aIter, true);
|
|
|
|
|
|
|
|
if (!capturedState) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!RotatedContentBuffer::PrepareDrawTargetForPainting(capturedState)) {
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
return capturedState->mTarget;
|
|
|
|
}
|
|
|
|
|
|
|
|
already_AddRefed<SourceSurface>
|
|
|
|
RotatedContentBuffer::GetSourceSurface(ContextSource aSource) const
|
|
|
|
{
|
|
|
|
if (!mDTBuffer || !mDTBuffer->IsValid()) {
|
|
|
|
gfxCriticalNote << "Invalid buffer in RotatedContentBuffer::GetSourceSurface " << gfx::hexa(mDTBuffer);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (aSource == BUFFER_BLACK) {
|
|
|
|
return mDTBuffer->Snapshot();
|
|
|
|
} else {
|
|
|
|
if (!mDTBufferOnWhite || !mDTBufferOnWhite->IsValid()) {
|
|
|
|
gfxCriticalNote << "Invalid buffer on white in RotatedContentBuffer::GetSourceSurface " << gfx::hexa(mDTBufferOnWhite);
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
MOZ_ASSERT(aSource == BUFFER_WHITE);
|
|
|
|
return mDTBufferOnWhite->Snapshot();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-13 18:25:42 +03:00
|
|
|
} // namespace layers
|
|
|
|
} // namespace mozilla
|
2010-03-04 00:37:04 +03:00
|
|
|
|