Bug 760156 - Cleanup LOCAL_INCLUDES in content/media/; r=sicking

This patch makes it possible to include nsGenericHTMLElement.h without adding
to LOCAL_INCLUDES.

content/base/src/Makefile.in

@@ -34,6 +34,13 @@ EXPORTS		= \
 		nsTextFragment.h \
 		mozAutoDocUpdate.h \
 		nsFrameMessageManager.h \
+		nsAttrAndChildArray.h \
+		nsAttrValue.h \
+		nsCrossSiteListenerProxy.h \
+		nsDOMAttributeMap.h \
+		nsGenericElement.h \
+		nsMappedAttributeElement.h \
+		nsStyledElement.h \
 		$(NULL)
 
 EXPORTS_NAMESPACES = mozilla/dom

content/base/src/nsContentSink.cpp

@@ -68,6 +68,7 @@
 #include "nsGenericHTMLElement.h"
 #include "nsHTMLDNSPrefetch.h"
 #include "nsISupportsPrimitives.h"
+#include "nsIObserverService.h"
 #include "mozilla/Preferences.h"
 #include "nsParserConstants.h"
 

content/base/src/nsDOMAttributeMap.h

@@ -14,7 +14,6 @@
 #include "nsString.h"
 #include "nsRefPtrHashtable.h"
 #include "nsCycleCollectionParticipant.h"
-#include "prbit.h"
 #include "nsIDOMNode.h"
 
 class nsIAtom;

content/canvas/src/WebGLContext.cpp

@@ -35,6 +35,7 @@
 #include "prenv.h"
 
 #include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 #include "mozilla/Telemetry.h"
 
 #include "nsIObserverService.h"
@@ -495,7 +496,7 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
 #endif
 
     // try the default provider, whatever that is
-    if (!gl && useOpenGL) {
+    if (!gl && useOpenGL) {
         GLContext::ContextFlags flag = useMesaLlvmPipe 
                                        ? GLContext::ContextFlagsMesaLLVMPipe
                                        : GLContext::ContextFlagsNone;

content/canvas/src/WebGLContextValidate.cpp

@@ -5,8 +5,9 @@
 
 #include "WebGLContext.h"
 
-#include "mozilla/Preferences.h"
 #include "mozilla/CheckedInt.h"
+#include "mozilla/Preferences.h"
+#include "mozilla/Services.h"
 
 #include "jsfriendapi.h"
 

content/html/content/src/Makefile.in

@@ -17,8 +17,10 @@ FAIL_ON_WARNINGS = 1
 
 
 EXPORTS		= \
+		nsGenericHTMLElement.h \
 		nsClientRect.h \
 		nsHTMLDNSPrefetch.h \
+		nsTimeRanges.h \
 		$(NULL)
 
 CPPSRCS		= \

content/html/content/src/nsGenericHTMLElement.cpp

@@ -93,12 +93,12 @@
 
 #include "HTMLPropertiesCollection.h"
 #include "nsVariant.h"
+#include "nsDOMSettableTokenList.h"
+#include "nsThreadUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
-#include "nsThreadUtils.h"
-
 class nsINodeInfo;
 class nsIDOMNodeList;
 class nsRuleWalker;

content/html/content/src/nsGenericHTMLElement.h

@@ -10,11 +10,8 @@
 #include "nsIDOMHTMLElement.h"
 #include "nsINameSpaceManager.h"  // for kNameSpaceID_None
 #include "nsIFormControl.h"
-#include "nsFrameLoader.h"
 #include "nsGkAtoms.h"
 #include "nsContentCreatorFunctions.h"
-#include "nsDOMSettableTokenList.h"
-#include "nsIDOMHTMLPropertiesCollection.h"
 
 class nsIDOMAttr;
 class nsIDOMEventListener;
@@ -36,6 +33,8 @@ class nsHTMLFormElement;
 class nsIDOMDOMStringMap;
 class nsIDOMHTMLMenuElement;
 class nsIDOMHTMLCollection;
+class nsDOMSettableTokenList;
+class nsIDOMHTMLPropertiesCollection;
 
 typedef nsMappedAttributeElement nsGenericHTMLElementBase;
 

content/html/content/src/nsGenericHTMLFrameElement.h

@@ -6,10 +6,12 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsGenericHTMLElement.h"
-#include "nsIDOMHTMLFrameElement.h"
+#include "nsIFrameLoader.h"
 #include "nsIMozBrowserFrame.h"
 #include "nsIDOMEventListener.h"
 
+#include "nsFrameLoader.h"
+
 /**
  * A helper class for frame elements
  */

content/media/Makefile.in

@@ -97,9 +97,4 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += \
-  -I$(srcdir)/../base/src \
-  -I$(srcdir)/../html/content/src \
-  $(NULL)
-
 DEFINES += -D_IMPL_NS_LAYOUT

content/media/ogg/Makefile.in

@@ -30,8 +30,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
-		$(NULL)

content/media/wave/Makefile.in

@@ -26,8 +26,3 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
-		$(NULL)

content/media/webm/Makefile.in

@@ -28,8 +28,6 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
+LOCAL_INCLUDES = \
 		$(MOZ_LIBVPX_INCLUDES) \
 		$(NULL)

dom/base/nsDOMClassInfo.cpp

@@ -320,6 +320,8 @@
 #include "nsIDOMXPathNSResolver.h"
 #include "nsIDOMXPathResult.h"
 #include "nsIDOMMozBrowserFrame.h"
+#include "nsIDOMHTMLPropertiesCollection.h"
+#include "nsIDOMPropertyNodeList.h"
 
 #include "nsIDOMGetSVGDocument.h"
 #include "nsIDOMSVGAElement.h"

dom/base/nsFocusManager.cpp

@@ -49,12 +49,15 @@
 #include "nsIDOMNodeFilter.h"
 #include "nsIScriptObjectPrincipal.h"
 #include "nsIPrincipal.h"
-#include "mozilla/dom/Element.h"
 #include "mozAutoDocUpdate.h"
-#include "mozilla/Preferences.h"
-#include "mozilla/LookAndFeel.h"
+#include "nsFrameLoader.h"
+#include "nsIObserverService.h"
 #include "nsIScriptError.h"
 
+#include "mozilla/dom/Element.h"
+#include "mozilla/LookAndFeel.h"
+#include "mozilla/Preferences.h"
+
 #ifdef MOZ_XUL
 #include "nsIDOMXULTextboxElement.h"
 #include "nsIDOMXULMenuListElement.h"