wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out d393cfeb5dbf:9f82224bb8a3 (bug 903816) for Android reftest failures

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-08-11 19:21:17 -07:00
parent f2174029d6
commit 26893fc5ad
174 changed files with 1121 additions and 2667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/base/nsDOMWindowUtils.cpp
View File

@ -60,7 +60,6 @@
#endif #endif
#include "Layers.h" #include "Layers.h"
#include "mozilla/layers/ShadowLayers.h"
#include "nsIIOService.h" #include "nsIIOService.h"
#include "mozilla/dom/Element.h" #include "mozilla/dom/Element.h"

1
dom/ipc/TabChild.cpp
View File

@ -23,7 +23,6 @@
#include "mozilla/layers/CompositorChild.h" #include "mozilla/layers/CompositorChild.h"
#include "mozilla/layers/ImageBridgeChild.h" #include "mozilla/layers/ImageBridgeChild.h"
#include "mozilla/layers/PLayerTransactionChild.h" #include "mozilla/layers/PLayerTransactionChild.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layout/RenderFrameChild.h" #include "mozilla/layout/RenderFrameChild.h"
#include "mozilla/StaticPtr.h" #include "mozilla/StaticPtr.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"

2
gfx/2d/BasePoint3D.h
View File

@ -6,8 +6,6 @@
#ifndef MOZILLA_BASEPOINT3D_H_ #ifndef MOZILLA_BASEPOINT3D_H_
#define MOZILLA_BASEPOINT3D_H_ #define MOZILLA_BASEPOINT3D_H_
#include "nsDebug.h"
namespace mozilla { namespace mozilla {
namespace gfx { namespace gfx {

2
gfx/2d/Point.h
View File

@ -9,8 +9,6 @@
#include "Types.h" #include "Types.h"
#include "BasePoint.h" #include "BasePoint.h"
#include "BaseSize.h" #include "BaseSize.h"
#include "nsMathUtils.h" // for NS_lround
namespace mozilla { namespace mozilla {
namespace gfx { namespace gfx {

15
gfx/gl/GLTextureImage.cpp
View File

@ -42,21 +42,6 @@ TextureImage::UpdateFromDataSource(gfx::DataSourceSurface *aSurface,
return DirectUpdate(thebesSurf, destRegion, thebesSrcPoint); return DirectUpdate(thebesSurf, destRegion, thebesSrcPoint);
} }
BasicTextureImage::BasicTextureImage(GLuint aTexture,
const nsIntSize& aSize,
GLenum aWrapMode,
ContentType aContentType,
GLContext* aContext,
TextureImage::Flags aFlags /* = TextureImage::NoFlags */,
TextureImage::ImageFormat aImageFormat /* = gfxASurface::ImageFormatUnknown */)
: TextureImage(aSize, aWrapMode, aContentType, aFlags, aImageFormat)
, mTexture(aTexture)
, mTextureState(Created)
, mGLContext(aContext)
, mUpdateOffset(0, 0)
{
}
BasicTextureImage::~BasicTextureImage() BasicTextureImage::~BasicTextureImage()
{ {
GLContext *ctx = mGLContext; GLContext *ctx = mGLContext;

8
gfx/gl/GLTextureImage.h
View File

@ -298,7 +298,13 @@ public:
ContentType aContentType, ContentType aContentType,
GLContext* aContext, GLContext* aContext,
TextureImage::Flags aFlags = TextureImage::NoFlags, TextureImage::Flags aFlags = TextureImage::NoFlags,
TextureImage::ImageFormat aImageFormat = gfxASurface::ImageFormatUnknown); TextureImage::ImageFormat aImageFormat = gfxASurface::ImageFormatUnknown)
: TextureImage(aSize, aWrapMode, aContentType, aFlags, aImageFormat)
, mTexture(aTexture)
, mTextureState(Created)
, mGLContext(aContext)
, mUpdateOffset(0, 0)
{}
virtual void BindTexture(GLenum aTextureUnit); virtual void BindTexture(GLenum aTextureUnit);

10
gfx/layers/Compositor.cpp
View File

@ -4,16 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/Compositor.h" #include "mozilla/layers/Compositor.h"
#include "base/message_loop.h" // for MessageLoop #include "mozilla/layers/Effects.h"
#include "mozilla/layers/CompositorParent.h" // for CompositorParent #include "mozilla/layers/CompositorParent.h"
#include "mozilla/layers/Effects.h" // for Effect, EffectChain, etc
#include "mozilla/mozalloc.h" // for operator delete, etc
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
namespace layers { namespace layers {
/* static */ LayersBackend Compositor::sBackend = LAYERS_NONE; /* static */ LayersBackend Compositor::sBackend = LAYERS_NONE;

21
gfx/layers/Compositor.h
View File

@ -6,17 +6,12 @@
#ifndef MOZILLA_GFX_COMPOSITOR_H #ifndef MOZILLA_GFX_COMPOSITOR_H
#define MOZILLA_GFX_COMPOSITOR_H #define MOZILLA_GFX_COMPOSITOR_H
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING #include "mozilla/gfx/Rect.h"
#include "Units.h" // for ScreenPoint #include "mozilla/gfx/Matrix.h"
#include "gfxPoint.h" // for gfxIntSize #include "gfxMatrix.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "Layers.h"
#include "mozilla/RefPtr.h" // for TemporaryRef, RefCounted #include "mozilla/RefPtr.h"
#include "mozilla/gfx/Point.h" // for IntSize, Point #include "mozilla/layers/CompositorTypes.h"
#include "mozilla/gfx/Rect.h" // for Rect, IntRect
#include "mozilla/gfx/Types.h" // for Float
#include "mozilla/layers/CompositorTypes.h" // for DiagnosticTypes, etc
#include "mozilla/layers/LayersTypes.h" // for LayersBackend
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
/** /**
* Different elements of a web pages are rendered into separate "layers" before * Different elements of a web pages are rendered into separate "layers" before
@ -105,12 +100,10 @@
class gfxContext; class gfxContext;
class nsIWidget; class nsIWidget;
struct gfxMatrix;
struct nsIntSize;
namespace mozilla { namespace mozilla {
namespace gfx { namespace gfx {
class Matrix4x4; class DrawTarget;
} }
namespace layers { namespace layers {

7
gfx/layers/CompositorTypes.h
View File

@ -6,10 +6,9 @@
#ifndef MOZILLA_LAYERS_COMPOSITORTYPES_H #ifndef MOZILLA_LAYERS_COMPOSITORTYPES_H
#define MOZILLA_LAYERS_COMPOSITORTYPES_H #define MOZILLA_LAYERS_COMPOSITORTYPES_H
#include <stdint.h> // for uint32_t #include "LayersTypes.h"
#include <sys/types.h> // for int32_t #include "nsXULAppAPI.h"
#include "LayersTypes.h" // for LayersBackend, etc
#include "nsXULAppAPI.h" // for GeckoProcessType, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

30
gfx/layers/CopyableCanvasLayer.cpp
View File

@ -3,24 +3,20 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "BasicLayersImpl.h" // for FillWithMask, etc #include "mozilla/layers/PLayerTransactionParent.h"
#include "CopyableCanvasLayer.h" #include "CopyableCanvasLayer.h"
#include "GLContext.h" // for GLContext #include "BasicLayersImpl.h"
#include "GLScreenBuffer.h" // for GLScreenBuffer #include "gfxImageSurface.h"
#include "SharedSurface.h" // for SharedSurface #include "GLContext.h"
#include "SharedSurfaceGL.h" // for SharedSurface_GL, etc #include "gfxUtils.h"
#include "SurfaceTypes.h" // for APITypeT, APITypeT::OpenGL, etc #include "gfxPlatform.h"
#include "gfxImageSurface.h" // for gfxImageSurface #include "mozilla/Preferences.h"
#include "gfxMatrix.h" // for gfxMatrix #include "SurfaceStream.h"
#include "gfxPattern.h" // for gfxPattern, etc #include "SharedSurfaceGL.h"
#include "gfxPlatform.h" // for gfxPlatform, gfxImageFormat #include "SharedSurfaceEGL.h"
#include "gfxRect.h" // for gfxRect #include "GeckoProfiler.h"
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/gfx/BaseSize.h" // for BaseSize #include "nsXULAppAPI.h"
#include "nsDebug.h" // for NS_ASSERTION, NS_WARNING, etc
#include "nsISupportsImpl.h" // for gfxContext::AddRef, etc
#include "nsRect.h" // for nsIntRect
#include "nsSize.h" // for nsIntSize
using namespace mozilla::gfx; using namespace mozilla::gfx;
using namespace mozilla::gl; using namespace mozilla::gl;

21
gfx/layers/CopyableCanvasLayer.h
View File

@ -6,27 +6,18 @@
#ifndef GFX_COPYABLECANVASLAYER_H #ifndef GFX_COPYABLECANVASLAYER_H
#define GFX_COPYABLECANVASLAYER_H #define GFX_COPYABLECANVASLAYER_H
#include <stdint.h> // for uint32_t #include "Layers.h"
#include "GLContext.h" // for GLContext #include "mozilla/layers/CanvasClient.h"
#include "Layers.h" // for CanvasLayer, etc #include "mozilla/Preferences.h"
#include "gfxASurface.h" // for gfxASurface
#include "gfxContext.h" // for gfxContext, etc #include "gfxPlatform.h"
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxPlatform.h" // for gfxImageFormat
#include "gfxPoint.h" // for gfxIntSize
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Preferences.h" // for Preferences
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/2D.h" // for DrawTarget
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CanvasClient2D;
class CanvasClientWebGL; class CanvasClientWebGL;
/** /**

6
gfx/layers/Effects.cpp
View File

@ -4,10 +4,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "Effects.h" #include "Effects.h"
#include "LayersLogging.h" // for AppendToString #include "LayersLogging.h"
#include "nsAString.h" #include "nsPrintfCString.h"
#include "nsPrintfCString.h" // for nsPrintfCString
#include "nsString.h" // for nsAutoCString
using namespace mozilla::layers; using namespace mozilla::layers;

16
gfx/layers/Effects.h
View File

@ -6,17 +6,11 @@
#ifndef MOZILLA_LAYERS_EFFECTS_H #ifndef MOZILLA_LAYERS_EFFECTS_H
#define MOZILLA_LAYERS_EFFECTS_H #define MOZILLA_LAYERS_EFFECTS_H
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/gfx/Matrix.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef, etc #include "mozilla/layers/Compositor.h"
#include "mozilla/gfx/Matrix.h" // for Matrix4x4 #include "mozilla/layers/TextureHost.h"
#include "mozilla/gfx/Point.h" // for IntSize #include "LayersLogging.h"
#include "mozilla/gfx/Rect.h" // for Rect #include "mozilla/RefPtr.h"
#include "mozilla/gfx/Types.h" // for Filter, etc
#include "mozilla/layers/CompositorTypes.h" // for EffectTypes, etc
#include "mozilla/layers/LayersTypes.h" // for MOZ_LAYERS_HAVE_LOG
#include "mozilla/layers/TextureHost.h" // for CompositingRenderTarget, etc
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nscore.h" // for nsACString
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

10
gfx/layers/FrameMetrics.h
View File

@ -6,11 +6,11 @@
#ifndef GFX_FRAMEMETRICS_H #ifndef GFX_FRAMEMETRICS_H
#define GFX_FRAMEMETRICS_H #define GFX_FRAMEMETRICS_H
#include <stdint.h> // for uint32_t, uint64_t #include "gfxPoint.h"
#include "Units.h" // for CSSRect, CSSPixel, etc #include "gfxTypes.h"
#include "mozilla/gfx/BasePoint.h" // for BasePoint #include "nsRect.h"
#include "mozilla/gfx/Rect.h" // for RoundedIn #include "mozilla/gfx/Rect.h"
#include "mozilla/gfx/ScaleFactor.h" // for ScaleFactor #include "Units.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

8
gfx/layers/GrallocImages.cpp
View File

@ -4,12 +4,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "GrallocImages.h"
#include <stddef.h> // for size_t
#include <stdint.h> // for int8_t, uint8_t, uint32_t, etc
#include "nsDebug.h" // for NS_WARNING, NS_PRECONDITION
#include "mozilla/layers/ImageBridgeChild.h" #include "mozilla/layers/ImageBridgeChild.h"
#include "nsDebug.h"
#include "ImageContainer.h"
#include "GrallocImages.h"
#include <OMX_IVCommon.h> #include <OMX_IVCommon.h>
#include <ColorConverter.h> #include <ColorConverter.h>

27
gfx/layers/ImageContainer.cpp
View File

@ -4,21 +4,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/ImageBridgeChild.h"
#include "ImageContainer.h" #include "ImageContainer.h"
#include <string.h> // for memcpy, memset
#include "SharedTextureImage.h" // for SharedTextureImage
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/RefPtr.h" // for TemporaryRef
#include "mozilla/ipc/CrossProcessMutex.h" // for CrossProcessMutex, etc
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/ImageBridgeChild.h" // for ImageBridgeChild
#include "mozilla/layers/ImageClient.h" // for ImageClient
#include "nsISupportsUtils.h" // for NS_IF_ADDREF
#ifdef MOZ_WIDGET_GONK
#include "GrallocImages.h" #include "GrallocImages.h"
#endif #include "mozilla/ipc/Shmem.h"
#include "mozilla/ipc/CrossProcessMutex.h"
#include "SharedTextureImage.h"
#include "gfxImageSurface.h"
#include "gfxSharedImageSurface.h"
#include "yuv_convert.h"
#include "gfxUtils.h"
#include "gfxPlatform.h"
#include "mozilla/layers/ImageClient.h"
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include "mozilla/gfx/QuartzSupport.h" #include "mozilla/gfx/QuartzSupport.h"
@ -41,9 +39,6 @@ using mozilla::gfx::SourceSurface;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class DataSourceSurface;
class SourceSurface;
int32_t Image::sSerialCounter = 0; int32_t Image::sSerialCounter = 0;
already_AddRefed<Image> already_AddRefed<Image>

35
gfx/layers/ImageContainer.h
View File

@ -6,29 +6,14 @@
#ifndef GFX_IMAGECONTAINER_H #ifndef GFX_IMAGECONTAINER_H
#define GFX_IMAGECONTAINER_H #define GFX_IMAGECONTAINER_H
#include <stdint.h> // for uint32_t, uint8_t, uint64_t #include "mozilla/Mutex.h"
#include <sys/types.h> // for int32_t #include "mozilla/ReentrantMonitor.h"
#include "GeckoProfilerFunc.h" // for TimeStamp #include "gfxASurface.h" // for gfxImageFormat
#include "ImageTypes.h" // for ImageFormat, etc #include "mozilla/layers/LayersTypes.h" // for LayersBackend
#include "gfxASurface.h" // for gfxASurface, etc #include "mozilla/TimeStamp.h"
#include "gfxPoint.h" // for gfxIntSize #include "ImageTypes.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT_HELPER2 #include "nsTArray.h"
#include "mozilla/Mutex.h" // for Mutex #include "pratom.h"
#include "mozilla/ReentrantMonitor.h" // for ReentrantMonitorAutoEnter, etc
#include "mozilla/TimeStamp.h" // for TimeStamp
#include "mozilla/layers/LayersTypes.h" // for LayersBackend, etc
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nsAutoPtr.h" // for nsRefPtr, nsAutoArrayPtr, etc
#include "nsAutoRef.h" // for nsCountedRef
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for Image::Release, etc
#include "nsRect.h" // for nsIntRect
#include "nsSize.h" // for nsIntSize
#include "nsTArray.h" // for nsTArray
#include "nsThreadUtils.h" // for NS_IsMainThread
#include "pratom.h" // for PR_ATOMIC_INCREMENT
class nsMainThreadSurfaceRef;
#ifdef XP_WIN #ifdef XP_WIN
struct ID3D10Texture2D; struct ID3D10Texture2D;
@ -41,6 +26,9 @@ typedef void* HANDLE;
namespace mozilla { namespace mozilla {
class CrossProcessMutex; class CrossProcessMutex;
namespace ipc {
class Shmem;
}
namespace layers { namespace layers {
@ -48,6 +36,7 @@ class ImageClient;
class SharedPlanarYCbCrImage; class SharedPlanarYCbCrImage;
class DeprecatedSharedPlanarYCbCrImage; class DeprecatedSharedPlanarYCbCrImage;
class TextureClient; class TextureClient;
class SurfaceDescriptor;
struct ImageBackendData struct ImageBackendData
{ {

14
gfx/layers/ImageDataSerializer.cpp
View File

@ -3,15 +3,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ImageDataSerializer.h" #include "mozilla/layers/ImageDataSerializer.h"
#include "gfx2DGlue.h" // for SurfaceFormatToImageFormat #include "gfxImageSurface.h"
#include "gfxASurface.h" // for gfxASurface #include "mozilla/gfx/2D.h"
#include "gfxImageSurface.h" // for gfxImageSurface #include "gfx2DGlue.h"
#include "gfxPoint.h" // for gfxIntSize #include "mozilla/gfx/Tools.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/2D.h" // for DataSourceSurface, Factory
#include "mozilla/gfx/Tools.h" // for GetAlignedStride, etc
#include "mozilla/mozalloc.h" // for operator delete, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

9
gfx/layers/ImageDataSerializer.h
View File

@ -8,11 +8,10 @@
#ifndef GFX_LAYERS_BLOBSURFACE_H #ifndef GFX_LAYERS_BLOBSURFACE_H
#define GFX_LAYERS_BLOBSURFACE_H #define GFX_LAYERS_BLOBSURFACE_H
#include <stdint.h> // for uint8_t, uint32_t #include "mozilla/gfx/Point.h"
#include "mozilla/Attributes.h" // for MOZ_STACK_CLASS #include "mozilla/RefPtr.h"
#include "mozilla/RefPtr.h" // for TemporaryRef
#include "mozilla/gfx/Point.h" // for IntSize #include <stdint.h>
#include "mozilla/gfx/Types.h" // for SurfaceFormat
class gfxImageSurface; class gfxImageSurface;

6
gfx/layers/ImageLayers.cpp
View File

@ -4,11 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ImageLayers.h" #include "ImageLayers.h"
#include "ImageContainer.h" // for ImageContainer #include "ImageContainer.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxRect.h" // for gfxRect
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for ImageContainer::Release, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

12
gfx/layers/ImageLayers.h
View File

@ -6,15 +6,11 @@
#ifndef GFX_IMAGELAYER_H #ifndef GFX_IMAGELAYER_H
#define GFX_IMAGELAYER_H #define GFX_IMAGELAYER_H
#include "Layers.h" // for Layer, etc #include "Layers.h"
#include "gfxPattern.h" // for gfxPattern, etc
#include "gfxPoint.h" // for gfxIntSize
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/layers/LayersTypes.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nscore.h" // for nsACString
class gfx3DMatrix; #include "ImageTypes.h"
#include "nsISupportsImpl.h"
#include "gfxPattern.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

19
gfx/layers/LayerSorter.cpp
View File

@ -4,23 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LayerSorter.h" #include "LayerSorter.h"
#include <math.h> // for fabs #include "DirectedGraph.h"
#include <stdint.h> // for uint32_t
#include <stdio.h> // for fprintf, stderr, FILE
#include <stdlib.h> // for getenv
#include "DirectedGraph.h" // for DirectedGraph
#include "Layers.h" // for Layer
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxLineSegment.h" // for gfxLineSegment
#include "gfxPoint.h" // for gfxPoint
#include "gfxPoint3D.h" // for gfxPoint3D
#include "gfxQuad.h" // for gfxQuad
#include "gfxRect.h" // for gfxRect
#include "gfxTypes.h" // for gfxFloat
#include "mozilla/gfx/BasePoint3D.h" // for BasePoint3D
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray, etc
#include "limits.h" #include "limits.h"
#include "gfxLineSegment.h"
#include "Layers.h"
#include "mozilla/Assertions.h" #include "mozilla/Assertions.h"
namespace mozilla { namespace mozilla {

26
gfx/layers/LayerTreeInvalidation.cpp
View File

@ -4,28 +4,10 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LayerTreeInvalidation.h" #include "LayerTreeInvalidation.h"
#include <stdint.h> // for uint32_t #include "Layers.h"
#include "ImageContainer.h" // for ImageContainer #include "ImageLayers.h"
#include "ImageLayers.h" // for ImageLayer, etc #include "gfxUtils.h"
#include "Layers.h" // for Layer, ContainerLayer, etc #include "nsDataHashtable.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxColor.h" // for gfxRGBA
#include "gfxPattern.h" // for gfxPattern, etc
#include "gfxPoint.h" // for gfxIntSize
#include "gfxPoint3D.h" // for gfxPoint3D
#include "gfxRect.h" // for gfxRect
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/mozalloc.h" // for operator new, etc
#include "nsAutoPtr.h" // for nsRefPtr, nsAutoPtr, etc
#include "nsDataHashtable.h" // for nsDataHashtable
#include "nsDebug.h" // for NS_ASSERTION
#include "nsHashKeys.h" // for nsPtrHashKey
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsTArray.h" // for nsAutoTArray, nsTArray_Impl
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

3
gfx/layers/LayerTreeInvalidation.h
View File

@ -6,10 +6,9 @@
#ifndef GFX_LAYER_TREE_INVALIDATION_H #ifndef GFX_LAYER_TREE_INVALIDATION_H
#define GFX_LAYER_TREE_INVALIDATION_H #define GFX_LAYER_TREE_INVALIDATION_H
#include "nsRegion.h" // for nsIntRegion #include "nsRegion.h"
class nsPresContext; class nsPresContext;
struct nsIntPoint;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

44
gfx/layers/Layers.cpp
View File

@ -5,33 +5,25 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "Layers.h" #include "mozilla/DebugOnly.h"
#include <algorithm> // for max, min
#include "AnimationCommon.h" // for ComputedTimingFunction
#include "CompositableHost.h" // for CompositableHost
#include "GeckoProfilerFunc.h" // for TimeStamp, TimeDuration
#include "ImageContainer.h" // for ImageContainer, etc
#include "ImageLayers.h" // for ImageLayer
#include "LayerSorter.h" // for SortLayersBy3DZOrder
#include "LayersLogging.h" // for AppendToString
#include "ReadbackLayer.h" // for ReadbackLayer
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxUtils.h" // for gfxUtils, etc
#include "mozilla/DebugOnly.h" // for DebugOnly
#include "mozilla/Preferences.h" // for Preferences
#include "mozilla/Telemetry.h" // for Accumulate
#include "mozilla/TelemetryHistogramEnums.h"
#include "mozilla/gfx/2D.h" // for DrawTarget
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/layers/AsyncPanZoomController.h" #include "mozilla/layers/AsyncPanZoomController.h"
#include "mozilla/layers/Compositor.h" // for Compositor #include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/CompositorTypes.h" #include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/layers/LayerManagerComposite.h" // for LayerComposite #include "mozilla/Telemetry.h"
#include "mozilla/layers/LayerTransaction.h" // for TransformFunction, etc #include "CompositableHost.h"
#include "nsAString.h"
#include "nsCSSValue.h" // for nsCSSValue::Array, etc #include "ImageLayers.h"
#include "nsPrintfCString.h" // for nsPrintfCString #include "ImageContainer.h"
#include "nsStyleStruct.h" // for nsTimingFunction, etc #include "Layers.h"
#include "gfxPlatform.h"
#include "ReadbackLayer.h"
#include "gfxUtils.h"
#include "nsPrintfCString.h"
#include "LayerSorter.h"
#include "AnimationCommon.h"
#include "mozilla/layers/Compositor.h"
#include "LayersLogging.h"
using namespace mozilla::layers; using namespace mozilla::layers;
using namespace mozilla::gfx; using namespace mozilla::gfx;

61
gfx/layers/Layers.h
View File

@ -6,44 +6,25 @@
#ifndef GFX_LAYERS_H #ifndef GFX_LAYERS_H
#define GFX_LAYERS_H #define GFX_LAYERS_H
#include <stdint.h> // for uint32_t, uint64_t, uint8_t #include "mozilla/DebugOnly.h"
#include <stdio.h> // for FILE
#include <sys/types.h> // for int32_t, int64_t
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING
#include "FrameMetrics.h" // for FrameMetrics
#include "Units.h" // for LayerMargin, LayerPoint
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxColor.h" // for gfxRGBA
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPattern.h" // for gfxPattern, etc
#include "gfxPoint.h" // for gfxPoint, gfxIntSize
#include "gfxRect.h" // for gfxRect
#include "mozilla/Assertions.h" // for MOZ_ASSERT_HELPER2, etc
#include "mozilla/DebugOnly.h" // for DebugOnly
#include "mozilla/RefPtr.h" // for TemporaryRef
#include "mozilla/TimeStamp.h" // for TimeStamp, TimeDuration
#include "mozilla/gfx/BaseMargin.h" // for BaseMargin
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Types.h" // for SurfaceFormat
#include "mozilla/gfx/UserData.h" // for UserData, etc
#include "mozilla/layers/LayersTypes.h" #include "mozilla/layers/LayersTypes.h"
#include "mozilla/mozalloc.h" // for operator delete, etc #include "gfxTypes.h"
#include "nsAutoPtr.h" // for nsAutoPtr, nsRefPtr, etc #include "gfxASurface.h"
#include "nsCOMPtr.h" // for already_AddRefed #include "nsRegion.h"
#include "nsCSSProperty.h" // for nsCSSProperty #include "nsPoint.h"
#include "nsDebug.h" // for NS_ASSERTION #include "nsRect.h"
#include "nsISupportsImpl.h" // for Layer::Release, etc #include "nsISupportsImpl.h"
#include "nsRect.h" // for nsIntRect #include "nsAutoPtr.h"
#include "nsRegion.h" // for nsIntRegion #include "gfx3DMatrix.h"
#include "nsSize.h" // for nsIntSize #include "gfxColor.h"
#include "nsString.h" // for nsCString #include "gfxPattern.h"
#include "nsStyleAnimation.h" // for nsStyleAnimation::Value, etc #include "nsTArray.h"
#include "nsTArray.h" // for nsTArray #include "nsThreadUtils.h"
#include "nsTArrayForwardDeclare.h" // for InfallibleTArray #include "nsStyleAnimation.h"
#include "nscore.h" // for nsACString, nsAString #include "FrameMetrics.h"
#include "prlog.h" // for PRLogModuleInfo #include "mozilla/gfx/2D.h"
#include "mozilla/TimeStamp.h"
class gfxContext; class gfxContext;
class nsPaintEvent; class nsPaintEvent;
@ -55,10 +36,6 @@ namespace mozilla {
class FrameLayerBuilder; class FrameLayerBuilder;
class WebGLContext; class WebGLContext;
namespace gfx {
class DrawTarget;
}
namespace gl { namespace gl {
class GLContext; class GLContext;
} }
@ -90,6 +67,7 @@ class LayerManagerComposite;
class SpecificLayerAttributes; class SpecificLayerAttributes;
class SurfaceDescriptor; class SurfaceDescriptor;
class Compositor; class Compositor;
class LayerComposite;
struct TextureFactoryIdentifier; struct TextureFactoryIdentifier;
struct EffectMask; struct EffectMask;
@ -613,6 +591,7 @@ private:
TimeStamp mTabSwitchStart; TimeStamp mTabSwitchStart;
}; };
class ThebesLayer;
typedef InfallibleTArray<Animation> AnimationArray; typedef InfallibleTArray<Animation> AnimationArray;
struct AnimData { struct AnimData {

9
gfx/layers/LayersLogging.cpp
View File

@ -6,15 +6,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LayersLogging.h" #include "LayersLogging.h"
#include <stdint.h> // for uint8_t
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxColor.h" // for gfxRGBA
#include "gfxMatrix.h" // for gfxMatrix
#include "mozilla/gfx/Matrix.h" // for Matrix4x4, Matrix
#include "nsDebug.h" // for NS_ERROR
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsSize.h" // for nsIntSize
using namespace mozilla::gfx; using namespace mozilla::gfx;

31
gfx/layers/LayersLogging.h
View File

@ -6,28 +6,19 @@
#ifndef GFX_LAYERSLOGGING_H #ifndef GFX_LAYERSLOGGING_H
#define GFX_LAYERSLOGGING_H #define GFX_LAYERSLOGGING_H
#include "FrameMetrics.h" // for FrameMetrics, etc #include "Layers.h"
#include "gfxPattern.h" // for gfxPattern, etc #include "nsPoint.h"
#include "mozilla/gfx/Point.h" // for IntSize, etc #include "mozilla/gfx/Point.h"
#include "mozilla/gfx/Types.h" // for Filter, SurfaceFormat #include "mozilla/gfx/Rect.h"
#include "mozilla/layers/CompositorTypes.h" // for TextureFlags #include "mozilla/layers/Compositor.h"
#include "nsAString.h" #include "FrameMetrics.h"
#include "nsPrintfCString.h" // for nsPrintfCString #include "gfxPattern.h"
#include "nsRegion.h" // for nsIntRegion #include "gfxColor.h"
#include "nscore.h" // for nsACString, etc #include "gfx3DMatrix.h"
#include "nsRegion.h"
class gfx3DMatrix; #include "nsPrintfCString.h"
struct gfxRGBA;
struct nsIntPoint;
struct nsIntRect;
struct nsIntSize;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
template <class units> struct RectTyped;
}
namespace layers { namespace layers {
nsACString& nsACString&

6
gfx/layers/LayersTypes.h
View File

@ -6,15 +6,13 @@
#ifndef GFX_LAYERSTYPES_H #ifndef GFX_LAYERSTYPES_H
#define GFX_LAYERSTYPES_H #define GFX_LAYERSTYPES_H
#include <stdint.h> // for uint32_t #include "nsPoint.h"
#include "nsPoint.h" // for nsIntPoint
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
#include <ui/GraphicBuffer.h> #include <ui/GraphicBuffer.h>
#endif #endif
#if defined(DEBUG) || defined(PR_LOGGING) #if defined(DEBUG) || defined(PR_LOGGING)
# include <stdio.h> // FILE # include <stdio.h> // FILE
# include "prlog.h" // for PR_LOG # include "prlog.h"
# ifndef MOZ_LAYERS_HAVE_LOG # ifndef MOZ_LAYERS_HAVE_LOG
# define MOZ_LAYERS_HAVE_LOG # define MOZ_LAYERS_HAVE_LOG
# endif # endif

16
gfx/layers/ReadbackLayer.h
View File

@ -6,21 +6,7 @@
#ifndef GFX_READBACKLAYER_H #ifndef GFX_READBACKLAYER_H
#define GFX_READBACKLAYER_H #define GFX_READBACKLAYER_H
#include <stdint.h> // for uint64_t #include "Layers.h"
#include "Layers.h" // for Layer, etc
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxColor.h" // for gfxRGBA
#include "gfxRect.h" // for gfxRect
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsAutoPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsSize.h" // for nsIntSize
#include "nscore.h" // for nsACString
class gfxContext;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

17
gfx/layers/ReadbackProcessor.cpp
View File

@ -4,22 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ReadbackProcessor.h" #include "ReadbackProcessor.h"
#include <sys/types.h> // for int32_t #include "ReadbackLayer.h"
#include "Layers.h" // for Layer, ThebesLayer, etc
#include "ReadbackLayer.h" // for ReadbackLayer, ReadbackSink
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxColor.h" // for gfxRGBA
#include "gfxContext.h" // for gfxContext
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxRect.h" // for gfxRect
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "nsAutoPtr.h" // for nsRefPtr, nsAutoPtr
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for gfxContext::Release, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRegion.h" // for nsIntRegion
#include "nsSize.h" // for nsIntSize
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

8
gfx/layers/ReadbackProcessor.h
View File

@ -6,18 +6,14 @@
#ifndef GFX_READBACKPROCESSOR_H #ifndef GFX_READBACKPROCESSOR_H
#define GFX_READBACKPROCESSOR_H #define GFX_READBACKPROCESSOR_H
#include <stdint.h> // for uint64_t #include "ThebesLayerBuffer.h"
#include "nsRect.h" // for nsIntRect #include "nsTArray.h"
#include "nsTArray.h" // for nsTArray
class nsIntRegion;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ContainerLayer; class ContainerLayer;
class ReadbackLayer; class ReadbackLayer;
class ThebesLayer;
class ReadbackProcessor { class ReadbackProcessor {
public: public:

2
gfx/layers/RenderTrace.cpp
View File

@ -3,11 +3,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "Layers.h"
#include "RenderTrace.h" #include "RenderTrace.h"
// If rendertrace is off let's no compile this code // If rendertrace is off let's no compile this code
#ifdef MOZ_RENDERTRACE #ifdef MOZ_RENDERTRACE
#include "Layers.h"
namespace mozilla { namespace mozilla {

12
gfx/layers/SharedTextureImage.h
View File

@ -6,15 +6,9 @@
#ifndef GFX_SHAREDTEXTUREIMAGE_H #ifndef GFX_SHAREDTEXTUREIMAGE_H
#define GFX_SHAREDTEXTUREIMAGE_H #define GFX_SHAREDTEXTUREIMAGE_H
#include "GLContext.h" // for GLContext, etc #include "ImageContainer.h"
#include "GLContextProvider.h" // for GLContextProvider #include "GLContext.h"
#include "ImageContainer.h" // for Image #include "GLContextProvider.h"
#include "ImageTypes.h" // for ImageFormat::SHARED_TEXTURE
#include "gfxPoint.h" // for gfxIntSize
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsSize.h" // for nsIntSize
class gfxASurface;
// Split into a separate header from ImageLayers.h due to GLContext.h dependence // Split into a separate header from ImageLayers.h due to GLContext.h dependence
// Implementation remains in ImageLayers.cpp // Implementation remains in ImageLayers.cpp

38
gfx/layers/ThebesLayerBuffer.cpp
View File

@ -3,33 +3,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "base/basictypes.h"
#include "BasicLayersImpl.h"
#include "ThebesLayerBuffer.h" #include "ThebesLayerBuffer.h"
#include <sys/types.h> // for int32_t #include "Layers.h"
#include <algorithm> // for max #include "gfxContext.h"
#include "BasicImplData.h" // for BasicImplData #include "gfxPlatform.h"
#include "BasicLayersImpl.h" // for ToData #include "gfxTeeSurface.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL #include "gfxUtils.h"
#include "Layers.h" // for ThebesLayer, Layer, etc #include "ipc/AutoOpenSurface.h"
#include "gfxColor.h" // for gfxRGBA #include "nsDeviceContext.h"
#include "gfxContext.h" // for gfxContext, etc #include "GeckoProfiler.h"
#include "gfxMatrix.h" // for gfxMatrix #include <algorithm>
#include "gfxPattern.h" // for gfxPattern
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxPoint.h" // for gfxPoint
#include "gfxRect.h" // for gfxRect
#include "gfxTeeSurface.h" // for gfxTeeSurface
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/Util.h" // for ArrayLength
#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
#include "mozilla/gfx/Types.h" // for ExtendMode::EXTEND_CLAMP, etc
#include "mozilla/layers/ShadowLayers.h" // for ShadowableLayer
#include "mozilla/layers/TextureClient.h" // for DeprecatedTextureClient
#include "nsSize.h" // for nsIntSize
namespace mozilla { namespace mozilla {

30
gfx/layers/ThebesLayerBuffer.h
View File

@ -6,33 +6,17 @@
#ifndef THEBESLAYERBUFFER_H_ #ifndef THEBESLAYERBUFFER_H_
#define THEBESLAYERBUFFER_H_ #define THEBESLAYERBUFFER_H_
#include <stdint.h> // for uint32_t #include "gfxContext.h"
#include "gfxASurface.h" // for gfxASurface, etc #include "gfxASurface.h"
#include "gfxContext.h" // for gfxContext #include "nsRegion.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/layers/TextureClient.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef #include "mozilla/gfx/2D.h"
#include "mozilla/gfx/2D.h" // for DrawTarget, etc #include "Layers.h"
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_RUNTIMEABORT
#include "nsISupportsImpl.h" // for gfxContext::AddRef, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
struct gfxMatrix;
struct nsIntSize;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix;
}
namespace layers { namespace layers {
class DeprecatedTextureClient; class AutoOpenSurface;
class ThebesLayer; class ThebesLayer;
/** /**

10
gfx/layers/TiledLayerBuffer.h
View File

@ -16,13 +16,9 @@
//#define GFX_TILEDLAYER_DEBUG_OVERLAY //#define GFX_TILEDLAYER_DEBUG_OVERLAY
//#define GFX_TILEDLAYER_PREF_WARNINGS //#define GFX_TILEDLAYER_PREF_WARNINGS
#include <stdint.h> // for uint16_t, uint32_t #include "nsRect.h"
#include <sys/types.h> // for int32_t #include "nsRegion.h"
#include "nsDebug.h" // for NS_ABORT_IF_FALSE #include "nsTArray.h"
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

11
gfx/layers/YCbCrImageDataSerializer.cpp
View File

@ -4,15 +4,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/YCbCrImageDataSerializer.h" #include "mozilla/layers/YCbCrImageDataSerializer.h"
#include <string.h> // for memcpy #include "yuv_convert.h"
#include "gfx2DGlue.h" // for ToIntSize #include "mozilla/gfx/2D.h"
#include "mozilla/gfx/2D.h" // for DataSourceSurface, Factory #include "gfx2DGlue.h"
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/gfx/Types.h"
#include "mozilla/mozalloc.h" // for operator delete
#include "yuv_convert.h" // for ConvertYCbCrToRGB32, etc
#define MOZ_ALIGN_WORD(x) (((x) + 3) & ~3) #define MOZ_ALIGN_WORD(x) (((x) + 3) & ~3)
using namespace mozilla::ipc;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

17
gfx/layers/YCbCrImageDataSerializer.h
View File

@ -6,17 +6,18 @@
#ifndef MOZILLA_LAYERS_BLOBYCBCRSURFACE_H #ifndef MOZILLA_LAYERS_BLOBYCBCRSURFACE_H
#define MOZILLA_LAYERS_BLOBYCBCRSURFACE_H #define MOZILLA_LAYERS_BLOBYCBCRSURFACE_H
#include <stddef.h> // for size_t #include "mozilla/DebugOnly.h"
#include <stdint.h> // for uint8_t, uint32_t
#include "ImageTypes.h" // for StereoMode #include "base/basictypes.h"
#include "gfxPoint.h" // for gfxIntSize #include "Shmem.h"
#include "mozilla/Attributes.h" // for MOZ_STACK_CLASS #include "gfxPoint.h"
#include "mozilla/RefPtr.h" // for TemporaryRef
#include "mozilla/gfx/Point.h" // for IntSize
namespace mozilla { namespace mozilla {
namespace ipc {
class Shmem;
}
namespace gfx { namespace gfx {
class DataSourceSurface; class DataSourceSurface;
} }
namespace layers { namespace layers {

19
gfx/layers/basic/BasicCanvasLayer.cpp
View File

@ -3,13 +3,20 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/PLayerTransactionParent.h"
#include "BasicCanvasLayer.h" #include "BasicCanvasLayer.h"
#include "basic/BasicLayers.h" // for BasicLayerManager #include "gfxImageSurface.h"
#include "mozilla/mozalloc.h" // for operator new #include "GLContext.h"
#include "nsAutoPtr.h" // for nsRefPtr #include "gfxUtils.h"
#include "nsCOMPtr.h" // for already_AddRefed #include "gfxPlatform.h"
#include "nsISupportsImpl.h" // for Layer::AddRef, etc #include "mozilla/Preferences.h"
class gfxContext; #include "BasicLayersImpl.h"
#include "SurfaceStream.h"
#include "SharedSurfaceGL.h"
#include "SharedSurfaceEGL.h"
#include "GeckoProfiler.h"
#include "nsXULAppAPI.h"
using namespace mozilla::gfx; using namespace mozilla::gfx;
using namespace mozilla::gl; using namespace mozilla::gl;

19
gfx/layers/basic/BasicCanvasLayer.h
View File

@ -6,19 +6,24 @@
#ifndef GFX_BASICCANVASLAYER_H #ifndef GFX_BASICCANVASLAYER_H
#define GFX_BASICCANVASLAYER_H #define GFX_BASICCANVASLAYER_H
#include "BasicImplData.h" // for BasicImplData #include "BasicLayersImpl.h"
#include "BasicLayers.h" // for BasicLayerManager #include "nsXULAppAPI.h"
#include "CopyableCanvasLayer.h" // for CopyableCanvasLayer #include "BasicLayers.h"
#include "Layers.h" // for CanvasLayer, etc #include "BasicImplData.h"
#include "nsDebug.h" // for NS_ASSERTION #include "mozilla/layers/CanvasClient.h"
#include "nsRegion.h" // for nsIntRegion #include "mozilla/Preferences.h"
class gfxContext; #include "CopyableCanvasLayer.h"
#include "gfxPlatform.h"
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CanvasClient2D;
class CanvasClientWebGL;
class BasicCanvasLayer : public CopyableCanvasLayer, class BasicCanvasLayer : public CopyableCanvasLayer,
public BasicImplData public BasicImplData
{ {

16
gfx/layers/basic/BasicColorLayer.cpp
View File

@ -3,20 +3,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "BasicLayersImpl.h" // for FillWithMask, etc #include "mozilla/layers/PLayerTransactionParent.h"
#include "Layers.h" // for ColorLayer, etc #include "BasicLayersImpl.h"
#include "BasicImplData.h" // for BasicImplData
#include "BasicLayers.h" // for BasicLayerManager
#include "gfxContext.h" // for gfxContext, etc
#include "gfxRect.h" // for gfxRect
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;

1
gfx/layers/basic/BasicCompositor.h
View File

@ -8,7 +8,6 @@
#include "mozilla/layers/Compositor.h" #include "mozilla/layers/Compositor.h"
#include "mozilla/layers/TextureHost.h" #include "mozilla/layers/TextureHost.h"
#include "mozilla/gfx/2D.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

14
gfx/layers/basic/BasicContainerLayer.cpp
View File

@ -3,24 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "BasicLayersImpl.h"
#include "BasicContainerLayer.h" #include "BasicContainerLayer.h"
#include <sys/types.h> // for int32_t
#include "BasicLayersImpl.h" // for ToData
#include "basic/BasicImplData.h" // for BasicImplData
#include "basic/BasicLayers.h" // for BasicLayerManager
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
BasicContainerLayer::~BasicContainerLayer() BasicContainerLayer::~BasicContainerLayer()
{ {
while (mFirstChild) { while (mFirstChild) {

12
gfx/layers/basic/BasicContainerLayer.h
View File

@ -6,16 +6,8 @@
#ifndef GFX_BASICCONTAINERLAYER_H #ifndef GFX_BASICCONTAINERLAYER_H
#define GFX_BASICCONTAINERLAYER_H #define GFX_BASICCONTAINERLAYER_H
#include "BasicImplData.h" // for BasicImplData #include "BasicLayers.h"
#include "BasicLayers.h" // for BasicLayerManager #include "BasicImplData.h"
#include "Layers.h" // for Layer, ContainerLayer
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxMatrix.h" // for gfxMatrix
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsUtils.h" // for NS_ADDREF, NS_RELEASE
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR
struct nsIntRect;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

31
gfx/layers/basic/BasicImageLayer.cpp
View File

@ -3,37 +3,22 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "./../mozilla-config.h" // for MOZ_X11 #include "mozilla/layers/PLayerTransactionParent.h"
#include "BasicLayersImpl.h" // for FillWithMask, etc #include "BasicLayersImpl.h"
#include "ImageContainer.h" // for AutoLockImage, etc #include "SharedTextureImage.h"
#include "ImageLayers.h" // for ImageLayer #include "gfxUtils.h"
#include "Layers.h" // for Layer (ptr only), etc #include "gfxSharedImageSurface.h"
#include "basic/BasicImplData.h" // for BasicImplData #include "mozilla/layers/ImageClient.h"
#include "basic/BasicLayers.h" // for BasicLayerManager #include "mozilla/layers/TextureClient.h"
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxContext.h" // for gfxContext
#include "gfxPattern.h" // for gfxPattern, etc
#include "gfxPoint.h" // for gfxIntSize
#include "gfxUtils.h" // for gfxUtils
#ifdef MOZ_X11 #ifdef MOZ_X11
#include "gfxXlibSurface.h" // for gfxXlibSurface #include "gfxXlibSurface.h"
#endif #endif
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr, getter_AddRefs, etc
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for gfxPattern::Release, etc
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class SurfaceDescriptor;
class BasicImageLayer : public ImageLayer, public BasicImplData { class BasicImageLayer : public ImageLayer, public BasicImplData {
public: public:
BasicImageLayer(BasicLayerManager* aLayerManager) : BasicImageLayer(BasicLayerManager* aLayerManager) :

31
gfx/layers/basic/BasicImages.cpp
View File

@ -3,27 +3,24 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <stdint.h> // for uint8_t, uint32_t #include "mozilla/ReentrantMonitor.h"
#include "BasicLayers.h" // for BasicLayerManager
#include "ImageContainer.h" // for PlanarYCbCrImage, etc #include "ImageLayers.h"
#include "ImageTypes.h" // for ImageFormat, etc #include "BasicLayers.h"
#include "cairo.h" // for cairo_user_data_key_t #include "gfxImageSurface.h"
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxPlatform.h" // for gfxPlatform, gfxImageFormat
#include "gfxPoint.h" // for gfxIntSize
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/mozalloc.h" // for operator delete[], etc
#include "nsAutoPtr.h" // for nsRefPtr, nsAutoArrayPtr
#include "nsAutoRef.h" // for nsCountedRef
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ERROR, NS_ASSERTION
#include "nsISupportsImpl.h" // for Image::Release, etc
#include "nsThreadUtils.h" // for NS_IsMainThread
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include "gfxQuartzImageSurface.h" #include "gfxQuartzImageSurface.h"
#endif #endif
#include "cairo.h"
#include "gfxUtils.h"
#include "gfxPlatform.h"
using mozilla::ReentrantMonitor;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

9
gfx/layers/basic/BasicImplData.h
View File

@ -5,18 +5,9 @@
#ifndef GFX_BASICIMPLDATA_H #ifndef GFX_BASICIMPLDATA_H
#define GFX_BASICIMPLDATA_H #define GFX_BASICIMPLDATA_H
#include "Layers.h" // for Layer (ptr only), etc
#include "gfxContext.h" // for gfxContext, etc
#include "nsDebug.h" // for NS_ASSERTION
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
class gfxASurface;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ReadbackProcessor;
class SurfaceDescriptor;
/** /**
* This is the ImplData for all Basic layers. It also exposes methods * This is the ImplData for all Basic layers. It also exposes methods
* private to the Basic implementation that are common to all Basic layer types. * private to the Basic implementation that are common to all Basic layer types.

72
gfx/layers/basic/BasicLayerManager.cpp
View File

@ -3,53 +3,33 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include <stdint.h> // for uint32_t #include "mozilla/dom/TabChild.h"
#include <stdlib.h> // for rand, RAND_MAX #include "mozilla/Hal.h"
#include <sys/types.h> // for int32_t #include "mozilla/layers/PLayerChild.h"
#include "BasicContainerLayer.h" // for BasicContainerLayer #include "mozilla/layers/PLayerTransactionChild.h"
#include "BasicLayersImpl.h" // for ToData, BasicReadbackLayer, etc #include "mozilla/layers/PLayerTransactionParent.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL
#include "ImageContainer.h" // for ImageFactory
#include "Layers.h" // for Layer, ContainerLayer, etc
#include "ReadbackLayer.h" // for ReadbackLayer
#include "ReadbackProcessor.h" // for ReadbackProcessor
#include "RenderTrace.h" // for RenderTraceLayers, etc
#include "basic/BasicImplData.h" // for BasicImplData
#include "basic/BasicLayers.h" // for BasicLayerManager, etc
#include "cairo-rename.h" // for pixman_image_create_bits, etc
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxCachedTempSurface.h" // for gfxCachedTempSurface
#include "gfxColor.h" // for gfxRGBA
#include "gfxContext.h" // for gfxContext, etc
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxPoint.h" // for gfxIntSize, gfxPoint
#include "gfxRect.h" // for gfxRect
#include "gfxUtils.h" // for gfxUtils
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/WidgetUtils.h" // for ScreenRotation
#include "mozilla/gfx/2D.h" // for DrawTarget
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/gfx/Matrix.h" // for Matrix
#include "mozilla/gfx/Rect.h" // for IntRect, Rect
#include "mozilla/layers/LayersTypes.h" // for BufferMode::BUFFER_NONE, etc
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION, etc
#include "nsISupportsImpl.h" // for gfxContext::Release, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion, etc
#include "nsTArray.h" // for nsAutoTArray
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
#define PIXMAN_DONT_DEFINE_STDINT
#include "pixman.h" // for pixman_f_transform, etc
class nsIWidget; #include "gfxSharedImageSurface.h"
#include "gfxImageSurface.h"
#include "gfxUtils.h"
#include "gfxPlatform.h"
#include "nsXULAppAPI.h"
#include "RenderTrace.h"
#include "GeckoProfiler.h"
#define PIXMAN_DONT_DEFINE_STDINT
#include "pixman.h"
#include "BasicLayersImpl.h"
#include "BasicThebesLayer.h"
#include "BasicContainerLayer.h"
#include "CompositorChild.h"
#include "mozilla/Preferences.h"
#include "nsIWidget.h"
#ifdef MOZ_WIDGET_ANDROID
#include "AndroidBridge.h"
#endif
using namespace mozilla::dom; using namespace mozilla::dom;
using namespace mozilla::gfx; using namespace mozilla::gfx;

34
gfx/layers/basic/BasicLayers.h
View File

@ -6,33 +6,29 @@
#ifndef GFX_BASICLAYERS_H #ifndef GFX_BASICLAYERS_H
#define GFX_BASICLAYERS_H #define GFX_BASICLAYERS_H
#include <stdint.h> // for INT32_MAX, int32_t #include "Layers.h"
#include "Layers.h" // for Layer (ptr only), etc
#include "gfxASurface.h" // for gfxASurface, etc #include "gfxContext.h"
#include "gfxCachedTempSurface.h" // for gfxCachedTempSurface #include "gfxCachedTempSurface.h"
#include "gfxContext.h" // for gfxContext #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/WidgetUtils.h"
#include "mozilla/WidgetUtils.h" // for ScreenRotation #include "nsAutoRef.h"
#include "mozilla/layers/LayersTypes.h" // for BufferMode, LayersBackend, etc #include "nsThreadUtils.h"
#include "nsAString.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsISupportsImpl.h" // for gfxContext::AddRef, etc
#include "nsRegion.h" // for nsIntRegion
#include "nscore.h" // for nsAString, etc
class gfxPattern;
class nsIWidget; class nsIWidget;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class BasicShadowableLayer; class BasicShadowableLayer;
class ImageFactory; class ThebesLayerComposite;
class ImageLayer; class ContainerLayerComposite;
class PaintLayerContext; class ImageLayerComposite;
class ReadbackLayer; class CanvasLayerComposite;
class ColorLayerComposite;
class ReadbackProcessor; class ReadbackProcessor;
class ImageFactory;
class PaintLayerContext;
/** /**
* This is a cairo/Thebes-only, main-thread-only implementation of layers. * This is a cairo/Thebes-only, main-thread-only implementation of layers.

11
gfx/layers/basic/BasicLayersImpl.cpp
View File

@ -3,15 +3,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/DebugOnly.h"
#include "BasicLayersImpl.h" #include "BasicLayersImpl.h"
#include <new> // for operator new #include "mozilla/layers/PLayerTransaction.h"
#include "Layers.h" // for Layer, etc
#include "basic/BasicImplData.h" // for BasicImplData
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/DebugOnly.h" // for DebugOnly
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/ISurfaceAllocator.h"
using namespace mozilla::gfx; using namespace mozilla::gfx;

23
gfx/layers/basic/BasicLayersImpl.h
View File

@ -6,27 +6,18 @@
#ifndef GFX_BASICLAYERSIMPL_H #ifndef GFX_BASICLAYERSIMPL_H
#define GFX_BASICLAYERSIMPL_H #define GFX_BASICLAYERSIMPL_H
#include "BasicImplData.h" // for BasicImplData #include "ipc/AutoOpenSurface.h"
#include "BasicLayers.h" // for BasicLayerManager #include "ipc/ShadowLayerChild.h"
#include "ReadbackLayer.h" // for ReadbackLayer #include "BasicLayers.h"
#include "gfxASurface.h" // for gfxASurface #include "BasicImplData.h"
#include "gfxContext.h" // for gfxContext, etc #include "ReadbackLayer.h"
#include "gfxMatrix.h" // for gfxMatrix #include "ReadbackProcessor.h"
#include "ipc/AutoOpenSurface.h" // for AutoOpenSurface
#include "mozilla/Attributes.h" // for MOZ_DELETE, MOZ_STACK_CLASS
#include "mozilla/Util.h" // for Maybe
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for gfxContext::Release, etc
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class BasicContainerLayer; class BasicContainerLayer;
class Layer; class ShadowableLayer;
class AutoSetOperator { class AutoSetOperator {
public: public:

29
gfx/layers/basic/BasicThebesLayer.cpp
View File

@ -4,29 +4,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "BasicThebesLayer.h" #include "BasicThebesLayer.h"
#include <stdint.h> // for uint32_t #include "gfxUtils.h"
#include "GeckoProfiler.h" // for PROFILER_LABEL #include "nsIWidget.h"
#include "ReadbackLayer.h" // for ReadbackLayer, ReadbackSink #include "RenderTrace.h"
#include "ReadbackProcessor.h" // for ReadbackProcessor::Update, etc #include "GeckoProfiler.h"
#include "RenderTrace.h" // for RenderTraceInvalidateEnd, etc
#include "BasicLayersImpl.h" // for AutoMaskData, etc #include "prprf.h"
#include "gfxASurface.h" // for gfxASurface, 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 nsIntRect
#include "nsTArray.h" // for nsTArray, nsTArray_Impl
struct gfxMatrix;
using namespace mozilla::gfx; using namespace mozilla::gfx;

19
gfx/layers/basic/BasicThebesLayer.h
View File

@ -6,26 +6,13 @@
#ifndef GFX_BASICTHEBESLAYER_H #ifndef GFX_BASICTHEBESLAYER_H
#define GFX_BASICTHEBESLAYER_H #define GFX_BASICTHEBESLAYER_H
#include "Layers.h" // for ThebesLayer, LayerManager, etc #include "mozilla/layers/PLayerTransactionParent.h"
#include "ThebesLayerBuffer.h" // for ThebesLayerBuffer, etc #include "BasicLayersImpl.h"
#include "BasicImplData.h" // for BasicImplData #include "mozilla/layers/ContentClient.h"
#include "BasicLayers.h" // for BasicLayerManager
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxPoint.h" // for gfxPoint
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/layers/ContentClient.h" // for ContentClientBasic
#include "mozilla/mozalloc.h" // for operator delete
#include "nsDebug.h" // for NS_ASSERTION
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
class gfxContext;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ReadbackProcessor;
class BasicThebesLayer : public ThebesLayer, public BasicImplData { class BasicThebesLayer : public ThebesLayer, public BasicImplData {
public: public:
typedef ThebesLayerBuffer::PaintState PaintState; typedef ThebesLayerBuffer::PaintState PaintState;

30
gfx/layers/client/CanvasClient.cpp
View File

@ -4,34 +4,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/CanvasClient.h" #include "mozilla/layers/CanvasClient.h"
#include "ClientCanvasLayer.h" // for ClientCanvasLayer #include "mozilla/layers/TextureClient.h"
#include "GLContext.h" // for GLContext #include "ClientCanvasLayer.h"
#include "GLScreenBuffer.h" // for GLScreenBuffer #include "mozilla/layers/ShadowLayers.h"
#include "Layers.h" // for Layer, etc #include "SharedTextureImage.h"
#include "SurfaceStream.h" // for SurfaceStream #include "nsXULAppAPI.h"
#include "SurfaceTypes.h" // for SurfaceStreamHandle #include "GLContext.h"
#include "gfx2DGlue.h" // for ImageFormatToSurfaceFormat #include "SurfaceStream.h"
#include "gfxASurface.h" // for gfxASurface, etc #include "SharedSurface.h"
#include "gfxPlatform.h" // for gfxPlatform
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/LayersTypes.h"
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for printf_stderr, NS_ASSERTION
#include "nsXULAppAPI.h" // for XRE_GetProcessType, etc
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
#include "SharedSurfaceGralloc.h" #include "SharedSurfaceGralloc.h"
#endif #endif
using namespace mozilla::gl; using namespace mozilla::gl;
namespace mozilla {
namespace gfx {
class SharedSurface;
}
}
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

15
gfx/layers/client/CanvasClient.h
View File

@ -6,23 +6,14 @@
#ifndef MOZILLA_GFX_CANVASCLIENT_H #ifndef MOZILLA_GFX_CANVASCLIENT_H
#define MOZILLA_GFX_CANVASCLIENT_H #define MOZILLA_GFX_CANVASCLIENT_H
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/layers/TextureClient.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/CompositableClient.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc
#include "mozilla/mozalloc.h" // for operator delete
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Types.h" // for SurfaceFormat
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ClientCanvasLayer; class ClientCanvasLayer;
class CompositableForwarder;
/** /**
* Compositable client for 2d and webgl canvas. * Compositable client for 2d and webgl canvas.

19
gfx/layers/client/ClientCanvasLayer.cpp
View File

@ -4,21 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ClientCanvasLayer.h" #include "ClientCanvasLayer.h"
#include "GLContext.h" // for GLContext #include "gfxPlatform.h"
#include "GLScreenBuffer.h" // for GLScreenBuffer #include "SurfaceStream.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL #include "SharedSurfaceGL.h"
#include "SharedSurfaceEGL.h" // for SurfaceFactory_EGLImage #include "SharedSurfaceEGL.h"
#include "SharedSurfaceGL.h" // for SurfaceFactory_GLTexture, etc
#include "SurfaceStream.h" // for SurfaceStream, etc
#include "SurfaceTypes.h" // for SurfaceStreamType
#include "ClientLayerManager.h" // for ClientLayerManager, etc
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/LayersTypes.h"
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsRect.h" // for nsIntRect
#include "nsXULAppAPI.h" // for XRE_GetProcessType, etc
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
#include "SharedSurfaceGralloc.h" #include "SharedSurfaceGralloc.h"
#endif #endif

23
gfx/layers/client/ClientCanvasLayer.h
View File

@ -6,26 +6,21 @@
#ifndef GFX_CLIENTCANVASLAYER_H #ifndef GFX_CLIENTCANVASLAYER_H
#define GFX_CLIENTCANVASLAYER_H #define GFX_CLIENTCANVASLAYER_H
#include "mozilla/layers/CanvasClient.h" // for CanvasClient, etc #include "ClientLayerManager.h"
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "nsXULAppAPI.h"
#include "CopyableCanvasLayer.h" // for CopyableCanvasLayer #include "gfxASurface.h"
#include "Layers.h" // for CanvasLayer, etc #include "mozilla/Preferences.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/LayerTransaction.h"
#include "mozilla/RefPtr.h" // for RefPtr #include "mozilla/layers/CanvasClient.h"
#include "mozilla/layers/LayerTransaction.h" // for CanvasLayerAttributes, etc #include "CopyableCanvasLayer.h"
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_ASSERTION
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableClient; class CanvasClient2D;
class ShadowableLayer; class CanvasClientWebGL;
class ClientCanvasLayer : public CopyableCanvasLayer, class ClientCanvasLayer : public CopyableCanvasLayer,
public ClientLayer public ClientLayer

14
gfx/layers/client/ClientColorLayer.cpp
View File

@ -3,24 +3,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "ClientLayerManager.h"
#include "Layers.h" // for ColorLayer, etc #include "mozilla/layers/LayerTransaction.h"
#include "mozilla/layers/LayerTransaction.h" // for ColorLayerAttributes, etc
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ShadowableLayer;
class ClientColorLayer : public ColorLayer, class ClientColorLayer : public ColorLayer,
public ClientLayer { public ClientLayer {
public: public:

17
gfx/layers/client/ClientContainerLayer.cpp
View File

@ -1,17 +1,5 @@
/* -*- 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 "ClientContainerLayer.h" #include "ClientContainerLayer.h"
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "BasicLayersImpl.h"
#include "mozilla/mozalloc.h" // for operator new
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
namespace mozilla {
namespace layers {
already_AddRefed<ContainerLayer> already_AddRefed<ContainerLayer>
ClientLayerManager::CreateContainerLayer() ClientLayerManager::CreateContainerLayer()
@ -32,6 +20,3 @@ ClientLayerManager::CreateRefLayer()
CREATE_SHADOW(Ref); CREATE_SHADOW(Ref);
return layer.forget(); return layer.forget();
} }
}
}

31
gfx/layers/client/ClientContainerLayer.h
View File

@ -1,27 +1,7 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- #include "ClientLayerManager.h"
* This Source Code Form is subject to the terms of the Mozilla Public #include "gfxPlatform.h"
* 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/. */
#ifndef GFX_CLIENTCONTAINERLAYER_H using namespace mozilla::layers;
#define GFX_CLIENTCONTAINERLAYER_H
#include <stdint.h> // for uint32_t
#include "ClientLayerManager.h" // for ClientLayerManager, etc
#include "Layers.h" // for Layer, ContainerLayer, etc
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPlatform.h" // for gfxPlatform
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsUtils.h" // for NS_ADDREF, NS_RELEASE
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsAutoTArray
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla {
namespace layers {
class ShadowableLayer;
template<class Container> void template<class Container> void
ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer) ContainerInsertAfter(Layer* aChild, Layer* aAfter, Container* aContainer)
@ -300,8 +280,3 @@ private:
return static_cast<ClientLayerManager*>(mManager); return static_cast<ClientLayerManager*>(mManager);
} }
}; };
}
}
#endif

24
gfx/layers/client/ClientImageLayer.cpp
View File

@ -3,32 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "ClientLayerManager.h"
#include "ImageContainer.h" // for AutoLockImage, etc #include "mozilla/layers/LayerTransaction.h"
#include "ImageLayers.h" // for ImageLayer #include "mozilla/layers/ImageClient.h"
#include "gfxASurface.h" // for gfxASurface #include "ImageContainer.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/ImageClient.h" // for ImageClient, etc
#include "mozilla/layers/LayerTransaction.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
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableClient;
class Layer;
class ShadowableLayer;
class ClientImageLayer : public ImageLayer, class ClientImageLayer : public ImageLayer,
public ClientLayer { public ClientLayer {
public: public:

29
gfx/layers/client/ClientLayerManager.cpp
View File

@ -4,27 +4,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ClientLayerManager.h" #include "ClientLayerManager.h"
#include "CompositorChild.h" // for CompositorChild #include "nsIWidget.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL #include "mozilla/dom/TabChild.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxASurface.h" // for gfxASurface, etc
#include "ipc/AutoOpenSurface.h" // for AutoOpenSurface
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Hal.h" #include "mozilla/Hal.h"
#include "mozilla/dom/ScreenOrientation.h" // for ScreenOrientation #include "mozilla/layers/PLayerChild.h"
#include "mozilla/dom/TabChild.h" // for TabChild
#include "mozilla/hal_sandbox/PHal.h" // for ScreenConfiguration
#include "mozilla/layers/CompositableClient.h" // for CompositableChild, etc
#include "mozilla/layers/ContentClient.h" // for ContentClientRemote
#include "mozilla/layers/ISurfaceAllocator.h"
#include "mozilla/layers/LayerTransaction.h" // for EditReply, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/PLayerChild.h" // for PLayerChild
#include "mozilla/layers/PLayerTransactionChild.h" #include "mozilla/layers/PLayerTransactionChild.h"
#include "nsAString.h" #include "mozilla/layers/PLayerTransactionParent.h"
#include "nsIWidget.h" // for nsIWidget #include "CompositorChild.h"
#include "nsTArray.h" // for AutoInfallibleTArray #include "ipc/AutoOpenSurface.h"
#include "nsXULAppAPI.h" // for XRE_GetProcessType, etc #include "ipc/ShadowLayerChild.h"
#include "mozilla/layers/CompositableClient.h"
#include "mozilla/layers/ContentClient.h"
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
#include "AndroidBridge.h" #include "AndroidBridge.h"
#endif #endif

23
gfx/layers/client/ClientLayerManager.h
View File

@ -6,33 +6,13 @@
#ifndef GFX_CLIENTLAYERMANAGER_H #ifndef GFX_CLIENTLAYERMANAGER_H
#define GFX_CLIENTLAYERMANAGER_H #define GFX_CLIENTLAYERMANAGER_H
#include <stdint.h> // for int32_t
#include "Layers.h" #include "Layers.h"
#include "gfxContext.h" // for gfxContext #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/WidgetUtils.h" // for ScreenRotation
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/LayersTypes.h" // for BufferMode, LayersBackend, etc
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ABORT_IF_FALSE
#include "nsISupportsImpl.h" // for Layer::Release, etc
#include "nsRect.h" // for nsIntRect
#include "nsTArray.h" // for nsTArray
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR
#include "nscore.h" // for nsAString
class nsIWidget;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ClientThebesLayer;
class CompositorChild; class CompositorChild;
class ImageLayer;
class PLayerChild;
class ClientLayerManager : public LayerManager, class ClientLayerManager : public LayerManager,
public ShadowLayerForwarder public ShadowLayerForwarder
@ -202,6 +182,7 @@ private:
bool mCompositorMightResample; bool mCompositorMightResample;
}; };
class ClientThebesLayer;
class ClientLayer : public ShadowableLayer class ClientLayer : public ShadowableLayer
{ {
public: public:

17
gfx/layers/client/ClientThebesLayer.cpp
View File

@ -4,22 +4,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ClientThebesLayer.h" #include "ClientThebesLayer.h"
#include <stdint.h> // for uint32_t #include "ClientTiledThebesLayer.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL
#include "client/ClientLayerManager.h" // for ClientLayerManager, etc
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxContext.h" // for gfxContext
#include "gfxRect.h" // for gfxRect
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/2D.h" // for DrawTarget
#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 Layer::AddRef, etc
#include "nsRect.h" // for nsIntRect
using namespace mozilla::gfx; using namespace mozilla::gfx;

20
gfx/layers/client/ClientThebesLayer.h
View File

@ -6,27 +6,13 @@
#ifndef GFX_CLIENTTHEBESLAYER_H #ifndef GFX_CLIENTTHEBESLAYER_H
#define GFX_CLIENTTHEBESLAYER_H #define GFX_CLIENTTHEBESLAYER_H
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "ClientLayerManager.h"
#include "Layers.h" // for ThebesLayer, etc #include "ThebesLayerBuffer.h"
#include "ThebesLayerBuffer.h" // for ThebesLayerBuffer, etc #include "mozilla/layers/ContentClient.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/layers/ContentClient.h" // for ContentClient
#include "mozilla/mozalloc.h" // for operator delete
#include "nsDebug.h" // for NS_ASSERTION
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
#include "mozilla/layers/PLayerTransaction.h" // for ThebesLayerAttributes
class gfxContext;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableClient;
class ShadowableLayer;
class SpecificLayerAttributes;
class ClientThebesLayer : public ThebesLayer, class ClientThebesLayer : public ThebesLayer,
public ClientLayer { public ClientLayer {
public: public:

19
gfx/layers/client/ClientTiledThebesLayer.cpp
View File

@ -2,21 +2,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this file, * 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/. */ * You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/PLayerTransactionChild.h"
#include "ClientTiledThebesLayer.h" #include "ClientTiledThebesLayer.h"
#include "FrameMetrics.h" // for FrameMetrics #include "gfxImageSurface.h"
#include "Units.h" // for ScreenIntRect, CSSPoint, etc #include "GeckoProfiler.h"
#include "ClientLayerManager.h" // for ClientLayerManager, etc #include "gfxPlatform.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxPoint.h" // for gfxSize
#include "gfxRect.h" // for gfxRect
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/gfx/Rect.h" // for Rect, RectTyped
#include "mozilla/layers/LayerTransaction.h"
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nsRect.h" // for nsIntRect
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

14
gfx/layers/client/ClientTiledThebesLayer.h
View File

@ -5,20 +5,14 @@
#ifndef GFX_CLIENTTILEDTHEBESLAYER_H #ifndef GFX_CLIENTTILEDTHEBESLAYER_H
#define GFX_CLIENTTILEDTHEBESLAYER_H #define GFX_CLIENTTILEDTHEBESLAYER_H
#include "ClientLayerManager.h" // for ClientLayer, etc #include "mozilla/layers/ShadowLayers.h"
#include "Layers.h" // for ThebesLayer, etc #include "ClientLayerManager.h"
#include "mozilla/RefPtr.h" // for RefPtr #include "mozilla/layers/TiledContentClient.h" // tiles and tile buffer
#include "mozilla/layers/TiledContentClient.h"
#include "nsDebug.h" // for NS_RUNTIMEABORT
#include "nsRegion.h" // for nsIntRegion
class gfxContext;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ShadowableLayer; class BasicTiledLayerBuffer;
class SpecificLayerAttributes;
/** /**
* An implementation of ThebesLayer that ONLY supports remote * An implementation of ThebesLayer that ONLY supports remote

9
gfx/layers/client/CompositableClient.cpp
View File

@ -4,12 +4,11 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/CompositableClient.h" #include "mozilla/layers/CompositableClient.h"
#include <stdint.h> // for uint64_t, uint32_t #include "mozilla/layers/TextureClient.h"
#include "gfxPlatform.h" // for gfxPlatform
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/TextureClient.h" // for DeprecatedTextureClient, etc
#include "mozilla/layers/TextureClientOGL.h" #include "mozilla/layers/TextureClientOGL.h"
#include "mozilla/mozalloc.h" // for operator delete, etc #include "mozilla/layers/LayerTransactionChild.h"
#include "mozilla/layers/CompositableForwarder.h"
#include "gfxPlatform.h"
#ifdef XP_WIN #ifdef XP_WIN
#include "mozilla/layers/TextureD3D9.h" #include "mozilla/layers/TextureD3D9.h"
#include "mozilla/layers/TextureD3D11.h" #include "mozilla/layers/TextureD3D11.h"

14
gfx/layers/client/CompositableClient.h
View File

@ -6,24 +6,20 @@
#ifndef MOZILLA_GFX_BUFFERCLIENT_H #ifndef MOZILLA_GFX_BUFFERCLIENT_H
#define MOZILLA_GFX_BUFFERCLIENT_H #define MOZILLA_GFX_BUFFERCLIENT_H
#include <stdint.h> // for uint64_t #include "mozilla/layers/PCompositableChild.h"
#include <vector> // for vector #include "mozilla/layers/LayersTypes.h"
#include "mozilla/Assertions.h" // for MOZ_CRASH #include "mozilla/RefPtr.h"
#include "mozilla/RefPtr.h" // for TemporaryRef, RefCounted
#include "mozilla/gfx/Types.h" // for SurfaceFormat
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/LayersTypes.h" // for LayersBackend
#include "mozilla/layers/PCompositableChild.h" // for PCompositableChild
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableChild;
class CompositableClient; class CompositableClient;
class DeprecatedTextureClient; class DeprecatedTextureClient;
class TextureClient; class TextureClient;
class BufferTextureClient; class BufferTextureClient;
class ImageBridgeChild; class ImageBridgeChild;
class ShadowableLayer;
class CompositableForwarder; class CompositableForwarder;
class CompositableChild; class CompositableChild;
class SurfaceDescriptor; class SurfaceDescriptor;

28
gfx/layers/client/ContentClient.cpp
View File

@ -4,29 +4,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/ContentClient.h" #include "mozilla/layers/ContentClient.h"
#include "BasicLayers.h" // for BasicLayerManager #include "mozilla/gfx/2D.h"
#include "Layers.h" // for ThebesLayer, Layer, etc #include "BasicThebesLayer.h"
#include "gfxColor.h" // for gfxRGBA #include "nsIWidget.h"
#include "gfxContext.h" // for gfxContext, etc #include "gfxUtils.h"
#include "gfxPlatform.h" // for gfxPlatform #include "gfxPlatform.h"
#include "gfxPoint.h" // for gfxIntSize, gfxPoint
#include "gfxTeeSurface.h" // for gfxTeeSurface
#include "gfxUtils.h" // for gfxUtils
#include "ipc/ShadowLayers.h" // for ShadowLayerForwarder
#include "mozilla/Util.h" // for ArrayLength
#include "mozilla/gfx/2D.h" // for DrawTarget, Factory
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h"
#include "mozilla/layers/LayerManagerComposite.h" #include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/layers/LayerTransaction.h" // for ThebesBufferData #include "gfxTeeSurface.h"
#include "mozilla/layers/LayersTypes.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_ASSERTION, NS_WARNING, etc
#include "nsISupportsImpl.h" // for gfxContext::Release, etc
#include "nsIWidget.h" // for nsIWidget
#include "prenv.h" // for PR_GetEnv
#ifdef XP_WIN #ifdef XP_WIN
#include "gfxWindowsPlatform.h" #include "gfxWindowsPlatform.h"
#endif #endif

36
gfx/layers/client/ContentClient.h
View File

@ -6,39 +6,19 @@
#ifndef MOZILLA_GFX_CONTENTCLIENT_H #ifndef MOZILLA_GFX_CONTENTCLIENT_H
#define MOZILLA_GFX_CONTENTCLIENT_H #define MOZILLA_GFX_CONTENTCLIENT_H
#include <stdint.h> // for uint32_t #include "mozilla/layers/LayersSurfaces.h"
#include "ThebesLayerBuffer.h" // for ThebesLayerBuffer, etc #include "mozilla/layers/CompositableClient.h"
#include "gfxASurface.h" // for gfxASurface, etc #include "gfxReusableSurfaceWrapper.h"
#include "gfxPlatform.h" // for gfxPlatform #include "mozilla/layers/TextureClient.h"
#include "mozilla/Assertions.h" // for MOZ_CRASH #include "ThebesLayerBuffer.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "ipc/AutoOpenSurface.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef #include "ipc/ShadowLayerChild.h"
#include "mozilla/gfx/Point.h" // for IntSize #include "gfxPlatform.h"
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/ISurfaceAllocator.h"
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/TextureClient.h" // for DeprecatedTextureClient
#include "mozilla/mozalloc.h" // for operator delete
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray
class gfxContext;
struct gfxMatrix;
namespace mozilla { namespace mozilla {
namespace gfx {
class DrawTarget;
}
namespace layers { namespace layers {
class BasicLayerManager; class BasicLayerManager;
class ThebesLayer;
/** /**
* A compositable client for Thebes layers. These are different to Image/Canvas * A compositable client for Thebes layers. These are different to Image/Canvas

37
gfx/layers/client/ImageClient.cpp
View File

@ -3,35 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ImageClient.h" #include "mozilla/layers/TextureClient.h"
#include <stdint.h> // for uint32_t #include "mozilla/layers/ImageClient.h"
#include "ImageContainer.h" // for Image, PlanarYCbCrImage, etc #include "BasicLayers.h"
#include "ImageTypes.h" // for ImageFormat::PLANAR_YCBCR, etc #include "mozilla/layers/ShadowLayers.h"
#include "SharedTextureImage.h" // for SharedTextureImage::Data, etc #include "SharedTextureImage.h"
#include "gfx2DGlue.h" // for ImageFormatToSurfaceFormat #include "ImageContainer.h" // For PlanarYCbCrImage
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxPoint.h" // for gfxIntSize
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Types.h" // for SurfaceFormat, etc
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/CompositorTypes.h" // for CompositableType, etc
#include "mozilla/layers/ISurfaceAllocator.h"
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder
#include "mozilla/layers/SharedPlanarYCbCrImage.h"
#include "mozilla/layers/SharedRGBImage.h" #include "mozilla/layers/SharedRGBImage.h"
#include "mozilla/layers/TextureClient.h" // for TextureClient, etc #include "mozilla/layers/SharedPlanarYCbCrImage.h"
#include "mozilla/mozalloc.h" // for operator delete, etc #include "gfxPlatform.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_WARNING, NS_ASSERTION
#include "nsISupportsImpl.h" // for Image::Release, etc
#include "nsRect.h" // for nsIntRect
#ifdef MOZ_WIDGET_GONK #ifdef MOZ_WIDGET_GONK
#include "GrallocImages.h" #include "GrallocImages.h"
#endif #endif

21
gfx/layers/client/ImageClient.h
View File

@ -6,26 +6,17 @@
#ifndef MOZILLA_GFX_IMAGECLIENT_H #ifndef MOZILLA_GFX_IMAGECLIENT_H
#define MOZILLA_GFX_IMAGECLIENT_H #define MOZILLA_GFX_IMAGECLIENT_H
#include <stdint.h> // for uint32_t, uint64_t #include "mozilla/layers/LayersSurfaces.h"
#include <sys/types.h> // for int32_t #include "mozilla/layers/CompositableClient.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/TextureClient.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef #include "gfxPattern.h"
#include "mozilla/gfx/Types.h" // for SurfaceFormat
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositorTypes.h" // for CompositableType, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/TextureClient.h" // for DeprecatedTextureClient, etc
#include "mozilla/mozalloc.h" // for operator delete
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsRect.h" // for nsIntRect
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableForwarder;
class Image;
class ImageContainer; class ImageContainer;
class ShadowableLayer; class ImageLayer;
class PlanarYCbCrImage;
/** /**
* Image clients are used by basic image layers on the content thread, they * Image clients are used by basic image layers on the content thread, they

33
gfx/layers/client/TextureClient.cpp
View File

@ -4,29 +4,32 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/TextureClient.h" #include "mozilla/layers/TextureClient.h"
#include <stdint.h> // for uint8_t, uint32_t, etc #include "mozilla/layers/TextureClientOGL.h"
#include "Layers.h" // for Layer, etc
#include "gfxContext.h" // for gfxContext, etc #include "mozilla/layers/ImageClient.h"
#include "gfxPlatform.h" // for gfxPlatform #include "mozilla/layers/CanvasClient.h"
#include "gfxPoint.h" // for gfxIntSize, gfxSize #include "mozilla/layers/ContentClient.h"
#include "gfxReusableSurfaceWrapper.h" // for gfxReusableSurfaceWrapper #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/ipc/SharedMemory.h" // for SharedMemory, etc
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/ISurfaceAllocator.h"
#include "mozilla/layers/ImageDataSerializer.h"
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder
#include "mozilla/layers/SharedPlanarYCbCrImage.h" #include "mozilla/layers/SharedPlanarYCbCrImage.h"
#include "GLContext.h"
#include "BasicLayers.h" // for PaintContext
#include "mozilla/layers/YCbCrImageDataSerializer.h" #include "mozilla/layers/YCbCrImageDataSerializer.h"
#include "nsDebug.h" // for NS_ASSERTION, NS_WARNING, etc #include "gfxReusableSurfaceWrapper.h"
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc #include "gfxPlatform.h"
#include "mozilla/layers/ImageDataSerializer.h"
#include "gfx2DGlue.h"
#include <stdint.h>
using namespace mozilla::gl; using namespace mozilla::gl;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
TextureClient::TextureClient(TextureFlags aFlags) TextureClient::TextureClient(TextureFlags aFlags)
: mID(0) : mID(0)
, mFlags(aFlags) , mFlags(aFlags)

33
gfx/layers/client/TextureClient.h
View File

@ -6,34 +6,25 @@
#ifndef MOZILLA_GFX_TEXTURECLIENT_H #ifndef MOZILLA_GFX_TEXTURECLIENT_H
#define MOZILLA_GFX_TEXTURECLIENT_H #define MOZILLA_GFX_TEXTURECLIENT_H
#include <stddef.h> // for size_t #include "mozilla/layers/LayersSurfaces.h"
#include <stdint.h> // for uint32_t, uint8_t, uint64_t #include "gfxASurface.h"
#include "GLContext.h" // for GLContext (ptr only), etc #include "mozilla/layers/CompositorTypes.h" // for TextureInfo
#include "GLTextureImage.h" // for TextureImage #include "mozilla/RefPtr.h"
#include "ImageContainer.h" // for PlanarYCbCrImage, etc #include "ImageContainer.h" // for PlanarYCbCrImage::Data
#include "ImageTypes.h" // for StereoMode
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxImageSurface.h" // for gfxImageSurface
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr, RefCounted
#include "mozilla/gfx/2D.h" // for DrawTarget
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Types.h" // for SurfaceFormat
#include "mozilla/ipc/Shmem.h" // for Shmem
#include "mozilla/layers/CompositorTypes.h" // for TextureFlags, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsISupportsImpl.h" // for TextureImage::AddRef, etc
class gfxReusableSurfaceWrapper; class gfxReusableSurfaceWrapper;
namespace mozilla { namespace mozilla {
namespace gl {
class GLContext;
}
namespace layers { namespace layers {
class ContentClient; class ContentClient;
class PlanarYCbCrImage;
class Image;
class CompositableForwarder; class CompositableForwarder;
class ISurfaceAllocator; class ISurfaceAllocator;
class CompositableClient; class CompositableClient;

18
gfx/layers/client/TiledContentClient.cpp
View File

@ -4,21 +4,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/TiledContentClient.h" #include "mozilla/layers/TiledContentClient.h"
#include <math.h> // for ceil, ceilf, floor #include "mozilla/gfx/2D.h"
#include "ClientTiledThebesLayer.h" // for ClientTiledThebesLayer #include "mozilla/MathAlgorithms.h"
#include "GeckoProfilerImpl.h" // for PROFILER_LABEL #include "ClientTiledThebesLayer.h"
#include "ClientLayerManager.h" // for ClientLayerManager
#include "gfxContext.h" // for gfxContext, etc
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxRect.h" // for gfxRect
#include "mozilla/MathAlgorithms.h" // for Abs
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/layers/CompositableForwarder.h"
#include "mozilla/layers/ShadowLayers.h" // for ShadowLayerForwarder
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for gfxContext::AddRef, etc
#include "nsSize.h" // for nsIntSize
#ifdef GFX_TILEDLAYER_DEBUG_OVERLAY #ifdef GFX_TILEDLAYER_DEBUG_OVERLAY
#include "cairo.h" #include "cairo.h"

26
gfx/layers/client/TiledContentClient.h
View File

@ -6,29 +6,9 @@
#ifndef MOZILLA_GFX_TILEDCONTENTCLIENT_H #ifndef MOZILLA_GFX_TILEDCONTENTCLIENT_H
#define MOZILLA_GFX_TILEDCONTENTCLIENT_H #define MOZILLA_GFX_TILEDCONTENTCLIENT_H
#include <stddef.h> // for size_t #include "mozilla/layers/ContentClient.h"
#include <stdint.h> // for uint16_t #include "TiledLayerBuffer.h"
#include <algorithm> // for swap #include "gfxPlatform.h"
#include "Layers.h" // for LayerManager, etc
#include "TiledLayerBuffer.h" // for TiledLayerBuffer
#include "Units.h" // for CSSPoint
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxASurface.h" // for gfxASurface, etc
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxPoint.h" // for gfxSize
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/layers/CompositableClient.h" // for CompositableClient
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/TextureClient.h"
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc
#include "nsTraceRefcnt.h" // for MOZ_COUNT_DTOR
#include "gfxReusableSurfaceWrapper.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

19
gfx/layers/composite/APZCTreeManager.cpp
View File

@ -5,19 +5,8 @@
#include "APZCTreeManager.h" #include "APZCTreeManager.h"
#include "AsyncCompositionManager.h" // for ViewTransform #include "AsyncCompositionManager.h" // for ViewTransform
#include "Compositor.h" // for Compositor #include "LayerManagerComposite.h" // for AsyncCompositionManager.h
#include "CompositorParent.h" // for CompositorParent, etc #include "Compositor.h"
#include "InputData.h" // for InputData, etc
#include "Layers.h" // for ContainerLayer, Layer, etc
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "mozilla/dom/Touch.h" // for Touch
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/layers/AsyncPanZoomController.h"
#include "mozilla/mozalloc.h" // for operator new
#include "nsGUIEvent.h" // for nsMouseEvent, nsTouchEvent, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc
#include "nsThreadUtils.h" // for NS_IsMainThread
#define APZC_LOG(...) #define APZC_LOG(...)
// #define APZC_LOG(args...) printf_stderr(args) // #define APZC_LOG(args...) printf_stderr(args)
@ -32,10 +21,6 @@ APZCTreeManager::APZCTreeManager()
AsyncPanZoomController::InitializeGlobalState(); AsyncPanZoomController::InitializeGlobalState();
} }
APZCTreeManager::~APZCTreeManager()
{
}
void void
APZCTreeManager::AssertOnCompositorThread() APZCTreeManager::AssertOnCompositorThread()
{ {

23
gfx/layers/composite/APZCTreeManager.h
View File

@ -6,28 +6,13 @@
#ifndef mozilla_layers_APZCTreeManager_h #ifndef mozilla_layers_APZCTreeManager_h
#define mozilla_layers_APZCTreeManager_h #define mozilla_layers_APZCTreeManager_h
#include <stdint.h> // for uint64_t, uint32_t #include "mozilla/layers/AsyncPanZoomController.h"
#include "FrameMetrics.h" // for FrameMetrics, etc #include "Layers.h"
#include "Units.h" // for CSSPoint, CSSRect, etc #include "CompositorParent.h"
#include "gfxPoint.h" // for gfxPoint
#include "mozilla/Assertions.h" // for MOZ_ASSERT_HELPER2
#include "mozilla/Monitor.h" // for Monitor
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsEvent.h" // for nsEventStatus
#include "nsISupportsImpl.h"
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
class gfx3DMatrix;
class nsInputEvent;
template <class E> class nsTArray;
namespace mozilla { namespace mozilla {
class InputData;
namespace layers { namespace layers {
class Layer;
class AsyncPanZoomController; class AsyncPanZoomController;
class CompositorParent; class CompositorParent;
@ -116,7 +101,7 @@ class APZCTreeManager {
public: public:
APZCTreeManager(); APZCTreeManager();
virtual ~APZCTreeManager(); virtual ~APZCTreeManager() {}
/** /**
* Rebuild the APZC tree based on the layer update that just came up. Preserve * Rebuild the APZC tree based on the layer update that just came up. Preserve

40
gfx/layers/composite/AsyncCompositionManager.cpp
View File

@ -5,41 +5,21 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/AsyncCompositionManager.h" #include "mozilla/layers/AsyncCompositionManager.h"
#include <stdint.h> // for uint32_t #include "base/basictypes.h"
#include "AnimationCommon.h" // for ComputedTimingFunction
#include "CompositorParent.h" // for CompositorParent, etc
#include "FrameMetrics.h" // for FrameMetrics
#include "LayerManagerComposite.h" // for LayerManagerComposite, etc
#include "Layers.h" // for Layer, ContainerLayer, etc
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPoint.h" // for gfxPoint, gfxSize
#include "gfxPoint3D.h" // for gfxPoint3D
#include "mozilla/WidgetUtils.h" // for ComputeTransformForRotation
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/gfx/Point.h" // for RoundedToInt, PointTyped
#include "mozilla/gfx/Rect.h" // for RoundedToInt, RectTyped
#include "mozilla/gfx/ScaleFactor.h" // for ScaleFactor
#include "mozilla/layers/AsyncPanZoomController.h"
#include "mozilla/layers/Compositor.h" // for Compositor
#include "nsAnimationManager.h" // for ElementAnimations
#include "nsCSSPropList.h"
#include "nsCoord.h" // for NSAppUnitsToFloatPixels, etc
#include "nsDebug.h" // for NS_ASSERTION, etc
#include "nsDeviceContext.h" // for nsDeviceContext
#include "nsDisplayList.h" // for nsDisplayTransform, etc
#include "nsMathUtils.h" // for NS_round
#include "nsPoint.h" // for nsPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsStyleAnimation.h" // for nsStyleAnimation::Value, etc
#include "nsTArray.h" // for nsTArray, nsTArray_Impl, etc
#include "nsTArrayForwardDeclare.h" // for InfallibleTArray
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
# include <android/log.h> # include <android/log.h>
# include "AndroidBridge.h" # include "AndroidBridge.h"
#endif #endif
struct nsCSSValueList; #include "CompositorParent.h"
#include "LayerManagerComposite.h"
#include "nsStyleAnimation.h"
#include "nsDisplayList.h"
#include "AnimationCommon.h"
#include "nsAnimationManager.h"
#include "mozilla/layers/AsyncPanZoomController.h"
using namespace mozilla::dom; using namespace mozilla::dom;

25
gfx/layers/composite/AsyncCompositionManager.h
View File

@ -6,24 +6,23 @@
#ifndef GFX_ASYNCCOMPOSITIONMANAGER_H #ifndef GFX_ASYNCCOMPOSITIONMANAGER_H
#define GFX_ASYNCCOMPOSITIONMANAGER_H #define GFX_ASYNCCOMPOSITIONMANAGER_H
#include "GeckoProfilerFunc.h" // for TimeStamp #include "gfxPoint.h"
#include "Units.h" // for LayerPoint, etc #include "gfx3DMatrix.h"
#include "mozilla/layers/LayerManagerComposite.h" // for LayerManagerComposite #include "nsAutoPtr.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix #include "nsRect.h"
#include "mozilla/Attributes.h" // for MOZ_DELETE, MOZ_FINAL, etc #include "mozilla/dom/ScreenOrientation.h"
#include "mozilla/RefPtr.h" // for RefCounted #include "mozilla/gfx/Rect.h"
#include "mozilla/TimeStamp.h" // for TimeStamp #include "mozilla/Attributes.h"
#include "mozilla/dom/ScreenOrientation.h" // for ScreenOrientation #include "mozilla/RefPtr.h"
#include "mozilla/gfx/BasePoint.h" // for BasePoint #include "mozilla/TimeStamp.h"
#include "mozilla/layers/LayerTransaction.h" // for TargetConfig #include "mozilla/layers/LayerTransaction.h" // for TargetConfig
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsISupportsImpl.h" // for LayerManager::AddRef, etc
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class AsyncPanZoomController;
class Layer; class Layer;
class LayerManagerComposite;
class AutoResolveRefLayers; class AutoResolveRefLayers;
// Represents (affine) transforms that are calculated from a content view. // Represents (affine) transforms that are calculated from a content view.

25
gfx/layers/composite/CanvasLayerComposite.cpp
View File

@ -3,23 +3,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo
#include "mozilla/layers/Effects.h"
#include "CanvasLayerComposite.h" #include "CanvasLayerComposite.h"
#include "composite/CompositableHost.h" // for CompositableHost #include "ImageHost.h"
#include "gfx2DGlue.h" // for ToFilter, ToMatrix4x4 #include "gfxUtils.h"
#include "gfxImageSurface.h" // for gfxImageSurface #include "gfx2DGlue.h"
#include "gfxPattern.h" // for gfxPattern, etc
#include "gfxUtils.h" // for gfxUtils, etc
#include "mozilla/gfx/Matrix.h" // for Matrix4x4
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/Effects.h" // for EffectChain
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAString.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsPoint.h" // for nsIntPoint
#include "nsString.h" // for nsAutoCString
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla; using namespace mozilla;
using namespace mozilla::layers; using namespace mozilla::layers;

16
gfx/layers/composite/CanvasLayerComposite.h
View File

@ -6,20 +6,16 @@
#ifndef GFX_CanvasLayerComposite_H #ifndef GFX_CanvasLayerComposite_H
#define GFX_CanvasLayerComposite_H #define GFX_CanvasLayerComposite_H
#include "Layers.h" // for CanvasLayer, etc
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/RefPtr.h" // for RefPtr #include "gfxASurface.h"
#include "mozilla/layers/LayerManagerComposite.h" // for LayerComposite, etc #if defined(MOZ_WIDGET_GTK2) && !defined(MOZ_PLATFORM_MAEMO)
#include "mozilla/layers/LayersTypes.h" // for LayerRenderState, etc #include "mozilla/X11Util.h"
#include "nsDebug.h" // for NS_RUNTIMEABORT #endif
#include "nsRect.h" // for nsIntRect
#include "nscore.h" // for nsACString
struct nsIntPoint;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableHost;
// Canvas layers use ImageHosts (but CanvasClients) because compositing a // Canvas layers use ImageHosts (but CanvasClients) because compositing a
// canvas is identical to compositing an image. // canvas is identical to compositing an image.
class ImageHost; class ImageHost;

15
gfx/layers/composite/ColorLayerComposite.cpp
View File

@ -4,19 +4,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ColorLayerComposite.h" #include "ColorLayerComposite.h"
#include "gfx2DGlue.h" // for ToMatrix4x4 #include "mozilla/layers/Effects.h"
#include "gfxColor.h" // for gfxRGBA #include "gfx2DGlue.h"
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/Matrix.h" // for Matrix4x4
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h" // for Color
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/CompositorTypes.h" // for DIAGNOSTIC_COLOR
#include "mozilla/layers/Effects.h" // for Effect, EffectChain, etc
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

11
gfx/layers/composite/ColorLayerComposite.h
View File

@ -6,19 +6,14 @@
#ifndef GFX_ColorLayerComposite_H #ifndef GFX_ColorLayerComposite_H
#define GFX_ColorLayerComposite_H #define GFX_ColorLayerComposite_H
#include "Layers.h" // for ColorLayer, etc #include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layers/LayerManagerComposite.h" // for LayerComposite, etc
#include "mozilla/layers/LayersTypes.h" // for MOZ_LAYERS_HAVE_LOG
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
struct nsIntPoint; #include "mozilla/layers/LayerManagerComposite.h"
struct nsIntRect;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableHost;
class ColorLayerComposite : public ColorLayer, class ColorLayerComposite : public ColorLayer,
public LayerComposite public LayerComposite

21
gfx/layers/composite/CompositableHost.cpp
View File

@ -4,25 +4,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "CompositableHost.h" #include "CompositableHost.h"
#include <map> // for _Rb_tree_iterator, map, etc #include "ImageHost.h"
#include <utility> // for pair #include "ContentHost.h"
#include "ContentHost.h" // for ContentHostDoubleBuffered, etc #include "TiledContentHost.h"
#include "Effects.h" // for EffectMask, Effect, etc #include "Effects.h"
#include "ImageHost.h" // for DeprecatedImageHostBuffered, etc #include "mozilla/layers/CompositableTransactionParent.h"
#include "TiledContentHost.h" // for TiledContentHost #include "mozilla/layers/TextureHost.h"
#include "gfxImageSurface.h" // for gfxImageSurface
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/TextureHost.h" // for TextureHost, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_WARNING
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class Matrix4x4;
class Compositor;
CompositableHost::CompositableHost(const TextureInfo& aTextureInfo) CompositableHost::CompositableHost(const TextureInfo& aTextureInfo)
: mTextureInfo(aTextureInfo) : mTextureInfo(aTextureInfo)
, mCompositor(nullptr) , mCompositor(nullptr)

36
gfx/layers/composite/CompositableHost.h
View File

@ -6,35 +6,14 @@
#ifndef MOZILLA_GFX_BUFFERHOST_H #ifndef MOZILLA_GFX_BUFFERHOST_H
#define MOZILLA_GFX_BUFFERHOST_H #define MOZILLA_GFX_BUFFERHOST_H
#include <stdint.h> // for uint64_t #include "mozilla/layers/Compositor.h"
#include <stdio.h> // for FILE
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING
#include "gfxPoint.h" // for gfxSize
#include "gfxRect.h" // for gfxRect
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr, RefCounted, etc
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h" // for Filter
#include "mozilla/ipc/ProtocolUtils.h"
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/LayersTypes.h" // for LayerRenderState, etc
#include "mozilla/layers/PCompositableParent.h" #include "mozilla/layers/PCompositableParent.h"
#include "mozilla/mozalloc.h" // for operator delete #include "mozilla/layers/ISurfaceAllocator.h"
#include "nsCOMPtr.h" // for already_AddRefed #include "ThebesLayerBuffer.h"
#include "nsRegion.h" // for nsIntRegion #include "ClientTiledThebesLayer.h" // for BasicTiledLayerBuffer
#include "nscore.h" // for nsACString #include "mozilla/RefPtr.h"
class gfxImageSurface;
struct nsIntPoint;
struct nsIntRect;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
namespace layers { namespace layers {
// Some properties of a Layer required for tiling // Some properties of a Layer required for tiling
@ -52,11 +31,6 @@ class Layer;
class DeprecatedTextureHost; class DeprecatedTextureHost;
class TextureHost; class TextureHost;
class SurfaceDescriptor; class SurfaceDescriptor;
class Compositor;
class ISurfaceAllocator;
class ThebesBufferData;
class TiledLayerComposer;
struct EffectChain;
/** /**
* The compositor-side counterpart to CompositableClient. Responsible for * The compositor-side counterpart to CompositableClient. Responsible for

33
gfx/layers/composite/ContainerLayerComposite.cpp
View File

@ -4,35 +4,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ContainerLayerComposite.h" #include "ContainerLayerComposite.h"
#include <algorithm> // for min #include "gfxUtils.h"
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING #include "mozilla/layers/Compositor.h"
#include "FrameMetrics.h" // for FrameMetrics #include "mozilla/layers/LayersTypes.h"
#include "Units.h" // for LayerRect, LayerPixel, etc #include "gfx2DGlue.h"
#include "gfx2DGlue.h" // for ToMatrix4x4
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxImageSurface.h" // for gfxImageSurface
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPlatform.h" // for gfxPlatform
#include "gfxUtils.h" // for gfxUtils, etc
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/gfx/Matrix.h" // for Matrix4x4
#include "mozilla/gfx/Point.h" // for Point, IntPoint
#include "mozilla/gfx/Rect.h" // for IntRect, Rect
#include "mozilla/layers/Compositor.h" // for Compositor, etc
#include "mozilla/layers/CompositorTypes.h" // for DIAGNOSTIC_CONTAINER
#include "mozilla/layers/Effects.h" // for Effect, EffectChain, etc
#include "mozilla/layers/TextureHost.h" // for CompositingRenderTarget
#include "mozilla/mozalloc.h" // for operator delete, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsUtils.h" // for NS_ADDREF, NS_RELEASE
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsAutoTArray
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

17
gfx/layers/composite/ContainerLayerComposite.h
View File

@ -6,20 +6,19 @@
#ifndef GFX_ContainerLayerComposite_H #ifndef GFX_ContainerLayerComposite_H
#define GFX_ContainerLayerComposite_H #define GFX_ContainerLayerComposite_H
#include "Layers.h" // for Layer (ptr only), etc #include "mozilla/layers/PLayerTransaction.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/layers/LayerManagerComposite.h"
#include "mozilla/layers/LayersTypes.h" // for MOZ_LAYERS_HAVE_LOG
class gfx3DMatrix; #include "Layers.h"
struct nsIntPoint; #include "mozilla/layers/LayerManagerComposite.h"
struct nsIntRect; #include "mozilla/layers/Effects.h"
#include "gfxUtils.h"
#include "gfx2DGlue.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableHost;
class ContainerLayerComposite : public ContainerLayer, class ContainerLayerComposite : public ContainerLayer,
public LayerComposite public LayerComposite
{ {

20
gfx/layers/composite/ContentHost.cpp
View File

@ -4,26 +4,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/ContentHost.h" #include "mozilla/layers/ContentHost.h"
#include "LayersLogging.h" // for AppendToString #include "mozilla/layers/Effects.h"
#include "gfx2DGlue.h" // for ContentForFormat #include "nsPrintfCString.h"
#include "gfxPoint.h" // for gfxIntSize #include "gfx2DGlue.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/BaseRect.h" // for BaseRect
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/Effects.h" // for TexturedEffect, Effect, etc
#include "mozilla/layers/LayerTransaction.h" // for ThebesBufferData
#include "nsAString.h"
#include "nsPrintfCString.h" // for nsPrintfCString
#include "nsString.h" // for nsAutoCString
class gfxImageSurface;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
using namespace gfx; using namespace gfx;
namespace layers { namespace layers {
ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo) ContentHostBase::ContentHostBase(const TextureInfo& aTextureInfo)

39
gfx/layers/composite/ContentHost.h
View File

@ -6,45 +6,14 @@
#ifndef GFX_CONTENTHOST_H #ifndef GFX_CONTENTHOST_H
#define GFX_CONTENTHOST_H #define GFX_CONTENTHOST_H
#include <stdint.h> // for uint32_t #include "ThebesLayerBuffer.h"
#include <stdio.h> // for FILE #include "CompositableHost.h"
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING
#include "CompositableHost.h" // for CompositableHost, etc
#include "ThebesLayerBuffer.h" // for ThebesLayerBuffer, etc
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h" // for Filter
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/ISurfaceAllocator.h" // for ISurfaceAllocator
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/LayersTypes.h" // for MOZ_LAYERS_HAVE_LOG, etc
#include "mozilla/layers/TextureHost.h" // for DeprecatedTextureHost
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAutoPtr.h" // for nsAutoPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_RUNTIMEABORT
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTArray.h" // for nsTArray
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
#include "nscore.h" // for nsACString
class gfxImageSurface;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
namespace layers { namespace layers {
class Compositor;
class ThebesBufferData;
class TiledLayerComposer;
struct EffectChain;
class ThebesBuffer;
class OptionalThebesBuffer;
struct TexturedEffect; struct TexturedEffect;
/** /**

20
gfx/layers/composite/ImageHost.cpp
View File

@ -3,31 +3,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "ipc/AutoOpenSurface.h"
#include "ImageHost.h" #include "ImageHost.h"
#include "LayersLogging.h" // for AppendToString
#include "composite/CompositableHost.h" // for CompositableHost, etc
#include "ipc/IPCMessageUtils.h" // for null_t
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/Effects.h" // for TexturedEffect, Effect, etc
#include "nsAString.h"
#include "nsDebug.h" // for NS_WARNING, NS_ASSERTION
#include "nsPrintfCString.h" // for nsPrintfCString
#include "nsString.h" // for nsAutoCString
class gfxImageSurface; #include "mozilla/layers/Effects.h"
class nsIntRegion; #include "LayersLogging.h"
#include "nsPrintfCString.h"
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
using namespace gfx; using namespace gfx;
namespace layers { namespace layers {
class ISurfaceAllocator;
ImageHost::ImageHost(const TextureInfo& aTextureInfo) ImageHost::ImageHost(const TextureInfo& aTextureInfo)
: CompositableHost(aTextureInfo) : CompositableHost(aTextureInfo)
, mFrontBuffer(nullptr) , mFrontBuffer(nullptr)

28
gfx/layers/composite/ImageHost.h
View File

@ -6,35 +6,13 @@
#ifndef MOZILLA_GFX_IMAGEHOST_H #ifndef MOZILLA_GFX_IMAGEHOST_H
#define MOZILLA_GFX_IMAGEHOST_H #define MOZILLA_GFX_IMAGEHOST_H
#include <stdio.h> // for FILE, NULL #include "CompositableHost.h"
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING #include "mozilla/layers/LayerManagerComposite.h"
#include "CompositableHost.h" // for CompositableHost
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/gfx/Point.h" // for Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h" // for Filter
#include "mozilla/layers/CompositorTypes.h" // for TextureInfo, etc
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor
#include "mozilla/layers/LayersTypes.h" // for LayerRenderState, etc
#include "mozilla/layers/TextureHost.h" // for DeprecatedTextureHost, etc
#include "mozilla/mozalloc.h" // for operator delete
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsRect.h" // for nsIntRect
#include "nscore.h" // for nsACString
class gfxImageSurface;
class nsIntRegion;
namespace mozilla { namespace mozilla {
namespace gfx {
class Matrix4x4;
}
namespace layers { namespace layers {
class Compositor; class TextureHost;
class ISurfaceAllocator;
struct EffectChain;
/** /**
* ImageHost. Works with ImageClientSingle and ImageClientBuffered * ImageHost. Works with ImageClientSingle and ImageClientBuffered

36
gfx/layers/composite/ImageLayerComposite.cpp
View File

@ -3,31 +3,19 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "gfxSharedImageSurface.h"
#include "ipc/AutoOpenSurface.h"
#include "ImageLayerComposite.h" #include "ImageLayerComposite.h"
#include "mozilla-config.h" // for MOZ_DUMP_PAINTING #include "ImageHost.h"
#include "CompositableHost.h" // for CompositableHost #include "gfxImageSurface.h"
#include "Layers.h" // for WriteSnapshotToDumpFile, etc #include "gfx2DGlue.h"
#include "gfx2DGlue.h" // for ToFilter, ToMatrix4x4 #include "gfxUtils.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxImageSurface.h" // for gfxImageSurface #include "mozilla/layers/Compositor.h"
#include "gfxPoint.h" // for gfxIntSize #include "mozilla/layers/CompositorTypes.h" // for TextureInfo
#include "gfxRect.h" // for gfxRect #include "mozilla/layers/Effects.h"
#include "gfxUtils.h" // for gfxUtils, etc #include "CompositableHost.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/gfx/Matrix.h" // for Matrix4x4
#include "mozilla/gfx/Point.h" // for IntSize, Point
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/Effects.h" // for EffectChain
#include "mozilla/layers/TextureHost.h" // for DeprecatedTextureHost, etc
#include "mozilla/mozalloc.h" // for operator delete
#include "nsAString.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsDebug.h" // for NS_ASSERTION
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsString.h" // for nsAutoCString
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
using namespace mozilla::gfx; using namespace mozilla::gfx;

18
gfx/layers/composite/ImageLayerComposite.h
View File

@ -6,25 +6,17 @@
#ifndef GFX_ImageLayerComposite_H #ifndef GFX_ImageLayerComposite_H
#define GFX_ImageLayerComposite_H #define GFX_ImageLayerComposite_H
#include "GLTextureImage.h" // for TextureImage #include "mozilla/layers/PLayerTransaction.h"
#include "ImageLayers.h" // for ImageLayer #include "mozilla/layers/ShadowLayers.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/layers/LayerManagerComposite.h" // for LayerComposite, etc
#include "mozilla/layers/LayersTypes.h" // for LayerRenderState, etc
#include "nsISupportsImpl.h" // for TextureImage::AddRef, etc
#include "nscore.h" // for nsACString
class gfx3DMatrix; #include "mozilla/layers/LayerManagerComposite.h"
struct nsIntPoint; #include "ImageLayers.h"
struct nsIntRect; #include "mozilla/Mutex.h"
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class CompositableHost;
class ImageHost; class ImageHost;
class Layer;
class ImageLayerComposite : public ImageLayer, class ImageLayerComposite : public ImageLayer,
public LayerComposite public LayerComposite

83
gfx/layers/composite/LayerManagerComposite.cpp
View File

@ -3,65 +3,50 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LayerManagerComposite.h" #include "mozilla/layers/PLayerTransaction.h"
#include <stddef.h> // for size_t
#include <stdint.h> // for uint16_t, uint32_t // This must occur *after* layers/PLayerTransaction.h to avoid
#include "CanvasLayerComposite.h" // for CanvasLayerComposite // typedefs conflicts.
#include "ColorLayerComposite.h" // for ColorLayerComposite #include "mozilla/Util.h"
#include "Composer2D.h" // for Composer2D
#include "CompositableHost.h" // for CompositableHost #include "mozilla/layers/LayerManagerComposite.h"
#include "ContainerLayerComposite.h" // for ContainerLayerComposite, etc #include "ThebesLayerComposite.h"
#include "FrameMetrics.h" // for FrameMetrics #include "ContainerLayerComposite.h"
#include "GeckoProfilerImpl.h" // for profiler_set_frame_number, etc #include "ImageLayerComposite.h"
#include "ImageLayerComposite.h" // for ImageLayerComposite #include "ColorLayerComposite.h"
#include "Layers.h" // for Layer, ContainerLayer, etc #include "CanvasLayerComposite.h"
#include "ThebesLayerComposite.h" // for ThebesLayerComposite #include "CompositableHost.h"
#include "TiledLayerBuffer.h" // for TiledLayerComposer #include "mozilla/gfx/Matrix.h"
#include "Units.h" // for ScreenIntRect #include "mozilla/TimeStamp.h"
#include "gfx2DGlue.h" // for ToMatrix4x4 #include "mozilla/Preferences.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix #include "mozilla/layers/ImageHost.h"
#include "gfxMatrix.h" // for gfxMatrix #include "mozilla/layers/ContentHost.h"
#include "gfxPlatform.h" // for gfxPlatform #include "mozilla/layers/Compositor.h"
#include "gfxContext.h"
#include "gfxUtils.h"
#include "gfx2DGlue.h"
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include "gfxPlatformMac.h" #include "gfxPlatformMac.h"
#else
#include "gfxPlatform.h"
#endif #endif
#include "gfxPoint.h" // for gfxIntSize
#include "gfxRect.h" // for gfxRect #include "nsIWidget.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "nsIServiceManager.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef #include "nsIConsoleService.h"
#include "mozilla/gfx/2D.h" // for DrawTarget
#include "mozilla/gfx/Matrix.h" // for Matrix4x4 #include "gfxCrashReporterUtils.h"
#include "mozilla/gfx/Point.h" // for IntSize, Point
#include "mozilla/gfx/Rect.h" // for Rect #include "GeckoProfiler.h"
#include "mozilla/gfx/Types.h" // for Color, SurfaceFormat
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/Effects.h" // for Effect, EffectChain, etc
#include "mozilla/layers/LayersTypes.h" // for MOZ_LAYERS_HAVE_LOG, etc
#include "ipc/ShadowLayerUtils.h"
#include "mozilla/mozalloc.h" // for operator new, etc
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_WARNING, NS_RUNTIMEABORT, etc
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsIWidget.h" // for nsIWidget
#include "nsPoint.h" // for nsIntPoint
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion, etc
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
#include <android/log.h> #include <android/log.h>
#endif #endif
class gfxASurface;
class gfxContext;
struct nsIntSize;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {
class ImageLayer;
using namespace mozilla::gfx; using namespace mozilla::gfx;
using namespace mozilla::gl; using namespace mozilla::gl;

56
gfx/layers/composite/LayerManagerComposite.h
View File

@ -6,63 +6,39 @@
#ifndef GFX_LayerManagerComposite_H #ifndef GFX_LayerManagerComposite_H
#define GFX_LayerManagerComposite_H #define GFX_LayerManagerComposite_H
#include <stdint.h> // for int32_t, uint32_t #include "mozilla/layers/Compositor.h"
#include "GLDefs.h" // for GLenum #include "mozilla/layers/ShadowLayers.h"
#include "Composer2D.h"
#include "mozilla/TimeStamp.h"
#include "Layers.h" #include "Layers.h"
#include "gfx3DMatrix.h" // for gfx3DMatrix
#include "gfxMatrix.h" // for gfxMatrix
#include "gfxPoint.h" // for gfxIntSize
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/gfx/Rect.h" // for Rect
#include "mozilla/gfx/Types.h" // for SurfaceFormat
#include "mozilla/layers/CompositorTypes.h"
#include "mozilla/layers/LayersTypes.h" // for LayersBackend, etc
#include "nsAString.h"
#include "nsAutoPtr.h" // for nsRefPtr
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_ASSERTION
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nscore.h" // for nsAString, etc
class gfxASurface;
class gfxContext;
struct nsIntPoint;
struct nsIntSize;
#ifdef XP_WIN #ifdef XP_WIN
#include <windows.h> #include <windows.h>
#endif #endif
namespace mozilla { #include "gfxContext.h"
namespace gfx { #include "gfx3DMatrix.h"
class DrawTarget; #include "GLDefs.h"
}
namespace mozilla {
namespace gl { namespace gl {
class GLContext; class GLContext;
class TextureImage; class TextureImage;
} }
}
namespace mozilla {
namespace layers { namespace layers {
class LayerComposite;
class ThebesLayerComposite;
class ContainerLayerComposite;
class ImageLayerComposite;
class CanvasLayerComposite; class CanvasLayerComposite;
class ColorLayerComposite; class ColorLayerComposite;
class Composer2D;
class CompositableHost;
class Compositor;
class ContainerLayerComposite;
class EffectChain;
class ImageLayer;
class ImageLayerComposite;
class LayerComposite;
class RefLayerComposite; class RefLayerComposite;
class SurfaceDescriptor; class CompositableHost;
class ThebesLayerComposite; class EffectChain;
class TiledLayerComposer; class TiledLayerComposer;
class LayerManagerComposite : public LayerManager class LayerManagerComposite : public LayerManager

19
gfx/layers/composite/TextureHost.cpp
View File

@ -4,21 +4,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/layers/TextureHost.h" #include "mozilla/layers/TextureHost.h"
#include "LayersLogging.h" // for AppendToString #include "mozilla/layers/LayersSurfaces.h"
#include "gfx2DGlue.h" // for ToIntSize #include "LayersLogging.h"
#include "gfxImageSurface.h" // for gfxImageSurface #include "nsPrintfCString.h"
#include "mozilla/gfx/2D.h" // for DataSourceSurface, Factory #include "mozilla/ipc/Shmem.h"
#include "mozilla/ipc/Shmem.h" // for Shmem #include "ipc/AutoOpenSurface.h"
#include "mozilla/layers/Compositor.h" // for Compositor
#include "mozilla/layers/ISurfaceAllocator.h" // for ISurfaceAllocator
#include "mozilla/layers/ImageDataSerializer.h" #include "mozilla/layers/ImageDataSerializer.h"
#include "mozilla/layers/LayersSurfaces.h" // for SurfaceDescriptor, etc
#include "mozilla/layers/YCbCrImageDataSerializer.h" #include "mozilla/layers/YCbCrImageDataSerializer.h"
#include "nsAString.h" #include "gfx2DGlue.h"
#include "nsAutoPtr.h" // for nsRefPtr #include "mozilla/gfx/2D.h"
#include "nsPrintfCString.h" // for nsPrintfCString
struct nsIntPoint;
namespace mozilla { namespace mozilla {
namespace layers { namespace layers {

38
gfx/layers/composite/TextureHost.h
View File

@ -6,37 +6,25 @@
#ifndef MOZILLA_GFX_TEXTUREHOST_H #ifndef MOZILLA_GFX_TEXTUREHOST_H
#define MOZILLA_GFX_TEXTUREHOST_H #define MOZILLA_GFX_TEXTUREHOST_H
#include <stddef.h> // for size_t #include "mozilla/layers/LayersTypes.h"
#include <stdint.h> // for uint64_t, uint32_t, uint8_t #include "nsRect.h"
#include "./../mozilla-config.h" // for MOZ_DUMP_PAINTING #include "nsRegion.h"
#include "gfxASurface.h" // for gfxASurface, etc #include "mozilla/gfx/Rect.h"
#include "mozilla/Assertions.h" // for MOZ_ASSERT, etc #include "mozilla/layers/CompositorTypes.h"
#include "mozilla/Attributes.h" // for MOZ_OVERRIDE #include "nsAutoPtr.h"
#include "mozilla/RefPtr.h" // for RefPtr, TemporaryRef, etc #include "mozilla/RefPtr.h"
#include "mozilla/gfx/2D.h" // for DataSourceSurface #include "mozilla/layers/ISurfaceAllocator.h"
#include "mozilla/gfx/Point.h" // for IntSize, IntPoint
#include "mozilla/gfx/Types.h" // for SurfaceFormat, etc
#include "mozilla/layers/CompositorTypes.h" // for TextureFlags, etc
#include "mozilla/layers/LayersTypes.h" // for LayerRenderState, etc
#include "mozilla/mozalloc.h" // for operator delete
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsDebug.h" // for NS_RUNTIMEABORT
#include "nsRect.h" // for nsIntRect
#include "nsRegion.h" // for nsIntRegion
#include "nsTraceRefcnt.h" // for MOZ_COUNT_CTOR, etc
#include "nscore.h" // for nsACString
class gfxImageSurface;
class gfxReusableSurfaceWrapper; class gfxReusableSurfaceWrapper;
struct nsIntPoint; class gfxImageSurface;
struct nsIntSize;
namespace mozilla { namespace mozilla {
namespace ipc { namespace gfx {
class Shmem; class DataSourceSurface;
}
} }
namespace mozilla {
namespace layers { namespace layers {
class Compositor; class Compositor;

Some files were not shown because too many files have changed in this diff Show More