Backed out changeset 99b17c404db2 and e40a964458f8 for landing stuff that shouldn't have and then backing out stuff that should have stayed on a CLOSED TREE

--HG-- extra : amend_source : 54312955270ea4098a3add3cd0708866de2e40bb
2013-10-21 18:58:14 -04:00 · 2013-10-21 18:58:14 -04:00 · c29760731a
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@ -2,5 +2,6 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@ -44,6 +44,3 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'gkconwebspeechrecognition_s'

-LOCAL_INCLUDES += [
-    '/dom/base',
-]
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 VPATH += \
  $(srcdir)/ipc \
--- a/content/media/webspeech/synth/pico/Makefile.in
+++ b/content/media/webspeech/synth/pico/Makefile.in
@ -2,5 +2,8 @@
 # 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 $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/dom/dom-config.mk
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -2,6 +2,8 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
+

 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/apps/src/Makefile.in
+++ b/dom/apps/src/Makefile.in
@ -6,4 +6,5 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/js/xpconnect/wrappers \
  $(NULL)

+include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -2,6 +2,8 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
+
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@ -125,27 +125,3 @@ MSVC_ENABLE_PGO = True

 LIBRARY_NAME = 'jsdombase_s'

-LOCAL_INCLUDES += [
-    '../battery',
-    '../bluetooth',
-    '../icc/src',
-    '../media',
-    '../network/src',
-    '../src/geolocation',
-    '../src/storage',
-    '../time',
-    '/content/base/src',
-    '/content/events/src',
-    '/content/html/document/src',
-    '/content/xbl/src',
-    '/content/xul/document/src',
-    '/layout/generic',
-    '/layout/style',
-    '/layout/xul/base/src',
-]
-
-if CONFIG['MOZ_B2G_RIL']:
-    LOCAL_INCLUDES += [
-        '../fmradio',
-        '../system/gonk',
-    ]
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -2,6 +2,9 @@
 # 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/.

+# Need this to find all our DOM source files.
+include $(topsrcdir)/dom/dom-config.mk
+
 webidl_base = $(topsrcdir)/dom/webidl
 # Generated by moz.build
 include webidlsrcs.mk
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@ -43,18 +43,3 @@ LIBRARY_NAME = 'dombindings_s'

 EXPORT_LIBRARY = True

-LOCAL_INCLUDES += [
-    '../bluetooth',
-    '../camera',
-    '../file',
-    '../src/geolocation',
-    '../workers',
-    '/content/base/src',
-    '/content/events/src',
-    '/content/html/document/src',
-    '/content/media/webaudio',
-    '/content/svg/content/src',
-    '/content/xbl/src',
-    '/layout/style',
-    '/layout/xul/tree',
-]
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@ -10,7 +10,10 @@ ifdef .PYMAKE
 .NOTPARALLEL:
 endif

-# Need this for $(test_webidl_files)
+# Need this to find all our DOM source files.
+include $(topsrcdir)/dom/dom-config.mk
+
+# And need this for $(test_webidl_files) and $(preprocessed_test_webidl_files)
 include ../webidlsrcs.mk

 # But the webidl actually lives in our parent dir
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+include $(topsrcdir)/dom/dom-config.mk
+
 VPATH += $(srcdir)/ipc

 ifneq (,$(MOZ_B2G_BT))
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@ -79,8 +79,3 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

-LOCAL_INCLUDES += [
-    '../base',
-    '../network/src',
-    '../system/gonk',
-]
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -2,6 +2,9 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
+
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@ -34,7 +34,3 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'dom_browserelement_s'

-LOCAL_INCLUDES += [
-    '../bluetooth',
-    '/content/html/content/src',
-]
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
--- a/dom/dom-config.mk
+++ b/dom/dom-config.mk
@ -0,0 +1,62 @@
+# 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/.
+
+DOM_SRCDIRS = \
+  dom/base \
+  dom/battery \
+  dom/encoding \
+  dom/file \
+  dom/power \
+  dom/push \
+  dom/quota \
+  dom/media \
+  dom/network/src \
+  dom/phonenumberutils \
+  dom/alarm \
+  dom/src/events \
+  dom/src/storage \
+  dom/src/offline \
+  dom/src/geolocation \
+  dom/src/notification \
+  dom/workers \
+  dom/time \
+  content/xbl/src \
+  content/xul/document/src \
+  content/events/src \
+  content/base/src \
+  content/html/content/src \
+  content/html/document/src \
+  content/media/mediasource \
+  content/media/webaudio \
+  content/svg/content/src \
+  layout/generic \
+  layout/style \
+  layout/xul/base/src \
+  layout/xul/tree \
+  dom/camera \
+  $(NULL)
+
+ifdef MOZ_B2G_RIL
+DOM_SRCDIRS += \
+  dom/system/gonk \
+  dom/wifi \
+  dom/icc/src \
+  $(NULL)
+endif
+
+ifdef MOZ_B2G_FM
+DOM_SRCDIRS += \
+  dom/fmradio \
+  $(NULL)
+endif
+
+ifdef MOZ_B2G_BT
+DOM_SRCDIRS += dom/bluetooth
+endif
+
+ifdef MOZ_WEBSPEECH
+DOM_SRCDIRS += content/media/webspeech
+endif
+
+LOCAL_INCLUDES += $(DOM_SRCDIRS:%=-I$(topsrcdir)/%)
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@ -6,6 +6,7 @@ LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)

+include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk

 EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
--- a/dom/fmradio/Makefile.in
+++ b/dom/fmradio/Makefile.in
@ -2,6 +2,8 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
+
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/fmradio/ipc/Makefile.in
+++ b/dom/fmradio/ipc/Makefile.in
@ -6,6 +6,7 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/dom/fmradio \
  $(NULL)

+include $(topsrcdir)/dom/dom-config.mk

 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/fmradio/ipc/moz.build
+++ b/dom/fmradio/ipc/moz.build
@ -23,6 +23,3 @@ FAIL_ON_WARNINGS = True
 LIBXUL_LIBRARY = True
 LIBRARY_NAME   = 'domfmradio_s'

-LOCAL_INCLUDES += [
-    '/dom/base',
-]
--- a/dom/fmradio/moz.build
+++ b/dom/fmradio/moz.build
@ -33,7 +33,3 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

-LOCAL_INCLUDES += [
-    '../base',
-    '../system/gonk',
-]
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@ -2,6 +2,10 @@
 # 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/.

+VPATH            = $(srcdir)
+
+include $(topsrcdir)/dom/dom-config.mk
+
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
  $(NULL)
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -2,6 +2,9 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
+
+
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
  -I$(topsrcdir)/media/webrtc/trunk \
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@ -51,7 +51,3 @@ LIBXUL_LIBRARY = True

 LIBRARY_NAME = 'dom_media_s'

-LOCAL_INCLUDES += [
-    '../base',
-    '../camera',
-]
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@ -2,5 +2,6 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@ -82,6 +82,3 @@ MSVC_ENABLE_PGO = True

 LIBRARY_NAME = 'dom_mobilemessage_s'

-LOCAL_INCLUDES += [
-    '/dom/base',
-]
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -2,7 +2,12 @@
 # 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/.

+VPATH            = $(srcdir)

+ifdef MOZ_B2G_RIL
+endif
+
+include $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
  -I$(topsrcdir)/content/events/src \
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@ -22,6 +22,7 @@ LOCAL_INCLUDES += \
  $(MOZ_PIXMAN_CFLAGS) \
  $(NULL)

+include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@ -103,9 +103,3 @@ LIBRARY_NAME = 'gkplugin'

 EXPORT_LIBRARY = True

-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/dom/base',
-    '/layout/generic',
-    '/layout/xul/base/src',
-]
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 LOCAL_INCLUDES = \
  -I$(topsrcdir)/caps/include \
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

+include $(topsrcdir)/dom/dom-config.mk
+
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/dom/base \
  -I$(topsrcdir)/dom/src/geolocation \
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@ -2,5 +2,6 @@
 # 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 $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@ -2,6 +2,7 @@
 # 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 $(topsrcdir)/dom/dom-config.mk

 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/webidl/CameraControl.webidl
+++ b/dom/webidl/CameraControl.webidl
@ -154,12 +154,12 @@ interface CameraControl {
    /* get a media stream to be used as a camera viewfinder in video mode;
       'aOptions' is an CameraRecorderOptions object. */
    [Throws]
-    void getPreviewStreamVideoMode(CameraRecorderOptions aOptions, CameraPreviewStreamCallback onSuccess, optional CameraErrorCallback onError);
+    void getPreviewStreamVideoMode(any aOptions, CameraPreviewStreamCallback onSuccess, optional CameraErrorCallback onError);

    /* start recording video; 'aOptions' is a
       CameraStartRecordingOptions object. */
    [Throws]
-    void startRecording(CameraStartRecordingOptions aOptions, DeviceStorage storageArea, DOMString filename, CameraStartRecordingCallback onSuccess, optional CameraErrorCallback onError);
+    void startRecording(any aOptions, DeviceStorage storageArea, DOMString filename, CameraStartRecordingCallback onSuccess, optional CameraErrorCallback onError);

    /* stop precording video. */
    [Throws]
@ -193,49 +193,3 @@ interface CameraControl {
    [Throws]
    void release(optional CameraReleaseCallback onSuccess, optional CameraErrorCallback onError);
 };
-/* These properties affect the actual video recording, e.g.
-      {
-         rotation: 0,
-         maxFileSizeBytes: 1024 * 1024,
-         maxVideoLengthMs: 0
-      }
-
-   'rotation' is the degrees clockwise to rotate the recorded video; if
-   this options is not supported, it will be ignored; if this option is
-   missing, the default is 0.
-
-   'maxFileSizeBytes' is the maximum size in bytes to which the recorded
-   video file will be allowed to grow.
-
-   'maxVideoLengthMs' is the maximum length in milliseconds to which the
-   recorded video will be allowed to grow.
-
-   if either 'maxFileSizeBytes' or 'maxVideoLengthMs' is missing, zero,
-   or negative, that limit will be disabled.
-*/
-dictionary CameraStartRecordingOptions
-{
-    long      rotation = 0;
-    long long maxFileSizeBytes = 0;
-    long long maxVideoLengthMs = 0;
-};
-
-/* These properties affect the video recording preview, e.g.
-      {
-         profile: "1080p",
-         rotation: 0
-      }
-
-   'profile' is one of the profiles returned by
-   nsICameraCapabilities.recorderProfiles'; if this profile is missing,
-   an arbitrary profile will be chosen.
-
-   'rotation' is the degrees clockwise to rotate the preview; if
-   this option is not supported, it will be ignored; if this option
-   is missing, the default is 0.
-*/
-dictionary CameraRecorderOptions
-{
-    DOMString profile = "";
-    long      rotation = 0;
-};
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@ -0,0 +1,5 @@
+# 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 $(topsrcdir)/dom/dom-config.mk