Browse Source

Add .gitignore

Ian Neal 1 year ago
parent
commit
9ca99b3b7f

+ 4 - 0
.gitignore

@@ -0,0 +1,4 @@
+# .gitignore - List of filenames git should ignore
+
+# Vim swap files.
+.*.sw[a-z]

BIN
mozilla-release/patches/.series.swp


+ 2 - 2
mozilla-release/patches/1441916-6-60a1.patch

@@ -2,7 +2,7 @@
 # User Kartikaya Gupta <kgupta@mozilla.com>
 # Date 1519963241 18000
 # Node ID 5bbb3e69e745abf1b9b2962a9134dbb07de105cb
-# Parent  017a8a97d018aacb9b59a5e415912effea9b7bb8
+# Parent  f2583291fc0b024d302f355c170b7239c85e1efa
 Bug 1441916 - Modify the static GetAPZCTreeManager to return an IAPZCTreeManager. r=botond
 
 This static function has only two call sites. One (in GPUProcessManager)
@@ -181,10 +181,10 @@ diff --git a/gfx/layers/ipc/CompositorThread.cpp b/gfx/layers/ipc/CompositorThre
  #include "CompositorBridgeParent.h"
 +#include "mozilla/layers/CompositorManagerParent.h"
  #include "mozilla/layers/ImageBridgeParent.h"
- #include "mozilla/layers/SharedSurfacesParent.h"
  #include "mozilla/media/MediaSystemResourceService.h"
  
  namespace mozilla {
  
  namespace gfx {
  // See VRManagerChild.cpp
+ void ReleaseVRManagerParentSingleton();

+ 7 - 7
mozilla-release/patches/1442627-5-60a1.patch

@@ -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