Bug 1212880 - Add ifdefs to fix TabParent.cpp bustage with --disable-accessibility specified. r=tbsaunde
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 08 Oct 2015 10:51:31 -0400
changeset 266958 4a9ccb4535beb551579442f761154cffce110809
parent 266957 7bb910d936f2e9e9c78db9f79846a5a1fe9096d5
child 266959 f68b62d3af7f66075303094a4eae7424b5bc6248
push id29504
push usercbook@mozilla.com
push dateFri, 09 Oct 2015 09:43:23 +0000
treeherdermozilla-central@d01dd42e654b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstbsaunde
bugs1212880
milestone44.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 1212880 - Add ifdefs to fix TabParent.cpp bustage with --disable-accessibility specified. r=tbsaunde
dom/ipc/TabParent.cpp
dom/ipc/TabParent.h
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -1438,27 +1438,28 @@ TabParent::RecvPDocAccessibleConstructor
   }
 #endif
   return true;
 }
 
 a11y::DocAccessibleParent*
 TabParent::GetTopLevelDocAccessible() const
 {
+#ifdef ACCESSIBILITY
   // XXX Consider managing non top level PDocAccessibles with their parent
   // document accessible.
   const nsTArray<PDocAccessibleParent*>& docs = ManagedPDocAccessibleParent();
   size_t docCount = docs.Length();
   for (size_t i = 0; i < docCount; i++) {
     auto doc = static_cast<a11y::DocAccessibleParent*>(docs[i]);
     if (!doc->ParentDoc()) {
       return doc;
     }
   }
-
+#endif
   return nullptr;
 }
 
 PDocumentRendererParent*
 TabParent::AllocPDocumentRendererParent(const nsRect& documentRect,
                                         const gfx::Matrix& transform,
                                         const nsString& bgcolor,
                                         const uint32_t& renderFlags,
--- a/dom/ipc/TabParent.h
+++ b/dom/ipc/TabParent.h
@@ -34,19 +34,19 @@ class nsIFrameLoader;
 class nsIContent;
 class nsIPrincipal;
 class nsIURI;
 class nsILoadContext;
 class nsIDocShell;
 
 namespace mozilla {
 
-  namespace a11y {
+namespace a11y {
 class DocAccessibleParent;
-  }
+}
 
 namespace jsipc {
 class CpowHolder;
 } // namespace jsipc
 
 namespace layers {
 class AsyncDragMetrics;
 struct FrameMetrics;
@@ -261,17 +261,17 @@ public:
     virtual bool
     RecvPDocAccessibleConstructor(PDocAccessibleParent* aDoc,
                                   PDocAccessibleParent* aParentDoc,
                                   const uint64_t& aParentID) override;
 
     /**
      * Return the top level doc accessible parent for this tab.
      */
-     a11y::DocAccessibleParent* GetTopLevelDocAccessible() const;
+    a11y::DocAccessibleParent* GetTopLevelDocAccessible() const;
 
     void LoadURL(nsIURI* aURI);
     // XXX/cjones: it's not clear what we gain by hiding these
     // message-sending functions under a layer of indirection and
     // eating the return values
     void Show(const ScreenIntSize& size, bool aParentIsActive);
     void UpdateDimensions(const nsIntRect& rect, const ScreenIntSize& size);
     void UpdateFrame(const layers::FrameMetrics& aFrameMetrics);