Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge last PGO-green changeset of mozilla-inbound to mozilla-central

Browse Source
This commit is contained in:
Phil Ringnalda 2012-03-17 16:57:05 -07:00
commit 20a51706b5
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/Makefile.in
View File

@ -48,7 +48,6 @@ include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
MOZ_PKG_FATAL_WARNINGS = 1
MOZ_NONLOCALIZED_PKG_LIST = \
xpcom \

1
dom/workers/test/suspend_worker.js
View File

@ -5,6 +5,7 @@
var counter = 0;
var interval = setInterval(function() {
dump("WorkerAlive\n");
postMessage(++counter);
}, 100);

2
dom/workers/test/terminate_worker.js
View File

@ -10,4 +10,4 @@ onmessage = function(event) {
throw "No messages should reach me!";
}
setInterval(function() { postMessage("Still alive!"); }, 100);
setInterval(function() { dump("WorkerAlive\n"); postMessage("Still alive!"); }, 100);

22
netwerk/protocol/device/GonkCaptureProvider.cpp
View File

@ -71,21 +71,21 @@ class CameraHardwareInterface {
static CameraHardwareInterface* openCamera(PRUint32 aCamera);
virtual ~CameraHardwareInterface() { };
virtual ~CameraHardwareInterface() { }
virtual bool ok();
virtual void enableMsgType(int32_t msgType);
virtual void disableMsgType(int32_t msgType);
virtual bool msgTypeEnabled(int32_t msgType);
virtual bool ok() = 0;
virtual void enableMsgType(int32_t msgType) = 0;
virtual void disableMsgType(int32_t msgType) = 0;
virtual bool msgTypeEnabled(int32_t msgType) = 0;
virtual void setCallbacks(notify_callback notify_cb,
data_callback data_cb,
data_callback_timestamp data_cb_timestamp,
void* user);
virtual status_t startPreview();
virtual void stopPreview();
virtual void release();
virtual status_t setParameters(const CameraParameters& params);
virtual CameraParameters getParameters() const;
void* user) = 0;
virtual status_t startPreview() = 0;
virtual void stopPreview() = 0;
virtual void release() = 0;
virtual status_t setParameters(const CameraParameters& params) = 0;
virtual CameraParameters getParameters() const = 0;
protected:
CameraHardwareInterface(PRUint32 aCamera = 0) { };