From a1ccf6bbaa154cf320323f2fcb30325f38e6444f Mon Sep 17 00:00:00 2001
From: Kartikaya Gupta <kgupta@mozilla.com>
Date: Tue, 18 Apr 2017 08:43:08 -0400
Subject: [PATCH] Bug 1357390 - Consistently use uint64_t for the referent id,
 because that's what it really is. r=mattwoodrow

MozReview-Commit-ID: LPxcElOVrU3

--HG--
extra : rebase_source : 7b5e27fcfd8b13fbe8ed1e34abc98cc43c7e8ae1
---
 gfx/layers/Layers.h                 | 4 ++--
 gfx/layers/ipc/LayersMessages.ipdlh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfx/layers/Layers.h b/gfx/layers/Layers.h
index b0159882a154..ce62a3b9dc01 100644
--- a/gfx/layers/Layers.h
+++ b/gfx/layers/Layers.h
@@ -9,7 +9,7 @@
 #include <map>
 #include <stdint.h>                     // for uint32_t, uint64_t, uint8_t
 #include <stdio.h>                      // for FILE
-#include <sys/types.h>                  // for int32_t, int64_t
+#include <sys/types.h>                  // for int32_t
 #include "FrameMetrics.h"               // for FrameMetrics
 #include "Units.h"                      // for LayerMargin, LayerPoint, ParentLayerIntRect
 #include "gfxContext.h"
@@ -2865,7 +2865,7 @@ public:
   // These getters can be used anytime.
   virtual RefLayer* AsRefLayer() override { return this; }
 
-  virtual int64_t GetReferentId() { return mId; }
+  virtual uint64_t GetReferentId() { return mId; }
 
   /**
    * DRAWING PHASE ONLY
diff --git a/gfx/layers/ipc/LayersMessages.ipdlh b/gfx/layers/ipc/LayersMessages.ipdlh
index 40fb045e9caf..f4e647a8c17c 100644
--- a/gfx/layers/ipc/LayersMessages.ipdlh
+++ b/gfx/layers/ipc/LayersMessages.ipdlh
@@ -285,7 +285,7 @@ struct TextLayerAttributes      { IntRect bounds; GlyphArray[] glyphs; uintptr_t
 struct ColorLayerAttributes     { LayerColor color; IntRect bounds; };
 struct CanvasLayerAttributes    { SamplingFilter samplingFilter; IntRect bounds; };
 struct RefLayerAttributes {
-  int64_t id;
+  uint64_t id;
   // TODO: Once bug 1132895 is fixed we shouldn't need to propagate the override
   // explicitly here.
   EventRegionsOverride eventRegionsOverride;