wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset fc2132ad05a1 (bug 836654)

Browse Source
This commit is contained in:
Ed Morley 2013-02-14 10:02:52 +00:00
parent 960db13772
commit c365ff99ef
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/audiochannel/AudioChannelService.cpp
View File

@ -25,7 +25,6 @@
#endif
using namespace mozilla;
using namespace mozilla::dom;
using namespace mozilla::hal;
StaticRefPtr<AudioChannelService> gAudioChannelService;
@ -94,7 +93,7 @@ AudioChannelService::RegisterAudioChannelAgent(AudioChannelAgent* aAgent,
true /* mElementHidden */,
true /* mMuted */);
mAgents.Put(aAgent, data);
RegisterType(aType, CONTENT_PROCESS_ID_MAIN);
RegisterType(aType, CONTENT_PARENT_NO_CHILD_ID);
}
void
@ -118,7 +117,7 @@ AudioChannelService::UnregisterAudioChannelAgent(AudioChannelAgent* aAgent)
mAgents.RemoveAndForget(aAgent, data);
if (data) {
UnregisterType(data->mType, data->mElementHidden, CONTENT_PROCESS_ID_MAIN);
UnregisterType(data->mType, data->mElementHidden, CONTENT_PARENT_NO_CHILD_ID);
}
}
@ -152,7 +151,7 @@ AudioChannelService::GetMuted(AudioChannelAgent* aAgent, bool aElementHidden)
// Update visibility.
data->mElementHidden = aElementHidden;
bool muted = GetMutedInternal(data->mType, CONTENT_PROCESS_ID_MAIN,
bool muted = GetMutedInternal(data->mType, CONTENT_PARENT_NO_CHILD_ID,
aElementHidden, oldElementHidden);
data->mMuted = muted;

2
dom/ipc/ContentParent.cpp
View File

@ -890,7 +890,7 @@ ContentParent::ContentParent(const nsAString& aAppManifestURL,
ChildPrivileges aOSPrivileges)
: mSubprocess(nullptr)
, mOSPrivileges(aOSPrivileges)
, mChildID(CONTENT_PROCESS_ID_UNKNOWN)
, mChildID(CONTENT_PARENT_UNKNOWN_CHILD_ID)
, mGeolocationWatchID(-1)
, mRunToCompletionDepth(0)
, mShouldCallUnblockChild(false)

4
dom/ipc/ContentParent.h
View File

@ -15,7 +15,6 @@
#include "mozilla/ipc/GeckoChildProcessHost.h"
#include "mozilla/dom/ipc/Blob.h"
#include "mozilla/Attributes.h"
#include "mozilla/HalTypes.h"
#include "nsFrameMessageManager.h"
#include "nsIObserver.h"
@ -31,6 +30,9 @@
#define CHILD_PROCESS_SHUTDOWN_MESSAGE NS_LITERAL_STRING("child-process-shutdown")
#define CONTENT_PARENT_NO_CHILD_ID 0
#define CONTENT_PARENT_UNKNOWN_CHILD_ID -1
class mozIApplication;
class nsConsoleService;
class nsIDOMBlob;

6
hal/HalTypes.h
View File

@ -11,12 +11,6 @@
namespace mozilla {
namespace hal {
/**
* XXX
*/
const uint64_t CONTENT_PROCESS_ID_UNKNOWN = uint64_t(-1);
const uint64_t CONTENT_PROCESS_ID_MAIN = 0;
/**
* These are defined by libhardware, specifically, hardware/libhardware/include/hardware/lights.h
* in the gonk subsystem.