|
@@ -2,7 +2,7 @@
|
|
|
# User Kartikaya Gupta <kgupta@mozilla.com>
|
|
|
# Date 1520349939 18000
|
|
|
# Node ID 306f68c9845e8579c8175a82a91bc00ff8ec039d
|
|
|
-# Parent f301bfd1a5addf07e7e04074c01acf58886dd42c
|
|
|
+# Parent f51d96c3d9fbb6e337c5c289a8dadc1fc1d12f9c
|
|
|
Bug 1442627 - Move static helpers from APZCTreeManager to APZUtils. r=botond
|
|
|
|
|
|
This also includes unified build fixes that were needed as a result of
|
|
@@ -31,8 +31,8 @@ diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp
|
|
|
#include "mozilla/layers/LayerTreeOwnerTracker.h"
|
|
|
#include "mozilla/layers/UiCompositorControllerParent.h"
|
|
|
#include "mozilla/layers/MemoryReportingMLGPU.h"
|
|
|
- #include "mozilla/webrender/RenderThread.h"
|
|
|
-@@ -118,17 +118,17 @@ GPUParent::Init(base::ProcessId aParentP
|
|
|
+ #include "mozilla/layers/SharedSurfacesParent.h"
|
|
|
+@@ -119,17 +119,17 @@ GPUParent::Init(base::ProcessId aParentP
|
|
|
if (NS_FAILED(NS_InitMinimalXPCOM())) {
|
|
|
return false;
|
|
|
}
|
|
@@ -252,7 +252,7 @@ diff --git a/gfx/layers/apz/src/APZUtils.h b/gfx/layers/apz/src/APZUtils.h
|
|
|
diff --git a/gfx/layers/ipc/SharedSurfacesChild.h b/gfx/layers/ipc/SharedSurfacesChild.h
|
|
|
--- a/gfx/layers/ipc/SharedSurfacesChild.h
|
|
|
+++ b/gfx/layers/ipc/SharedSurfacesChild.h
|
|
|
-@@ -20,16 +20,17 @@ class SourceSurfaceSharedData;
|
|
|
+@@ -21,16 +21,17 @@ class SourceSurfaceSharedData;
|
|
|
|
|
|
namespace wr {
|
|
|
class IpcResourceUpdateQueue;
|
|
@@ -267,9 +267,9 @@ diff --git a/gfx/layers/ipc/SharedSurfacesChild.h b/gfx/layers/ipc/SharedSurface
|
|
|
class SharedSurfacesChild final
|
|
|
{
|
|
|
public:
|
|
|
- static nsresult Share(gfx::SourceSurfaceSharedData* aSurface,
|
|
|
- WebRenderLayerManager* aManager,
|
|
|
- wr::IpcResourceUpdateQueue& aResources,
|
|
|
+ /**
|
|
|
+ * Request that the surface be mapped into the compositor thread's memory
|
|
|
+ * space. This is useful for when the caller itself has no present need for
|
|
|
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
|
|
|
--- a/gfx/layers/moz.build
|
|
|
+++ b/gfx/layers/moz.build
|