Bug 1332211 - fix build break because of unified build, r=mtseng
authorpeter chang <pchang@mozilla.com>
Fri, 03 Feb 2017 13:29:42 +0800
changeset 341002 8c4afac0dcbad4a3ed5694e8df0d4171a5d8c148
parent 341001 61dc0a725d0fa21b5d3472ee5741c8bd3682004f
child 341003 6332ef237e2145b7647d48cb90e39b27aed58a85
push id86615
push userkwierso@gmail.com
push dateTue, 07 Feb 2017 01:52:08 +0000
treeherdermozilla-inbound@f0453084d86e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtseng
bugs1332211
milestone54.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1332211 - fix build break because of unified build, r=mtseng MozReview-Commit-ID: BbfRKxoAZqe
gfx/layers/basic/BasicTextLayer.cpp
gfx/layers/client/ClientLayerManager.h
--- a/gfx/layers/basic/BasicTextLayer.cpp
+++ b/gfx/layers/basic/BasicTextLayer.cpp
@@ -12,16 +12,17 @@
 #include "gfx2DGlue.h"
 #include "mozilla/mozalloc.h"           // for operator new
 #include "nsCOMPtr.h"                   // for already_AddRefed
 #include "nsDebug.h"                    // for NS_ASSERTION
 #include "nsISupportsImpl.h"            // for Layer::AddRef, etc
 #include "nsRect.h"                     // for mozilla::gfx::IntRect
 #include "nsRegion.h"                   // for nsIntRegion
 #include "mozilla/gfx/PathHelpers.h"
+#include "mozilla/layers/LayersMessages.h" // for GlyphArray
 
 using namespace mozilla::gfx;
 
 namespace mozilla {
 namespace layers {
 
 class BasicTextLayer : public TextLayer, public BasicImplData {
 public:
--- a/gfx/layers/client/ClientLayerManager.h
+++ b/gfx/layers/client/ClientLayerManager.h
@@ -333,17 +333,16 @@ private:
   APZTestData mApzTestData;
 
   RefPtr<ShadowLayerForwarder> mForwarder;
   mozilla::TimeStamp mTransactionStart;
 
   nsTArray<DidCompositeObserver*> mDidCompositeObservers;
 
   RefPtr<MemoryPressureObserver> mMemoryPressureObserver;
-  uint64_t mDeviceCounter;
 };
 
 class ClientLayer : public ShadowableLayer
 {
 public:
   ClientLayer()
   {
     MOZ_COUNT_CTOR(ClientLayer);