Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 922566 - kill dom-config.mk r=gps

Browse Source
This commit is contained in:
Trevor Saunders 2013-10-11 12:02:41 -04:00
parent 5fb6292b1c
commit 67e6559698
47 changed files with 162 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/media/webspeech/recognition/Makefile.in
View File

@ -2,6 +2,5 @@
# 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

3
content/media/webspeech/recognition/moz.build
View File

@ -44,3 +44,6 @@ LIBXUL_LIBRARY = True
LIBRARY_NAME = 'gkconwebspeechrecognition_s'
LOCAL_INCLUDES += [
'/dom/base',
]

1
content/media/webspeech/synth/Makefile.in
View File

@ -2,7 +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
VPATH += \
$(srcdir)/ipc \

3
content/media/webspeech/synth/pico/Makefile.in
View File

@ -2,8 +2,5 @@
# 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

2
dom/alarm/Makefile.in
View File

@ -2,8 +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

1
dom/apps/src/Makefile.in
View File

@ -6,5 +6,4 @@ LOCAL_INCLUDES += \
-I$(topsrcdir)/js/xpconnect/wrappers \
$(NULL)
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk

2
dom/base/Makefile.in
View File

@ -2,8 +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
ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
endif

24
dom/base/moz.build
View File

@ -125,3 +125,27 @@ 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',
]

1
dom/battery/Makefile.in
View File

@ -2,7 +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
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \

3
dom/bindings/Makefile.in
View File

@ -2,9 +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/.
# 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

15
dom/bindings/moz.build
View File

@ -43,3 +43,18 @@ 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',
]

5
dom/bindings/test/Makefile.in
View File

@ -10,10 +10,7 @@ ifdef .PYMAKE
.NOTPARALLEL:
endif
# 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)
# Need this for $(test_webidl_files)
include ../webidlsrcs.mk
# But the webidl actually lives in our parent dir

2
dom/bluetooth/Makefile.in
View File

@ -12,8 +12,6 @@
# 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))

5
dom/bluetooth/moz.build
View File

@ -79,3 +79,8 @@ IPDL_SOURCES += [
FAIL_ON_WARNINGS = True
LOCAL_INCLUDES += [
'../base',
'../network/src',
'../system/gonk',
]

3
dom/browser-element/Makefile.in
View File

@ -2,9 +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

4
dom/browser-element/moz.build
View File

@ -34,3 +34,7 @@ LIBXUL_LIBRARY = True
LIBRARY_NAME = 'dom_browserelement_s'
LOCAL_INCLUDES += [
'../bluetooth',
'/content/html/content/src',
]

8
dom/camera/CameraControlImpl.cpp
View File

@ -428,12 +428,12 @@ CameraControlImpl::TakePicture(CameraSize aSize, int32_t aRotation, const nsAStr
}
nsresult
CameraControlImpl::StartRecording(CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
CameraControlImpl::StartRecording(const CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError)
{
nsCOMPtr<nsIFile> clone;
aFolder->Clone(getter_AddRefs(clone));
nsCOMPtr<nsIRunnable> startRecordingTask = new StartRecordingTask(this, *aOptions, clone, aFilename, onSuccess, onError, mWindowId);
nsCOMPtr<nsIRunnable> startRecordingTask = new StartRecordingTask(this, aOptions, clone, aFilename, onSuccess, onError, mWindowId);
return mCameraThread->Dispatch(startRecordingTask, NS_DISPATCH_NORMAL);
}
@ -459,9 +459,9 @@ CameraControlImpl::StopPreview()
}
nsresult
CameraControlImpl::GetPreviewStreamVideoMode(CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
CameraControlImpl::GetPreviewStreamVideoMode(const CameraRecorderOptions& aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
{
nsCOMPtr<nsIRunnable> getPreviewStreamVideoModeTask = new GetPreviewStreamVideoModeTask(this, *aOptions, onSuccess, onError);
nsCOMPtr<nsIRunnable> getPreviewStreamVideoModeTask = new GetPreviewStreamVideoModeTask(this, aOptions, onSuccess, onError);
return mCameraThread->Dispatch(getPreviewStreamVideoModeTask, NS_DISPATCH_NORMAL);
}

17
dom/camera/CameraControlImpl.h
View File

@ -14,6 +14,7 @@
#include "DOMCameraPreview.h"
#include "ICameraControl.h"
#include "CameraCommon.h"
#include "mozilla/dom/CameraControlBinding.h"
namespace mozilla {
@ -54,9 +55,11 @@ public:
void StopPreview();
nsresult AutoFocus(nsICameraAutoFocusCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult TakePicture(idl::CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, idl::CameraPosition aPosition, uint64_t aDateTime, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StartRecording(idl::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StartRecording(const dom::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult StopRecording();
nsresult GetPreviewStreamVideoMode(idl::CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult GetPreviewStreamVideoMode(const dom::CameraRecorderOptions& aOptions,
nsICameraPreviewStreamCallback* onSuccess,
nsICameraErrorCallback* onError);
nsresult ReleaseHardware(nsICameraReleaseCallback* onSuccess, nsICameraErrorCallback* onError);
nsresult Set(uint32_t aKey, const nsAString& aValue);
@ -446,9 +449,9 @@ protected:
class StartRecordingTask : public nsRunnable
{
public:
StartRecordingTask(CameraControlImpl* aCameraControl, idl::CameraStartRecordingOptions aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
StartRecordingTask(CameraControlImpl* aCameraControl, const dom::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError, uint64_t aWindowId)
: mCameraControl(aCameraControl)
, mOptions(aOptions)
, mOptions(*aOptions)
, mFolder(aFolder)
, mFilename(aFilename)
, mOnSuccessCb(new nsMainThreadPtrHolder<nsICameraStartRecordingCallback>(onSuccess))
@ -484,7 +487,7 @@ public:
}
nsRefPtr<CameraControlImpl> mCameraControl;
idl::CameraStartRecordingOptions mOptions;
dom::CameraStartRecordingOptions mOptions;
nsCOMPtr<nsIFile> mFolder;
nsString mFilename;
nsMainThreadPtrHandle<nsICameraStartRecordingCallback> mOnSuccessCb;
@ -581,7 +584,7 @@ public:
class GetPreviewStreamVideoModeTask : public nsRunnable
{
public:
GetPreviewStreamVideoModeTask(CameraControlImpl* aCameraControl, idl::CameraRecorderOptions aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
GetPreviewStreamVideoModeTask(CameraControlImpl* aCameraControl, const dom::CameraRecorderOptions& aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError)
: mCameraControl(aCameraControl)
, mOptions(aOptions)
, mOnSuccessCb(new nsMainThreadPtrHolder<nsICameraPreviewStreamCallback>(onSuccess))
@ -603,7 +606,7 @@ public:
}
nsRefPtr<CameraControlImpl> mCameraControl;
idl::CameraRecorderOptions mOptions;
dom::CameraRecorderOptions mOptions;
nsMainThreadPtrHandle<nsICameraPreviewStreamCallback> mOnSuccessCb;
nsMainThreadPtrHandle<nsICameraErrorCallback> mOnErrorCb;
};

27
dom/camera/DOMCameraControl.cpp
View File

@ -251,8 +251,7 @@ nsDOMCameraControl::SetOnRecorderStateChange(nsICameraRecorderStateChange* aOnRe
}
void
nsDOMCameraControl::StartRecording(JSContext* aCx,
JS::Handle<JS::Value> aOptions,
nsDOMCameraControl::StartRecording(const CameraStartRecordingOptions& aOptions,
nsDOMDeviceStorage& storageArea,
const nsAString& filename,
nsICameraStartRecordingCallback* onSuccess,
@ -260,17 +259,6 @@ nsDOMCameraControl::StartRecording(JSContext* aCx,
ErrorResult& aRv)
{
MOZ_ASSERT(onSuccess, "no onSuccess handler passed");
mozilla::idl::CameraStartRecordingOptions options;
// Default values, until the dictionary parser can handle them.
options.rotation = 0;
options.maxFileSizeBytes = 0;
options.maxVideoLengthMs = 0;
aRv = options.Init(aCx, aOptions.address());
if (aRv.Failed()) {
return;
}
nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
if (!obs) {
NS_WARNING("Could not get the Observer service for CameraControl::StartRecording.");
@ -305,7 +293,7 @@ nsDOMCameraControl::StartRecording(JSContext* aCx,
if (aRv.Failed()) {
return;
}
aRv = mCameraControl->StartRecording(&options, folder, filename, onSuccess,
aRv = mCameraControl->StartRecording(&aOptions, folder, filename, onSuccess,
onError.WasPassed() ? onError.Value() : nullptr);
}
@ -420,19 +408,12 @@ nsDOMCameraControl::TakePicture(JSContext* aCx,
}
void
nsDOMCameraControl::GetPreviewStreamVideoMode(JSContext* aCx,
JS::Handle<JS::Value> aOptions,
nsDOMCameraControl::GetPreviewStreamVideoMode(const CameraRecorderOptions& aOptions,
nsICameraPreviewStreamCallback* onSuccess,
const Optional<nsICameraErrorCallback*>& onError,
ErrorResult& aRv)
{
mozilla::idl::CameraRecorderOptions options;
aRv = options.Init(aCx, aOptions.address());
if (aRv.Failed()) {
return;
}
aRv = mCameraControl->GetPreviewStreamVideoMode(&options, onSuccess,
aRv = mCameraControl->GetPreviewStreamVideoMode(aOptions, onSuccess,
onError.WasPassed()
? onError.Value() : nullptr);
}

13
dom/camera/DOMCameraControl.h
View File

@ -22,6 +22,7 @@ class nsPIDOMWindow;
namespace mozilla {
namespace dom {
class CameraPictureOptions;
class CameraRecorderOptions;
template<typename T> class Optional;
}
class ErrorResult;
@ -84,8 +85,16 @@ public:
ErrorResult& aRv);
already_AddRefed<nsICameraPreviewStateChange> GetOnPreviewStateChange() const;
void SetOnPreviewStateChange(nsICameraPreviewStateChange* aOnStateChange);
void GetPreviewStreamVideoMode(JSContext* cx, JS::Handle<JS::Value> aOptions, nsICameraPreviewStreamCallback* onSuccess, const dom::Optional<nsICameraErrorCallback* >& onError, ErrorResult& aRv);
void StartRecording(JSContext* cx, JS::Handle<JS::Value> aOptions, nsDOMDeviceStorage& storageArea, const nsAString& filename, nsICameraStartRecordingCallback* onSuccess, const dom::Optional<nsICameraErrorCallback* >& onError, ErrorResult& aRv);
void GetPreviewStreamVideoMode(const dom::CameraRecorderOptions& aOptions,
nsICameraPreviewStreamCallback* onSuccess,
const dom::Optional<nsICameraErrorCallback* >& onError,
ErrorResult& aRv);
void StartRecording(const dom::CameraStartRecordingOptions& aOptions,
nsDOMDeviceStorage& storageArea,
const nsAString& filename,
nsICameraStartRecordingCallback* onSuccess,
const dom::Optional<nsICameraErrorCallback* >& onError,
ErrorResult& aRv);
void StopRecording(ErrorResult& aRv);
void GetPreviewStream(JSContext* cx, JS::Handle<JS::Value> aOptions, nsICameraPreviewStreamCallback* onSuccess, const dom::Optional<nsICameraErrorCallback* >& onError, ErrorResult& aRv);
void ResumePreview(ErrorResult& aRv);

7
dom/camera/GonkCameraControl.cpp
View File

@ -949,7 +949,7 @@ nsGonkCameraControl::StartRecordingImpl(StartRecordingTask* aStartRecording)
return NS_ERROR_FAILURE;
}
rv = SetupRecording(fd, aStartRecording->mOptions.rotation, aStartRecording->mOptions.maxFileSizeBytes, aStartRecording->mOptions.maxVideoLengthMs);
rv = SetupRecording(fd, aStartRecording->mOptions.mRotation, aStartRecording->mOptions.mMaxFileSizeBytes, aStartRecording->mOptions.mMaxVideoLengthMs);
NS_ENSURE_SUCCESS(rv, rv);
if (mRecorder->start() != OK) {
@ -1125,7 +1125,8 @@ nsGonkCameraControl::SetupVideoMode(const nsAString& aProfile)
mMediaProfiles = MediaProfiles::getInstance();
nsAutoCString profile = NS_ConvertUTF16toUTF8(aProfile);
mRecorderProfile = GetGonkRecorderProfileManager().get()->Get(profile.get());
nsRefPtr<GonkRecorderProfileManager> mgr = GetGonkRecorderProfileManager();
mRecorderProfile = mgr->Get(profile.get());
if (!mRecorderProfile) {
DOM_CAMERA_LOGE("Recorder profile '%s' is not supported\n", profile.get());
return NS_ERROR_INVALID_ARG;
@ -1369,7 +1370,7 @@ nsGonkCameraControl::GetPreviewStreamVideoModeImpl(GetPreviewStreamVideoModeTask
StopPreviewInternal(true /* forced */);
// setup the video mode
nsresult rv = SetupVideoMode(aGetPreviewStreamVideoMode->mOptions.profile);
nsresult rv = SetupVideoMode(aGetPreviewStreamVideoMode->mOptions.mProfile);
NS_ENSURE_SUCCESS(rv, rv);
const RecorderVideoProfile* video = mRecorderProfile->GetVideoProfile();

8
dom/camera/ICameraControl.h
View File

@ -11,6 +11,10 @@
#include "CameraCommon.h"
namespace mozilla {
namespace dom {
class CameraStartRecordingOptions;
class CameraRecorderOptions;
}
class DOMCameraPreview;
@ -26,9 +30,9 @@ public:
virtual void StopPreview() = 0;
virtual nsresult AutoFocus(nsICameraAutoFocusCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult TakePicture(idl::CameraSize aSize, int32_t aRotation, const nsAString& aFileFormat, idl::CameraPosition aPosition, uint64_t aDateTime, nsICameraTakePictureCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StartRecording(idl::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StartRecording(const dom::CameraStartRecordingOptions* aOptions, nsIFile* aFolder, const nsAString& aFilename, nsICameraStartRecordingCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult StopRecording() = 0;
virtual nsresult GetPreviewStreamVideoMode(idl::CameraRecorderOptions* aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult GetPreviewStreamVideoMode(const dom::CameraRecorderOptions& aOptions, nsICameraPreviewStreamCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult ReleaseHardware(nsICameraReleaseCallback* onSuccess, nsICameraErrorCallback* onError) = 0;
virtual nsresult Set(uint32_t aKey, const nsAString& aValue) = 0;

1
dom/camera/Makefile.in
View File

@ -2,6 +2,5 @@
# 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

3
dom/camera/moz.build
View File

@ -53,3 +53,6 @@ LIBXUL_LIBRARY = True
LIBRARY_NAME = 'domcamera_s'
LOCAL_INCLUDES += [
'../base',
]

47
dom/camera/nsIDOMCameraManager.idl
View File

@ -110,53 +110,6 @@ interface nsICameraCapabilities : nsISupports
readonly attribute jsval recorderProfiles;
};
/* 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;
};
/* 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;
long long maxFileSizeBytes;
long long maxVideoLengthMs;
};
[scriptable, function, uuid(0444a687-4bc9-462c-8246-5423f0fe46a4)]
interface nsICameraPreviewStreamCallback : nsISupports
{

1
dom/devicestorage/Makefile.in
View File

@ -2,7 +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
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \

62
dom/dom-config.mk
View File

@ -1,62 +0,0 @@
# 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)/%)

1
dom/encoding/Makefile.in
View File

@ -6,7 +6,6 @@ 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

2
dom/fmradio/Makefile.in
View File

@ -2,8 +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

1
dom/fmradio/ipc/Makefile.in
View File

@ -6,7 +6,6 @@ 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

3
dom/fmradio/ipc/moz.build
View File

@ -23,3 +23,6 @@ FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
LIBRARY_NAME = 'domfmradio_s'
LOCAL_INCLUDES += [
'/dom/base',
]

4
dom/fmradio/moz.build
View File

@ -33,3 +33,7 @@ IPDL_SOURCES += [
FAIL_ON_WARNINGS = True
LOCAL_INCLUDES += [
'../base',
'../system/gonk',
]

4
dom/icc/src/Makefile.in
View File

@ -2,10 +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/.
VPATH = $(srcdir)
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
$(NULL)

3
dom/media/Makefile.in
View File

@ -2,9 +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
ifdef MOZ_WEBRTC
LOCAL_INCLUDES += \
-I$(topsrcdir)/media/webrtc/trunk \

4
dom/media/moz.build
View File

@ -51,3 +51,7 @@ LIBXUL_LIBRARY = True
LIBRARY_NAME = 'dom_media_s'
LOCAL_INCLUDES += [
'../base',
'../camera',
]

1
dom/mobilemessage/src/Makefile.in
View File

@ -2,6 +2,5 @@
# 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

3
dom/mobilemessage/src/moz.build
View File

@ -82,3 +82,6 @@ MSVC_ENABLE_PGO = True
LIBRARY_NAME = 'dom_mobilemessage_s'
LOCAL_INCLUDES += [
'/dom/base',
]

5
dom/network/src/Makefile.in
View File

@ -2,12 +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/.
VPATH = $(srcdir)
ifdef MOZ_B2G_RIL
endif
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \

1
dom/plugins/base/Makefile.in
View File

@ -22,7 +22,6 @@ LOCAL_INCLUDES += \
$(MOZ_PIXMAN_CFLAGS) \
$(NULL)
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

6
dom/plugins/base/moz.build
View File

@ -103,3 +103,9 @@ LIBRARY_NAME = 'gkplugin'
EXPORT_LIBRARY = True
LOCAL_INCLUDES += [
'/content/base/src',
'/dom/base',
'/layout/generic',
'/layout/xul/base/src',
]

1
dom/power/Makefile.in
View File

@ -2,7 +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

1
dom/quota/Makefile.in
View File

@ -2,7 +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
LOCAL_INCLUDES = \
-I$(topsrcdir)/caps/include \

2
dom/system/gonk/Makefile.in
View File

@ -12,8 +12,6 @@
# 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 \

1
dom/telephony/Makefile.in
View File

@ -2,6 +2,5 @@
# 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

1
dom/time/Makefile.in
View File

@ -2,7 +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

50
dom/webidl/CameraControl.webidl
View File

@ -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(any aOptions, CameraPreviewStreamCallback onSuccess, optional CameraErrorCallback onError);
void getPreviewStreamVideoMode(CameraRecorderOptions aOptions, CameraPreviewStreamCallback onSuccess, optional CameraErrorCallback onError);
/* start recording video; 'aOptions' is a
CameraStartRecordingOptions object. */
[Throws]
void startRecording(any aOptions, DeviceStorage storageArea, DOMString filename, CameraStartRecordingCallback onSuccess, optional CameraErrorCallback onError);
void startRecording(CameraStartRecordingOptions aOptions, DeviceStorage storageArea, DOMString filename, CameraStartRecordingCallback onSuccess, optional CameraErrorCallback onError);
/* stop precording video. */
[Throws]
@ -193,3 +193,49 @@ 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;
};

5
dom/wifi/Makefile.in
View File

@ -1,5 +0,0 @@
# 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