From fc68eda3fc908b025c31eba4bb7a74355cc8f14b Mon Sep 17 00:00:00 2001
From: Trevor Saunders <tbsaunde@tbsaunde.org>
Date: Fri, 16 Dec 2016 11:34:23 -0500
Subject: [PATCH] bug 1324019 - remove TreeMutation::mEventTree field r=davidb

It causes warnings if the logging define is undefined as it is on aurora,
   because the field is then unused.  Since the only uses can easily be
   replaced with the mQueueEvents field we can just do that and remove the
   useless field.
---
 accessible/base/EventTree.cpp | 5 ++---
 accessible/base/EventTree.h   | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/accessible/base/EventTree.cpp b/accessible/base/EventTree.cpp
index 187eeb634c6b..cd4a07ba8dd3 100644
--- a/accessible/base/EventTree.cpp
+++ b/accessible/base/EventTree.cpp
@@ -25,7 +25,6 @@ EventTree* const TreeMutation::kNoEventTree = reinterpret_cast<EventTree*>(-1);
 TreeMutation::TreeMutation(Accessible* aParent, bool aNoEvents) :
   mParent(aParent), mStartIdx(UINT32_MAX),
   mStateFlagsCopy(mParent->mStateFlags),
-  mEventTree(aNoEvents ? kNoEventTree : nullptr),
   mQueueEvents(!aNoEvents)
 {
 #ifdef DEBUG
@@ -33,7 +32,7 @@ TreeMutation::TreeMutation(Accessible* aParent, bool aNoEvents) :
 #endif
 
 #ifdef A11Y_LOG
-  if (mEventTree != kNoEventTree && logging::IsEnabled(logging::eEventTree)) {
+  if (mQueueEvents && logging::IsEnabled(logging::eEventTree)) {
     logging::MsgBegin("EVENTS_TREE", "reordering tree before");
     logging::AccessibleInfo("reordering for", mParent);
     Controller()->RootEventTree().Log();
@@ -119,7 +118,7 @@ TreeMutation::Done()
 #endif
 
 #ifdef A11Y_LOG
-  if (mEventTree != kNoEventTree && logging::IsEnabled(logging::eEventTree)) {
+  if (mQueueEvents && logging::IsEnabled(logging::eEventTree)) {
     logging::MsgBegin("EVENTS_TREE", "reordering tree after");
     logging::AccessibleInfo("reordering for", mParent);
     Controller()->RootEventTree().Log();
diff --git a/accessible/base/EventTree.h b/accessible/base/EventTree.h
index d5be363a26e5..932ceaf4e708 100644
--- a/accessible/base/EventTree.h
+++ b/accessible/base/EventTree.h
@@ -47,7 +47,6 @@ private:
   Accessible* mParent;
   uint32_t mStartIdx;
   uint32_t mStateFlagsCopy;
-  EventTree* mEventTree;
 
   /*
    * True if mutation events should be queued.