bug 1036401 - adjust includes to fix up some issues with complete types instead of forward declarations being required r=bz r=bjacob
authorOctoploid <octoploid@yandex.com>
Tue, 22 Jul 2014 11:29:33 -0400
changeset 195523 22af5c3275c8d2566ff04ba7ddf685f4e683b155
parent 195522 b489ff0521636d5e760b4431b92fc669dd369952
child 195524 db1ceb8f8d9241043418a20bf062b20c044fb567
push id27184
push userkwierso@gmail.com
push dateWed, 23 Jul 2014 00:39:18 +0000
treeherdermozilla-central@0ad20ad7b70a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz, bjacob
bugs1036401
milestone34.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 1036401 - adjust includes to fix up some issues with complete types instead of forward declarations being required r=bz r=bjacob
accessible/generic/moz.build
content/base/src/nsGenericDOMDataNode.h
extensions/spellcheck/hunspell/src/moz.build
gfx/layers/basic/TextureHostBasic.cpp
gfx/layers/composite/X11TextureHost.h
tools/profiler/ProfilerMarkers.h
--- a/accessible/generic/moz.build
+++ b/accessible/generic/moz.build
@@ -25,16 +25,17 @@ UNIFIED_SOURCES += [
     'TextLeafAccessible.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/accessible/base',
     '/accessible/html',
     '/accessible/xpcom',
     '/accessible/xul',
+    '/content/base/src',
     '/layout/generic',
     '/layout/xul',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
         '/accessible/atk',
     ]
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -16,16 +16,17 @@
 
 #include "nsTextFragment.h"
 #include "nsError.h"
 #include "mozilla/dom/Element.h"
 #include "nsCycleCollectionParticipant.h"
 
 #include "nsISMILAttr.h"
 #include "nsIDocument.h"
+#include "mozilla/dom/ShadowRoot.h"
 
 class nsIDOMAttr;
 class nsIDOMEventListener;
 class nsIDOMNodeList;
 class nsIFrame;
 class nsIDOMText;
 class nsURI;
 
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -27,23 +27,21 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
     ]
     # This variable is referenced in configure.in.  Make sure to change that file
     # too if you need to change this variable.
     DEFINES['HUNSPELL_STATIC'] = True
 
 FINAL_LIBRARY = 'spellchecker'
 
 LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/editor/libeditor/base',
     '/extensions/spellcheck/src',
 ]
 
-LOCAL_INCLUDES += [
-    '/editor/libeditor/base',
-]
-
 # Suppress warnings in third-party code.
 if CONFIG['CLANG_CXX']:
     CXXFLAGS += ['-Wno-unused-private-field']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 IPDL_SOURCES = [
     'PRemoteSpellcheckEngine.ipdl',
--- a/gfx/layers/basic/TextureHostBasic.cpp
+++ b/gfx/layers/basic/TextureHostBasic.cpp
@@ -1,15 +1,17 @@
 /* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "TextureHostBasic.h"
+#ifdef XP_MACOSX
 #include "MacIOSurfaceTextureHostBasic.h"
+#endif
 
 using namespace mozilla::gl;
 using namespace mozilla::gfx;
 
 namespace mozilla {
 namespace layers {
 
 TemporaryRef<TextureHost>
--- a/gfx/layers/composite/X11TextureHost.h
+++ b/gfx/layers/composite/X11TextureHost.h
@@ -5,17 +5,17 @@
 
 #ifndef MOZILLA_GFX_X11TEXTUREHOST__H
 #define MOZILLA_GFX_X11TEXTUREHOST__H
 
 #include "mozilla/layers/TextureHost.h"
 #include "mozilla/layers/LayersSurfaces.h"
 #include "mozilla/gfx/Types.h"
 
-class gfxXlibSurface;
+#include "gfxXlibSurface.h"
 
 namespace mozilla {
 namespace layers {
 
 // TextureHost for Xlib-backed TextureSources.
 class X11TextureHost : public TextureHost
 {
 public:
--- a/tools/profiler/ProfilerMarkers.h
+++ b/tools/profiler/ProfilerMarkers.h
@@ -82,17 +82,17 @@ private:
   void streamPayloadImp(JSStreamWriter& b);
 
 private:
   const char *mCategory;
   TracingMetadata mMetaData;
 };
 
 
-class gfxASurface;
+#include "gfxASurface.h"
 class ProfilerMarkerImagePayload : public ProfilerMarkerPayload
 {
 public:
   ProfilerMarkerImagePayload(gfxASurface *aImg);
 
 protected:
   virtual void
   streamPayload(JSStreamWriter& b) { return streamPayloadImp(b); }