mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1165515 - Part 1: Convert PR_LOG to MOZ_LOG. r=froydnj

This commit is contained in:
Eric Rahm 2015-05-21 13:22:04 -07:00
Родитель 4b7110fb9f
Коммит 3925a960aa
352 изменённых файлов: 1876 добавлений и 1873 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
docshell/base/nsDocShell.cpp
Просмотреть файл

@ -926,7 +926,7 @@ nsDocShell::nsDocShell()
gDocShellLeakLog = PR_NewLogModule("nsDocShellLeak"); gDocShellLeakLog = PR_NewLogModule("nsDocShellLeak");
} }
if (gDocShellLeakLog) { if (gDocShellLeakLog) {
PR_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this)); MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p created\n", this));
} }
#ifdef DEBUG #ifdef DEBUG
@ -958,7 +958,7 @@ nsDocShell::~nsDocShell()
} }
if (gDocShellLeakLog) { if (gDocShellLeakLog) {
PR_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this)); MOZ_LOG(gDocShellLeakLog, PR_LOG_DEBUG, ("DOCSHELL %p destroyed\n", this));
} }
#ifdef DEBUG #ifdef DEBUG
@ -1095,7 +1095,7 @@ nsDocShell::GetInterface(const nsIID& aIID, void** aSink)
} }
#if defined(DEBUG) #if defined(DEBUG)
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]: returning app cache container %p", ("nsDocShell[%p]: returning app cache container %p",
this, domDoc.get())); this, domDoc.get()));
#endif #endif
@ -1421,7 +1421,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) { if (PR_LOG_TEST(gDocShellLog, PR_LOG_DEBUG)) {
nsAutoCString uristr; nsAutoCString uristr;
aURI->GetAsciiSpec(uristr); aURI->GetAsciiSpec(uristr);
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]: loading %s with flags 0x%08x", ("nsDocShell[%p]: loading %s with flags 0x%08x",
this, uristr.get(), aLoadFlags)); this, uristr.get(), aLoadFlags));
} }
@ -1540,7 +1540,7 @@ nsDocShell::LoadURI(nsIURI* aURI,
if (shEntry) { if (shEntry) {
#ifdef DEBUG #ifdef DEBUG
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]: loading from session history", this)); ("nsDocShell[%p]: loading from session history", this));
#endif #endif
@ -5313,7 +5313,7 @@ nsDocShell::LoadErrorPage(nsIURI* aURI, const char16_t* aURL,
chanName.AssignLiteral("<no channel>"); chanName.AssignLiteral("<no channel>");
} }
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]::LoadErrorPage(\"%s\", \"%s\", {...}, [%s])\n", this, ("nsDocShell[%p]::LoadErrorPage(\"%s\", \"%s\", {...}, [%s])\n", this,
spec.get(), NS_ConvertUTF16toUTF8(aURL).get(), chanName.get())); spec.get(), NS_ConvertUTF16toUTF8(aURL).get(), chanName.get()));
} }
@ -11164,7 +11164,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
chanName.AssignLiteral("<no channel>"); chanName.AssignLiteral("<no channel>");
} }
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]::OnNewURI(\"%s\", [%s], 0x%x)\n", this, spec.get(), ("nsDocShell[%p]::OnNewURI(\"%s\", [%s], 0x%x)\n", this, spec.get(),
chanName.get(), aLoadType)); chanName.get(), aLoadType));
} }
@ -11229,7 +11229,7 @@ nsDocShell::OnNewURI(nsIURI* aURI, nsIChannel* aChannel, nsISupports* aOwner,
// XXX This log message is almost useless because |updateSHistory| // XXX This log message is almost useless because |updateSHistory|
// and |updateGHistory| are not correct at this point. // and |updateGHistory| are not correct at this point.
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
(" shAvailable=%i updateSHistory=%i updateGHistory=%i" (" shAvailable=%i updateSHistory=%i updateGHistory=%i"
" equalURI=%i\n", " equalURI=%i\n",
shAvailable, updateSHistory, updateGHistory, equalUri)); shAvailable, updateSHistory, updateGHistory, equalUri));
@ -11784,7 +11784,7 @@ nsDocShell::AddToSessionHistory(nsIURI* aURI, nsIChannel* aChannel,
chanName.AssignLiteral("<no channel>"); chanName.AssignLiteral("<no channel>");
} }
PR_LOG(gDocShellLog, PR_LOG_DEBUG, MOZ_LOG(gDocShellLog, PR_LOG_DEBUG,
("nsDocShell[%p]::AddToSessionHistory(\"%s\", [%s])\n", ("nsDocShell[%p]::AddToSessionHistory(\"%s\", [%s])\n",
this, spec.get(), chanName.get())); this, spec.get(), chanName.get()));
} }

2
docshell/shistory/nsSHistory.cpp
Просмотреть файл

@ -68,7 +68,7 @@ GetSHistoryLog()
} }
return sLog; return sLog;
} }
#define LOG(format) PR_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format) #define LOG(format) MOZ_LOG(GetSHistoryLog(), PR_LOG_DEBUG, format)
// This macro makes it easier to print a log message which includes a URI's // This macro makes it easier to print a log message which includes a URI's
// spec. Example use: // spec. Example use:

2
dom/base/ThirdPartyUtil.cpp
Просмотреть файл

@ -23,7 +23,7 @@ NS_IMPL_ISUPPORTS(ThirdPartyUtil, mozIThirdPartyUtil)
// //
static PRLogModuleInfo *gThirdPartyLog; static PRLogModuleInfo *gThirdPartyLog;
#undef LOG #undef LOG
#define LOG(args) PR_LOG(gThirdPartyLog, PR_LOG_DEBUG, args) #define LOG(args) MOZ_LOG(gThirdPartyLog, PR_LOG_DEBUG, args)
nsresult nsresult
ThirdPartyUtil::Init() ThirdPartyUtil::Init()

2
dom/base/nsContentPolicy.cpp
Просмотреть файл

@ -203,7 +203,7 @@ nsContentPolicy::CheckPolicy(CPMethod policyMethod,
if (requestingLocation) { \ if (requestingLocation) { \
requestingLocation->GetSpec(refSpec); \ requestingLocation->GetSpec(refSpec); \
} \ } \
PR_LOG(gConPolLog, PR_LOG_DEBUG, \ MOZ_LOG(gConPolLog, PR_LOG_DEBUG, \
("Content Policy: " logType ": <%s> <Ref:%s> result=%s", \ ("Content Policy: " logType ": <%s> <Ref:%s> result=%s", \
spec.get(), refSpec.get(), resultName) \ spec.get(), refSpec.get(), resultName) \
); \ ); \

2
dom/base/nsDOMDataChannel.cpp
Просмотреть файл

@ -11,7 +11,7 @@
extern PRLogModuleInfo* GetDataChannelLog(); extern PRLogModuleInfo* GetDataChannelLog();
#undef LOG #undef LOG
#define LOG(args) PR_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args) #define LOG(args) MOZ_LOG(GetDataChannelLog(), PR_LOG_DEBUG, args)
#include "nsDOMDataChannelDeclarations.h" #include "nsDOMDataChannelDeclarations.h"

22
dom/base/nsDocument.cpp
Просмотреть файл

@ -1593,7 +1593,7 @@ nsDocument::nsDocument(const char* aContentType)
gDocumentLeakPRLog = PR_NewLogModule("DocumentLeak"); gDocumentLeakPRLog = PR_NewLogModule("DocumentLeak");
if (gDocumentLeakPRLog) if (gDocumentLeakPRLog)
PR_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
("DOCUMENT %p created", this)); ("DOCUMENT %p created", this));
if (!gCspPRLog) if (!gCspPRLog)
@ -1637,7 +1637,7 @@ nsIDocument::~nsIDocument()
nsDocument::~nsDocument() nsDocument::~nsDocument()
{ {
if (gDocumentLeakPRLog) if (gDocumentLeakPRLog)
PR_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gDocumentLeakPRLog, PR_LOG_DEBUG,
("DOCUMENT %p destroyed", this)); ("DOCUMENT %p destroyed", this));
NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document"); NS_ASSERTION(!mIsShowing, "Destroying a currently-showing document");
@ -2771,7 +2771,7 @@ AppendCSPFromHeader(nsIContentSecurityPolicy* csp,
rv = csp->AppendPolicy(policy, aReportOnly); rv = csp->AppendPolicy(policy, aReportOnly);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
{ {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
("CSP refined with policy: \"%s\"", ("CSP refined with policy: \"%s\"",
NS_ConvertUTF16toUTF8(policy).get())); NS_ConvertUTF16toUTF8(policy).get()));
} }
@ -2811,7 +2811,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
{ {
nsCOMPtr<nsIContentSecurityPolicy> csp; nsCOMPtr<nsIContentSecurityPolicy> csp;
if (!CSPService::sCSPEnabled) { if (!CSPService::sCSPEnabled) {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
("CSP is disabled, skipping CSP init for document %p", this)); ("CSP is disabled, skipping CSP init for document %p", this));
return NS_OK; return NS_OK;
} }
@ -2869,7 +2869,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
aChannel->GetURI(getter_AddRefs(chanURI)); aChannel->GetURI(getter_AddRefs(chanURI));
nsAutoCString aspec; nsAutoCString aspec;
chanURI->GetAsciiSpec(aspec); chanURI->GetAsciiSpec(aspec);
PR_LOG(gCspPRLog, PR_LOG_DEBUG, MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
("no CSP for document, %s, %s", ("no CSP for document, %s, %s",
aspec.get(), aspec.get(),
applyAppDefaultCSP ? "is app" : "not an app")); applyAppDefaultCSP ? "is app" : "not an app"));
@ -2878,7 +2878,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
return NS_OK; return NS_OK;
} }
PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("Document is an app or CSP header specified %p", this)); MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Document is an app or CSP header specified %p", this));
nsresult rv; nsresult rv;
@ -2897,7 +2897,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
if (csp) { if (csp) {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s %s", MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s %s",
"This document is sharing principal with another document.", "This document is sharing principal with another document.",
"Since the document is an app, CSP was already set.", "Since the document is an app, CSP was already set.",
"Skipping attempt to set CSP.")); "Skipping attempt to set CSP."));
@ -2908,7 +2908,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
csp = do_CreateInstance("@mozilla.org/cspcontext;1", &rv); csp = do_CreateInstance("@mozilla.org/cspcontext;1", &rv);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("Failed to create CSP object: %x", rv)); MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("Failed to create CSP object: %x", rv));
return rv; return rv;
} }
@ -2961,7 +2961,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
rv = csp->PermitsAncestry(docShell, &safeAncestry); rv = csp->PermitsAncestry(docShell, &safeAncestry);
if (NS_FAILED(rv) || !safeAncestry) { if (NS_FAILED(rv) || !safeAncestry) {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
("CSP doesn't like frame's ancestry, not loading.")); ("CSP doesn't like frame's ancestry, not loading."));
// stop! ERROR page! // stop! ERROR page!
aChannel->Cancel(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION); aChannel->Cancel(NS_ERROR_CSP_FRAME_ANCESTOR_VIOLATION);
@ -2982,7 +2982,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
} else if (mReferrerPolicy != referrerPolicy) { } else if (mReferrerPolicy != referrerPolicy) {
mReferrerPolicy = mozilla::net::RP_No_Referrer; mReferrerPolicy = mozilla::net::RP_No_Referrer;
{ {
PR_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s", MOZ_LOG(gCspPRLog, PR_LOG_DEBUG, ("%s %s",
"CSP wants to set referrer, but nsDocument" "CSP wants to set referrer, but nsDocument"
"already has it set. No referrers will be sent")); "already has it set. No referrers will be sent"));
} }
@ -2995,7 +2995,7 @@ nsDocument::InitCSP(nsIChannel* aChannel)
rv = principal->SetCsp(csp); rv = principal->SetCsp(csp);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
PR_LOG(gCspPRLog, PR_LOG_DEBUG, MOZ_LOG(gCspPRLog, PR_LOG_DEBUG,
("Inserted CSP into principal %p", principal)); ("Inserted CSP into principal %p", principal));
return NS_OK; return NS_OK;

6
dom/base/nsFocusManager.cpp
Просмотреть файл

@ -77,8 +77,8 @@ using namespace mozilla::widget;
PRLogModuleInfo* gFocusLog; PRLogModuleInfo* gFocusLog;
PRLogModuleInfo* gFocusNavigationLog; PRLogModuleInfo* gFocusNavigationLog;
#define LOGFOCUS(args) PR_LOG(gFocusLog, PR_LOG_DEBUG, args) #define LOGFOCUS(args) MOZ_LOG(gFocusLog, PR_LOG_DEBUG, args)
#define LOGFOCUSNAVIGATION(args) PR_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args) #define LOGFOCUSNAVIGATION(args) MOZ_LOG(gFocusNavigationLog, PR_LOG_DEBUG, args)
#define LOGTAG(log, format, content) \ #define LOGTAG(log, format, content) \
if (PR_LOG_TEST(log, PR_LOG_DEBUG)) { \ if (PR_LOG_TEST(log, PR_LOG_DEBUG)) { \
@ -86,7 +86,7 @@ PRLogModuleInfo* gFocusNavigationLog;
if (content) { \ if (content) { \
content->NodeInfo()->NameAtom()->ToUTF8String(tag); \ content->NodeInfo()->NameAtom()->ToUTF8String(tag); \
} \ } \
PR_LOG(log, PR_LOG_DEBUG, (format, tag.get())); \ MOZ_LOG(log, PR_LOG_DEBUG, (format, tag.get())); \
} }
#define LOGCONTENT(format, content) LOGTAG(gFocusLog, format, content) #define LOGCONTENT(format, content) LOGTAG(gFocusLog, format, content)

4
dom/base/nsGlobalWindow.cpp
Просмотреть файл

@ -1211,7 +1211,7 @@ nsGlobalWindow::nsGlobalWindow(nsGlobalWindow *aOuterWindow)
#endif #endif
if (gDOMLeakPRLog) if (gDOMLeakPRLog)
PR_LOG(gDOMLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
("DOMWINDOW %p created outer=%p", this, aOuterWindow)); ("DOMWINDOW %p created outer=%p", this, aOuterWindow));
NS_ASSERTION(sWindowsById, "Windows hash table must be created!"); NS_ASSERTION(sWindowsById, "Windows hash table must be created!");
@ -1301,7 +1301,7 @@ nsGlobalWindow::~nsGlobalWindow()
#endif #endif
if (gDOMLeakPRLog) if (gDOMLeakPRLog)
PR_LOG(gDOMLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gDOMLeakPRLog, PR_LOG_DEBUG,
("DOMWINDOW %p destroyed", this)); ("DOMWINDOW %p destroyed", this));
if (IsOuterWindow()) { if (IsOuterWindow()) {

6
dom/base/nsNodeInfoManager.cpp
Просмотреть файл

@ -119,7 +119,7 @@ nsNodeInfoManager::nsNodeInfoManager()
gNodeInfoManagerLeakPRLog = PR_NewLogModule("NodeInfoManagerLeak"); gNodeInfoManagerLeakPRLog = PR_NewLogModule("NodeInfoManagerLeak");
if (gNodeInfoManagerLeakPRLog) if (gNodeInfoManagerLeakPRLog)
PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
("NODEINFOMANAGER %p created", this)); ("NODEINFOMANAGER %p created", this));
mNodeInfoHash = PL_NewHashTable(32, GetNodeInfoInnerHashValue, mNodeInfoHash = PL_NewHashTable(32, GetNodeInfoInnerHashValue,
@ -139,7 +139,7 @@ nsNodeInfoManager::~nsNodeInfoManager()
mBindingManager = nullptr; mBindingManager = nullptr;
if (gNodeInfoManagerLeakPRLog) if (gNodeInfoManagerLeakPRLog)
PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
("NODEINFOMANAGER %p destroyed", this)); ("NODEINFOMANAGER %p destroyed", this));
nsLayoutStatics::Release(); nsLayoutStatics::Release();
@ -196,7 +196,7 @@ nsNodeInfoManager::Init(nsIDocument *aDocument)
mDocument = aDocument; mDocument = aDocument;
if (gNodeInfoManagerLeakPRLog) if (gNodeInfoManagerLeakPRLog)
PR_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG, MOZ_LOG(gNodeInfoManagerLeakPRLog, PR_LOG_DEBUG,
("NODEINFOMANAGER %p Init document=%p", this, aDocument)); ("NODEINFOMANAGER %p Init document=%p", this, aDocument));
return NS_OK; return NS_OK;

2
dom/base/nsObjectLoadingContent.cpp
Просмотреть файл

@ -115,7 +115,7 @@ GetObjectLog()
return sLog; return sLog;
} }
#define LOG(args) PR_LOG(GetObjectLog(), PR_LOG_DEBUG, args) #define LOG(args) MOZ_LOG(GetObjectLog(), PR_LOG_DEBUG, args)
#define LOG_ENABLED() PR_LOG_TEST(GetObjectLog(), PR_LOG_DEBUG) #define LOG_ENABLED() PR_LOG_TEST(GetObjectLog(), PR_LOG_DEBUG)
static bool static bool

2
dom/camera/CameraCommon.h
Просмотреть файл

@ -18,7 +18,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
extern PRLogModuleInfo* GetCameraLog(); extern PRLogModuleInfo* GetCameraLog();
#define DOM_CAMERA_LOG( type, ... ) PR_LOG(GetCameraLog(), (PRLogModuleLevel)type, ( __VA_ARGS__ )) #define DOM_CAMERA_LOG( type, ... ) MOZ_LOG(GetCameraLog(), (PRLogModuleLevel)type, ( __VA_ARGS__ ))
#define DOM_CAMERA_LOGA( ... ) DOM_CAMERA_LOG( 0, __VA_ARGS__ ) #define DOM_CAMERA_LOGA( ... ) DOM_CAMERA_LOG( 0, __VA_ARGS__ )

114
dom/events/IMEStateManager.cpp
Просмотреть файл

@ -201,7 +201,7 @@ IMEStateManager::Init()
void void
IMEStateManager::Shutdown() IMEStateManager::Shutdown()
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::Shutdown(), " ("ISM: IMEStateManager::Shutdown(), "
"sTextCompositions=0x%p, sTextCompositions->Length()=%u", "sTextCompositions=0x%p, sTextCompositions->Length()=%u",
sTextCompositions, sTextCompositions ? sTextCompositions->Length() : 0)); sTextCompositions, sTextCompositions ? sTextCompositions->Length() : 0));
@ -222,7 +222,7 @@ IMEStateManager::OnDestroyPresContext(nsPresContext* aPresContext)
TextCompositionArray::index_type i = TextCompositionArray::index_type i =
sTextCompositions->IndexOf(aPresContext); sTextCompositions->IndexOf(aPresContext);
if (i != TextCompositionArray::NoIndex) { if (i != TextCompositionArray::NoIndex) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnDestroyPresContext(), " ("ISM: IMEStateManager::OnDestroyPresContext(), "
"removing TextComposition instance from the array (index=%u)", i)); "removing TextComposition instance from the array (index=%u)", i));
// there should be only one composition per presContext object. // there should be only one composition per presContext object.
@ -230,7 +230,7 @@ IMEStateManager::OnDestroyPresContext(nsPresContext* aPresContext)
sTextCompositions->RemoveElementAt(i); sTextCompositions->RemoveElementAt(i);
if (sTextCompositions->IndexOf(aPresContext) != if (sTextCompositions->IndexOf(aPresContext) !=
TextCompositionArray::NoIndex) { TextCompositionArray::NoIndex) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::OnDestroyPresContext(), FAILED to remove " ("ISM: IMEStateManager::OnDestroyPresContext(), FAILED to remove "
"TextComposition instance from the array")); "TextComposition instance from the array"));
MOZ_CRASH("Failed to remove TextComposition instance from the array"); MOZ_CRASH("Failed to remove TextComposition instance from the array");
@ -242,7 +242,7 @@ IMEStateManager::OnDestroyPresContext(nsPresContext* aPresContext)
return NS_OK; return NS_OK;
} }
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnDestroyPresContext(aPresContext=0x%p), " ("ISM: IMEStateManager::OnDestroyPresContext(aPresContext=0x%p), "
"sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p", "sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p",
aPresContext, sPresContext, sContent, sTextCompositions)); aPresContext, sPresContext, sContent, sTextCompositions));
@ -274,7 +274,7 @@ IMEStateManager::OnRemoveContent(nsPresContext* aPresContext,
sTextCompositions->GetCompositionInContent(aPresContext, aContent); sTextCompositions->GetCompositionInContent(aPresContext, aContent);
if (compositionInContent) { if (compositionInContent) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnRemoveContent(), " ("ISM: IMEStateManager::OnRemoveContent(), "
"composition is in the content")); "composition is in the content"));
@ -297,7 +297,7 @@ IMEStateManager::OnRemoveContent(nsPresContext* aPresContext,
return NS_OK; return NS_OK;
} }
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnRemoveContent(aPresContext=0x%p, " ("ISM: IMEStateManager::OnRemoveContent(aPresContext=0x%p, "
"aContent=0x%p), sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p", "aContent=0x%p), sPresContext=0x%p, sContent=0x%p, sTextCompositions=0x%p",
aPresContext, aContent, sPresContext, sContent, sTextCompositions)); aPresContext, aContent, sPresContext, sContent, sTextCompositions));
@ -325,7 +325,7 @@ IMEStateManager::OnChangeFocus(nsPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
InputContextAction::Cause aCause) InputContextAction::Cause aCause)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnChangeFocus(aPresContext=0x%p, " ("ISM: IMEStateManager::OnChangeFocus(aPresContext=0x%p, "
"aContent=0x%p, aCause=%s)", "aContent=0x%p, aCause=%s)",
aPresContext, aContent, GetActionCauseName(aCause))); aPresContext, aContent, GetActionCauseName(aCause)));
@ -340,7 +340,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
InputContextAction aAction) InputContextAction aAction)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnChangeFocusInternal(aPresContext=0x%p, " ("ISM: IMEStateManager::OnChangeFocusInternal(aPresContext=0x%p, "
"aContent=0x%p, aAction={ mCause=%s, mFocusChange=%s }), " "aContent=0x%p, aAction={ mCause=%s, mFocusChange=%s }), "
"sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p", "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p",
@ -368,7 +368,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
} }
if (!aPresContext) { if (!aPresContext) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnChangeFocusInternal(), " ("ISM: IMEStateManager::OnChangeFocusInternal(), "
"no nsPresContext is being activated")); "no nsPresContext is being activated"));
return NS_OK; return NS_OK;
@ -378,7 +378,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
(sPresContext == aPresContext) ? oldWidget.get() : (sPresContext == aPresContext) ? oldWidget.get() :
aPresContext->GetRootWidget(); aPresContext->GetRootWidget();
if (NS_WARN_IF(!widget)) { if (NS_WARN_IF(!widget)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::OnChangeFocusInternal(), FAILED due to " ("ISM: IMEStateManager::OnChangeFocusInternal(), FAILED due to "
"no widget to manage its IME state")); "no widget to manage its IME state"));
return NS_OK; return NS_OK;
@ -396,7 +396,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
// on focus to the main process... but this cannot cause bugs like missed keypresses. // on focus to the main process... but this cannot cause bugs like missed keypresses.
// (It just means a lot of needless IPC.) // (It just means a lot of needless IPC.)
if ((newState.mEnabled == IMEState::DISABLED) && TabParent::GetIMETabParent()) { if ((newState.mEnabled == IMEState::DISABLED) && TabParent::GetIMETabParent()) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnChangeFocusInternal(), " ("ISM: IMEStateManager::OnChangeFocusInternal(), "
"Parent process cancels to set DISABLED state because the content process " "Parent process cancels to set DISABLED state because the content process "
"has IME focus and has already sets IME state")); "has IME focus and has already sets IME state"));
@ -411,7 +411,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
// we should do it. // we should do it.
InputContext context = widget->GetInputContext(); InputContext context = widget->GetInputContext();
if (context.mIMEState.mEnabled == newState.mEnabled) { if (context.mIMEState.mEnabled == newState.mEnabled) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnChangeFocusInternal(), " ("ISM: IMEStateManager::OnChangeFocusInternal(), "
"neither focus nor IME state is changing")); "neither focus nor IME state is changing"));
return NS_OK; return NS_OK;
@ -450,7 +450,7 @@ IMEStateManager::OnChangeFocusInternal(nsPresContext* aPresContext,
void void
IMEStateManager::OnInstalledMenuKeyboardListener(bool aInstalling) IMEStateManager::OnInstalledMenuKeyboardListener(bool aInstalling)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnInstalledMenuKeyboardListener(aInstalling=%s), " ("ISM: IMEStateManager::OnInstalledMenuKeyboardListener(aInstalling=%s), "
"sInstalledMenuKeyboardListener=%s", "sInstalledMenuKeyboardListener=%s",
GetBoolName(aInstalling), GetBoolName(sInstalledMenuKeyboardListener))); GetBoolName(aInstalling), GetBoolName(sInstalledMenuKeyboardListener)));
@ -469,27 +469,27 @@ IMEStateManager::OnMouseButtonEventInEditor(nsPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
nsIDOMMouseEvent* aMouseEvent) nsIDOMMouseEvent* aMouseEvent)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(aPresContext=0x%p, " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(aPresContext=0x%p, "
"aContent=0x%p, aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p", "aContent=0x%p, aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p",
aPresContext, aContent, aMouseEvent, sPresContext, sContent)); aPresContext, aContent, aMouseEvent, sPresContext, sContent));
if (sPresContext != aPresContext || sContent != aContent) { if (sPresContext != aPresContext || sContent != aContent) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), "
"the mouse event isn't fired on the editor managed by ISM")); "the mouse event isn't fired on the editor managed by ISM"));
return false; return false;
} }
if (!sActiveIMEContentObserver) { if (!sActiveIMEContentObserver) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), "
"there is no active IMEContentObserver")); "there is no active IMEContentObserver"));
return false; return false;
} }
if (!sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) { if (!sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), "
"the active IMEContentObserver isn't managing the editor")); "the active IMEContentObserver isn't managing the editor"));
return false; return false;
@ -498,7 +498,7 @@ IMEStateManager::OnMouseButtonEventInEditor(nsPresContext* aPresContext,
WidgetMouseEvent* internalEvent = WidgetMouseEvent* internalEvent =
aMouseEvent->GetInternalNSEvent()->AsMouseEvent(); aMouseEvent->GetInternalNSEvent()->AsMouseEvent();
if (NS_WARN_IF(!internalEvent)) { if (NS_WARN_IF(!internalEvent)) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), "
"the internal event of aMouseEvent isn't WidgetMouseEvent")); "the internal event of aMouseEvent isn't WidgetMouseEvent"));
return false; return false;
@ -510,7 +510,7 @@ IMEStateManager::OnMouseButtonEventInEditor(nsPresContext* aPresContext,
if (PR_LOG_TEST(sISMLog, PR_LOG_ALWAYS)) { if (PR_LOG_TEST(sISMLog, PR_LOG_ALWAYS)) {
nsAutoString eventType; nsAutoString eventType;
aMouseEvent->GetType(eventType); aMouseEvent->GetType(eventType);
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnMouseButtonEventInEditor(), " ("ISM: IMEStateManager::OnMouseButtonEventInEditor(), "
"mouse event (type=%s, button=%d) is %s", "mouse event (type=%s, button=%d) is %s",
NS_ConvertUTF16toUTF8(eventType).get(), internalEvent->button, NS_ConvertUTF16toUTF8(eventType).get(), internalEvent->button,
@ -526,13 +526,13 @@ IMEStateManager::OnClickInEditor(nsPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
nsIDOMMouseEvent* aMouseEvent) nsIDOMMouseEvent* aMouseEvent)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnClickInEditor(aPresContext=0x%p, aContent=0x%p, " ("ISM: IMEStateManager::OnClickInEditor(aPresContext=0x%p, aContent=0x%p, "
"aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p", "aMouseEvent=0x%p), sPresContext=0x%p, sContent=0x%p",
aPresContext, aContent, aMouseEvent, sPresContext, sContent)); aPresContext, aContent, aMouseEvent, sPresContext, sContent));
if (sPresContext != aPresContext || sContent != aContent) { if (sPresContext != aPresContext || sContent != aContent) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnClickInEditor(), " ("ISM: IMEStateManager::OnClickInEditor(), "
"the mouse event isn't fired on the editor managed by ISM")); "the mouse event isn't fired on the editor managed by ISM"));
return; return;
@ -545,7 +545,7 @@ IMEStateManager::OnClickInEditor(nsPresContext* aPresContext,
nsresult rv = aMouseEvent->GetIsTrusted(&isTrusted); nsresult rv = aMouseEvent->GetIsTrusted(&isTrusted);
NS_ENSURE_SUCCESS_VOID(rv); NS_ENSURE_SUCCESS_VOID(rv);
if (!isTrusted) { if (!isTrusted) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnClickInEditor(), " ("ISM: IMEStateManager::OnClickInEditor(), "
"the mouse event isn't a trusted event")); "the mouse event isn't a trusted event"));
return; // ignore untrusted event. return; // ignore untrusted event.
@ -555,7 +555,7 @@ IMEStateManager::OnClickInEditor(nsPresContext* aPresContext,
rv = aMouseEvent->GetButton(&button); rv = aMouseEvent->GetButton(&button);
NS_ENSURE_SUCCESS_VOID(rv); NS_ENSURE_SUCCESS_VOID(rv);
if (button != 0) { if (button != 0) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnClickInEditor(), " ("ISM: IMEStateManager::OnClickInEditor(), "
"the mouse event isn't a left mouse button event")); "the mouse event isn't a left mouse button event"));
return; // not a left click event. return; // not a left click event.
@ -565,7 +565,7 @@ IMEStateManager::OnClickInEditor(nsPresContext* aPresContext,
rv = aMouseEvent->GetDetail(&clickCount); rv = aMouseEvent->GetDetail(&clickCount);
NS_ENSURE_SUCCESS_VOID(rv); NS_ENSURE_SUCCESS_VOID(rv);
if (clickCount != 1) { if (clickCount != 1) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnClickInEditor(), " ("ISM: IMEStateManager::OnClickInEditor(), "
"the mouse event isn't a single click event")); "the mouse event isn't a single click event"));
return; // should notify only first click event. return; // should notify only first click event.
@ -583,7 +583,7 @@ IMEStateManager::OnFocusInEditor(nsPresContext* aPresContext,
nsIContent* aContent, nsIContent* aContent,
nsIEditor* aEditor) nsIEditor* aEditor)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnFocusInEditor(aPresContext=0x%p, aContent=0x%p, " ("ISM: IMEStateManager::OnFocusInEditor(aPresContext=0x%p, aContent=0x%p, "
"aEditor=0x%p), sPresContext=0x%p, sContent=0x%p, " "aEditor=0x%p), sPresContext=0x%p, sContent=0x%p, "
"sActiveIMEContentObserver=0x%p", "sActiveIMEContentObserver=0x%p",
@ -591,7 +591,7 @@ IMEStateManager::OnFocusInEditor(nsPresContext* aPresContext,
sActiveIMEContentObserver)); sActiveIMEContentObserver));
if (sPresContext != aPresContext || sContent != aContent) { if (sPresContext != aPresContext || sContent != aContent) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnFocusInEditor(), " ("ISM: IMEStateManager::OnFocusInEditor(), "
"an editor not managed by ISM gets focus")); "an editor not managed by ISM gets focus"));
return; return;
@ -601,7 +601,7 @@ IMEStateManager::OnFocusInEditor(nsPresContext* aPresContext,
// we need to recreate the instance. // we need to recreate the instance.
if (sActiveIMEContentObserver) { if (sActiveIMEContentObserver) {
if (sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) { if (sActiveIMEContentObserver->IsManaging(aPresContext, aContent)) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::OnFocusInEditor(), " ("ISM: IMEStateManager::OnFocusInEditor(), "
"the editor is already being managed by sActiveIMEContentObserver")); "the editor is already being managed by sActiveIMEContentObserver"));
return; return;
@ -618,7 +618,7 @@ IMEStateManager::UpdateIMEState(const IMEState& aNewIMEState,
nsIContent* aContent, nsIContent* aContent,
nsIEditor* aEditor) nsIEditor* aEditor)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::UpdateIMEState(aNewIMEState={ mEnabled=%s, " ("ISM: IMEStateManager::UpdateIMEState(aNewIMEState={ mEnabled=%s, "
"mOpen=%s }, aContent=0x%p, aEditor=0x%p), " "mOpen=%s }, aContent=0x%p, aEditor=0x%p), "
"sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, " "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, "
@ -629,21 +629,21 @@ IMEStateManager::UpdateIMEState(const IMEState& aNewIMEState,
GetBoolName(sIsGettingNewIMEState))); GetBoolName(sIsGettingNewIMEState)));
if (sIsGettingNewIMEState) { if (sIsGettingNewIMEState) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::UpdateIMEState(), " ("ISM: IMEStateManager::UpdateIMEState(), "
"does nothing because of called while getting new IME state")); "does nothing because of called while getting new IME state"));
return; return;
} }
if (NS_WARN_IF(!sPresContext)) { if (NS_WARN_IF(!sPresContext)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::UpdateIMEState(), FAILED due to " ("ISM: IMEStateManager::UpdateIMEState(), FAILED due to "
"no managing nsPresContext")); "no managing nsPresContext"));
return; return;
} }
nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget(); nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget();
if (NS_WARN_IF(!widget)) { if (NS_WARN_IF(!widget)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::UpdateIMEState(), FAILED due to " ("ISM: IMEStateManager::UpdateIMEState(), FAILED due to "
"no widget for the managing nsPresContext")); "no widget for the managing nsPresContext"));
return; return;
@ -684,7 +684,7 @@ IMEState
IMEStateManager::GetNewIMEState(nsPresContext* aPresContext, IMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
nsIContent* aContent) nsIContent* aContent)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::GetNewIMEState(aPresContext=0x%p, aContent=0x%p), " ("ISM: IMEStateManager::GetNewIMEState(aPresContext=0x%p, aContent=0x%p), "
"sInstalledMenuKeyboardListener=%s", "sInstalledMenuKeyboardListener=%s",
aPresContext, aContent, GetBoolName(sInstalledMenuKeyboardListener))); aPresContext, aContent, GetBoolName(sInstalledMenuKeyboardListener)));
@ -692,14 +692,14 @@ IMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
// On Printing or Print Preview, we don't need IME. // On Printing or Print Preview, we don't need IME.
if (aPresContext->Type() == nsPresContext::eContext_PrintPreview || if (aPresContext->Type() == nsPresContext::eContext_PrintPreview ||
aPresContext->Type() == nsPresContext::eContext_Print) { aPresContext->Type() == nsPresContext::eContext_Print) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because " ("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because "
"the nsPresContext is for print or print preview")); "the nsPresContext is for print or print preview"));
return IMEState(IMEState::DISABLED); return IMEState(IMEState::DISABLED);
} }
if (sInstalledMenuKeyboardListener) { if (sInstalledMenuKeyboardListener) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because " ("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because "
"menu keyboard listener was installed")); "menu keyboard listener was installed"));
return IMEState(IMEState::DISABLED); return IMEState(IMEState::DISABLED);
@ -710,12 +710,12 @@ IMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
// editable, such case is design mode. // editable, such case is design mode.
nsIDocument* doc = aPresContext->Document(); nsIDocument* doc = aPresContext->Document();
if (doc && doc->HasFlag(NODE_IS_EDITABLE)) { if (doc && doc->HasFlag(NODE_IS_EDITABLE)) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::GetNewIMEState() returns ENABLED because " ("ISM: IMEStateManager::GetNewIMEState() returns ENABLED because "
"design mode editor has focus")); "design mode editor has focus"));
return IMEState(IMEState::ENABLED); return IMEState(IMEState::ENABLED);
} }
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because " ("ISM: IMEStateManager::GetNewIMEState() returns DISABLED because "
"no content has focus")); "no content has focus"));
return IMEState(IMEState::DISABLED); return IMEState(IMEState::DISABLED);
@ -729,7 +729,7 @@ IMEStateManager::GetNewIMEState(nsPresContext* aPresContext,
GettingNewIMEStateBlocker blocker; GettingNewIMEStateBlocker blocker;
IMEState newIMEState = aContent->GetDesiredIMEState(); IMEState newIMEState = aContent->GetDesiredIMEState();
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::GetNewIMEState() returns { mEnabled=%s, " ("ISM: IMEStateManager::GetNewIMEState() returns { mEnabled=%s, "
"mOpen=%s }", "mOpen=%s }",
GetIMEStateEnabledName(newIMEState.mEnabled), GetIMEStateEnabledName(newIMEState.mEnabled),
@ -750,7 +750,7 @@ public:
nsCOMPtr<nsIObserverService> observerService = nsCOMPtr<nsIObserverService> observerService =
services::GetObserverService(); services::GetObserverService();
if (observerService) { if (observerService) {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEEnabledStateChangedEvent::Run(), notifies observers of " ("ISM: IMEEnabledStateChangedEvent::Run(), notifies observers of "
"\"ime-enabled-state-changed\"")); "\"ime-enabled-state-changed\""));
nsAutoString state; nsAutoString state;
@ -772,7 +772,7 @@ IMEStateManager::SetIMEState(const IMEState& aState,
nsIWidget* aWidget, nsIWidget* aWidget,
InputContextAction aAction) InputContextAction aAction)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::SetIMEState(aState={ mEnabled=%s, mOpen=%s }, " ("ISM: IMEStateManager::SetIMEState(aState={ mEnabled=%s, mOpen=%s }, "
"aContent=0x%p, aWidget=0x%p, aAction={ mCause=%s, mFocusChange=%s })", "aContent=0x%p, aWidget=0x%p, aAction={ mCause=%s, mFocusChange=%s })",
GetIMEStateEnabledName(aState.mEnabled), GetIMEStateEnabledName(aState.mEnabled),
@ -858,7 +858,7 @@ IMEStateManager::SetIMEState(const IMEState& aState,
} }
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::SetIMEState(), " ("ISM: IMEStateManager::SetIMEState(), "
"calling nsIWidget::SetInputContext(context={ mIMEState={ mEnabled=%s, " "calling nsIWidget::SetInputContext(context={ mIMEState={ mEnabled=%s, "
"mOpen=%s }, mHTMLInputType=\"%s\", mHTMLInputInputmode=\"%s\", " "mOpen=%s }, mHTMLInputType=\"%s\", mHTMLInputInputmode=\"%s\", "
@ -900,7 +900,7 @@ IMEStateManager::DispatchCompositionEvent(
EventDispatchingCallback* aCallBack, EventDispatchingCallback* aCallBack,
bool aIsSynthesized) bool aIsSynthesized)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::DispatchCompositionEvent(aNode=0x%p, " ("ISM: IMEStateManager::DispatchCompositionEvent(aNode=0x%p, "
"aPresContext=0x%p, aCompositionEvent={ message=%s, " "aPresContext=0x%p, aCompositionEvent={ message=%s, "
"mFlags={ mIsTrusted=%s, mPropagationStopped=%s } }, " "mFlags={ mIsTrusted=%s, mPropagationStopped=%s } }, "
@ -929,7 +929,7 @@ IMEStateManager::DispatchCompositionEvent(
if (NS_WARN_IF(aIsSynthesized)) { if (NS_WARN_IF(aIsSynthesized)) {
return; return;
} }
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::DispatchCompositionEvent(), " ("ISM: IMEStateManager::DispatchCompositionEvent(), "
"adding new TextComposition to the array")); "adding new TextComposition to the array"));
MOZ_ASSERT(aCompositionEvent->message == NS_COMPOSITION_START); MOZ_ASSERT(aCompositionEvent->message == NS_COMPOSITION_START);
@ -965,7 +965,7 @@ IMEStateManager::DispatchCompositionEvent(
TextCompositionArray::index_type i = TextCompositionArray::index_type i =
sTextCompositions->IndexOf(aCompositionEvent->widget); sTextCompositions->IndexOf(aCompositionEvent->widget);
if (i != TextCompositionArray::NoIndex) { if (i != TextCompositionArray::NoIndex) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::DispatchCompositionEvent(), " ("ISM: IMEStateManager::DispatchCompositionEvent(), "
"removing TextComposition from the array since NS_COMPOSTION_END " "removing TextComposition from the array since NS_COMPOSTION_END "
"was dispatched")); "was dispatched"));
@ -983,7 +983,7 @@ IMEStateManager::OnCompositionEventDiscarded(
// Note that this method is never called for synthesized events for emulating // Note that this method is never called for synthesized events for emulating
// commit or cancel composition. // commit or cancel composition.
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnCompositionEventDiscarded(aCompositionEvent={ " ("ISM: IMEStateManager::OnCompositionEventDiscarded(aCompositionEvent={ "
"message=%s, mFlags={ mIsTrusted=%s } })", "message=%s, mFlags={ mIsTrusted=%s } })",
GetEventMessageName(aCompositionEvent->message), GetEventMessageName(aCompositionEvent->message),
@ -1006,7 +1006,7 @@ IMEStateManager::OnCompositionEventDiscarded(
// a TextComposition instance for the composition was already removed from // a TextComposition instance for the composition was already removed from
// the array and destroyed in OnDestroyPresContext(). Therefore, we may // the array and destroyed in OnDestroyPresContext(). Therefore, we may
// fail to retrieve a TextComposition instance here. // fail to retrieve a TextComposition instance here.
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::OnCompositionEventDiscarded(), " ("ISM: IMEStateManager::OnCompositionEventDiscarded(), "
"TextComposition instance for the widget has already gone")); "TextComposition instance for the widget has already gone"));
return; return;
@ -1027,14 +1027,14 @@ IMEStateManager::NotifyIME(IMEMessage aMessage,
bool isSynthesizedForTests = bool isSynthesizedForTests =
composition && composition->IsSynthesizedForTests(); composition && composition->IsSynthesizedForTests();
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::NotifyIME(aMessage=%s, aWidget=0x%p), " ("ISM: IMEStateManager::NotifyIME(aMessage=%s, aWidget=0x%p), "
"composition=0x%p, composition->IsSynthesizedForTests()=%s", "composition=0x%p, composition->IsSynthesizedForTests()=%s",
GetNotifyIMEMessageName(aMessage), aWidget, composition.get(), GetNotifyIMEMessageName(aMessage), aWidget, composition.get(),
GetBoolName(isSynthesizedForTests))); GetBoolName(isSynthesizedForTests)));
if (NS_WARN_IF(!aWidget)) { if (NS_WARN_IF(!aWidget)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::NotifyIME(), FAILED due to no widget")); ("ISM: IMEStateManager::NotifyIME(), FAILED due to no widget"));
return NS_ERROR_INVALID_ARG; return NS_ERROR_INVALID_ARG;
} }
@ -1062,7 +1062,7 @@ nsresult
IMEStateManager::NotifyIME(IMEMessage aMessage, IMEStateManager::NotifyIME(IMEMessage aMessage,
nsPresContext* aPresContext) nsPresContext* aPresContext)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::NotifyIME(aMessage=%s, aPresContext=0x%p)", ("ISM: IMEStateManager::NotifyIME(aMessage=%s, aPresContext=0x%p)",
GetNotifyIMEMessageName(aMessage), aPresContext)); GetNotifyIMEMessageName(aMessage), aPresContext));
@ -1070,7 +1070,7 @@ IMEStateManager::NotifyIME(IMEMessage aMessage,
nsIWidget* widget = aPresContext->GetRootWidget(); nsIWidget* widget = aPresContext->GetRootWidget();
if (NS_WARN_IF(!widget)) { if (NS_WARN_IF(!widget)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::NotifyIME(), FAILED due to no widget for the " ("ISM: IMEStateManager::NotifyIME(), FAILED due to no widget for the "
"nsPresContext")); "nsPresContext"));
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
@ -1146,18 +1146,18 @@ IMEStateManager::IsEditableIMEState(nsIWidget* aWidget)
void void
IMEStateManager::DestroyIMEContentObserver() IMEStateManager::DestroyIMEContentObserver()
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::DestroyIMEContentObserver(), " ("ISM: IMEStateManager::DestroyIMEContentObserver(), "
"sActiveIMEContentObserver=0x%p", "sActiveIMEContentObserver=0x%p",
sActiveIMEContentObserver)); sActiveIMEContentObserver));
if (!sActiveIMEContentObserver) { if (!sActiveIMEContentObserver) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::DestroyIMEContentObserver() does nothing")); ("ISM: IMEStateManager::DestroyIMEContentObserver() does nothing"));
return; return;
} }
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::DestroyIMEContentObserver(), destroying " ("ISM: IMEStateManager::DestroyIMEContentObserver(), destroying "
"the active IMEContentObserver...")); "the active IMEContentObserver..."));
nsRefPtr<IMEContentObserver> tsm; nsRefPtr<IMEContentObserver> tsm;
@ -1169,7 +1169,7 @@ IMEStateManager::DestroyIMEContentObserver()
void void
IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor) IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
{ {
PR_LOG(sISMLog, PR_LOG_ALWAYS, MOZ_LOG(sISMLog, PR_LOG_ALWAYS,
("ISM: IMEStateManager::CreateIMEContentObserver(aEditor=0x%p), " ("ISM: IMEStateManager::CreateIMEContentObserver(aEditor=0x%p), "
"sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, " "sPresContext=0x%p, sContent=0x%p, sActiveIMEContentObserver=0x%p, "
"sActiveIMEContentObserver->IsManaging(sPresContext, sContent)=%s", "sActiveIMEContentObserver->IsManaging(sPresContext, sContent)=%s",
@ -1178,7 +1178,7 @@ IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
sActiveIMEContentObserver->IsManaging(sPresContext, sContent) : false))); sActiveIMEContentObserver->IsManaging(sPresContext, sContent) : false)));
if (NS_WARN_IF(sActiveIMEContentObserver)) { if (NS_WARN_IF(sActiveIMEContentObserver)) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::CreateIMEContentObserver(), FAILED due to " ("ISM: IMEStateManager::CreateIMEContentObserver(), FAILED due to "
"there is already an active IMEContentObserver")); "there is already an active IMEContentObserver"));
MOZ_ASSERT(sActiveIMEContentObserver->IsManaging(sPresContext, sContent)); MOZ_ASSERT(sActiveIMEContentObserver->IsManaging(sPresContext, sContent));
@ -1187,7 +1187,7 @@ IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget(); nsCOMPtr<nsIWidget> widget = sPresContext->GetRootWidget();
if (!widget) { if (!widget) {
PR_LOG(sISMLog, PR_LOG_ERROR, MOZ_LOG(sISMLog, PR_LOG_ERROR,
("ISM: IMEStateManager::CreateIMEContentObserver(), FAILED due to " ("ISM: IMEStateManager::CreateIMEContentObserver(), FAILED due to "
"there is a root widget for the nsPresContext")); "there is a root widget for the nsPresContext"));
return; // Sometimes, there are no widgets. return; // Sometimes, there are no widgets.
@ -1195,7 +1195,7 @@ IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
// If it's not text ediable, we don't need to create IMEContentObserver. // If it's not text ediable, we don't need to create IMEContentObserver.
if (!IsEditableIMEState(widget)) { if (!IsEditableIMEState(widget)) {
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::CreateIMEContentObserver() doesn't create " ("ISM: IMEStateManager::CreateIMEContentObserver() doesn't create "
"IMEContentObserver because of non-editable IME state")); "IMEContentObserver because of non-editable IME state"));
return; return;
@ -1207,7 +1207,7 @@ IMEStateManager::CreateIMEContentObserver(nsIEditor* aEditor)
sInitializeIsTestingIME = false; sInitializeIsTestingIME = false;
} }
PR_LOG(sISMLog, PR_LOG_DEBUG, MOZ_LOG(sISMLog, PR_LOG_DEBUG,
("ISM: IMEStateManager::CreateIMEContentObserver() is creating an " ("ISM: IMEStateManager::CreateIMEContentObserver() is creating an "
"IMEContentObserver instance...")); "IMEContentObserver instance..."));
sActiveIMEContentObserver = new IMEContentObserver(); sActiveIMEContentObserver = new IMEContentObserver();

4
dom/html/HTMLMediaElement.cpp
Просмотреть файл

@ -94,8 +94,8 @@
static PRLogModuleInfo* gMediaElementLog; static PRLogModuleInfo* gMediaElementLog;
static PRLogModuleInfo* gMediaElementEventsLog; static PRLogModuleInfo* gMediaElementEventsLog;
#define LOG(type, msg) PR_LOG(gMediaElementLog, type, msg) #define LOG(type, msg) MOZ_LOG(gMediaElementLog, type, msg)
#define LOG_EVENT(type, msg) PR_LOG(gMediaElementEventsLog, type, msg) #define LOG_EVENT(type, msg) MOZ_LOG(gMediaElementEventsLog, type, msg)
#include "nsIContentSecurityPolicy.h" #include "nsIContentSecurityPolicy.h"

2
dom/html/HTMLTrackElement.cpp
Просмотреть файл

@ -41,7 +41,7 @@
#include "nsVideoFrame.h" #include "nsVideoFrame.h"
static PRLogModuleInfo* gTrackElementLog; static PRLogModuleInfo* gTrackElementLog;
#define LOG(type, msg) PR_LOG(gTrackElementLog, type, msg) #define LOG(type, msg) MOZ_LOG(gTrackElementLog, type, msg)
// Replace the usual NS_IMPL_NS_NEW_HTML_ELEMENT(Track) so // Replace the usual NS_IMPL_NS_NEW_HTML_ELEMENT(Track) so
// we can return an UnknownElement instead when pref'd off. // we can return an UnknownElement instead when pref'd off.

2
dom/indexedDB/ActorsParent.cpp
Просмотреть файл

@ -110,7 +110,7 @@
#endif #endif
#define IDB_DEBUG_LOG(_args) \ #define IDB_DEBUG_LOG(_args) \
PR_LOG(IndexedDatabaseManager::GetLoggingModule(), \ MOZ_LOG(IndexedDatabaseManager::GetLoggingModule(), \
PR_LOG_DEBUG, \ PR_LOG_DEBUG, \
_args ) _args )

2
dom/indexedDB/ProfilerHelpers.h
Просмотреть файл

@ -297,7 +297,7 @@ LoggingHelper(bool aUseProfiler, const char* aFmt, ...)
va_end(args); va_end(args);
} }
PR_LOG(logModule, logLevel, ("%s", message.get())); MOZ_LOG(logModule, logLevel, ("%s", message.get()));
if (aUseProfiler) { if (aUseProfiler) {
PROFILER_MARKER(message.get()); PROFILER_MARKER(message.get());

4
dom/ipc/ProcessPriorityManager.cpp
Просмотреть файл

@ -77,10 +77,10 @@
return sLog; return sLog;
} }
# define LOG(fmt, ...) \ # define LOG(fmt, ...) \
PR_LOG(GetPPMLog(), PR_LOG_DEBUG, \ MOZ_LOG(GetPPMLog(), PR_LOG_DEBUG, \
("ProcessPriorityManager - " fmt, ##__VA_ARGS__)) ("ProcessPriorityManager - " fmt, ##__VA_ARGS__))
# define LOGP(fmt, ...) \ # define LOGP(fmt, ...) \
PR_LOG(GetPPMLog(), PR_LOG_DEBUG, \ MOZ_LOG(GetPPMLog(), PR_LOG_DEBUG, \
("ProcessPriorityManager[%schild-id=%" PRIu64 ", pid=%d] - " fmt, \ ("ProcessPriorityManager[%schild-id=%" PRIu64 ", pid=%d] - " fmt, \
NameWithComma().get(), \ NameWithComma().get(), \
static_cast<uint64_t>(ChildID()), Pid(), ##__VA_ARGS__)) static_cast<uint64_t>(ChildID()), Pid(), ##__VA_ARGS__))

4
dom/media/AudioSink.cpp
Просмотреть файл

@ -12,9 +12,9 @@ namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define SINK_LOG(msg, ...) \ #define SINK_LOG(msg, ...) \
PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("AudioSink=%p " msg, this, ##__VA_ARGS__)) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("AudioSink=%p " msg, this, ##__VA_ARGS__))
#define SINK_LOG_V(msg, ...) \ #define SINK_LOG_V(msg, ...) \
PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG+1, ("AudioSink=%p " msg, this, ##__VA_ARGS__)) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG+1, ("AudioSink=%p " msg, this, ##__VA_ARGS__))
AudioSink::OnAudioEndTimeUpdateTask::OnAudioEndTimeUpdateTask( AudioSink::OnAudioEndTimeUpdateTask::OnAudioEndTimeUpdateTask(
MediaDecoderStateMachine* aStateMachine) MediaDecoderStateMachine* aStateMachine)

22
dom/media/AudioStream.cpp
Просмотреть файл

@ -30,7 +30,7 @@ namespace mozilla {
PRLogModuleInfo* gAudioStreamLog = nullptr; PRLogModuleInfo* gAudioStreamLog = nullptr;
// For simple logs // For simple logs
#define LOG(x) PR_LOG(gAudioStreamLog, PR_LOG_DEBUG, x) #define LOG(x) MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG, x)
/** /**
* When MOZ_DUMP_AUDIO is set in the environment (to anything), * When MOZ_DUMP_AUDIO is set in the environment (to anything),
@ -329,7 +329,7 @@ AudioStream::Init(int32_t aNumChannels, int32_t aRate,
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
PR_LOG(gAudioStreamLog, PR_LOG_DEBUG, MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG,
("%s channels: %d, rate: %d for %p", __FUNCTION__, aNumChannels, aRate, this)); ("%s channels: %d, rate: %d for %p", __FUNCTION__, aNumChannels, aRate, this));
mInRate = mOutRate = aRate; mInRate = mOutRate = aRate;
mChannels = aNumChannels; mChannels = aNumChannels;
@ -546,12 +546,12 @@ AudioStream::CheckForStart()
if (mLatencyRequest == LowLatency || mNeedsStart) { if (mLatencyRequest == LowLatency || mNeedsStart) {
StartUnlocked(); // mState = STARTED or ERRORED StartUnlocked(); // mState = STARTED or ERRORED
mNeedsStart = false; mNeedsStart = false;
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
("Started waiting %s-latency stream", ("Started waiting %s-latency stream",
mLatencyRequest == LowLatency ? "low" : "high")); mLatencyRequest == LowLatency ? "low" : "high"));
} else { } else {
// high latency, not full - OR Pause() was called before we got here // high latency, not full - OR Pause() was called before we got here
PR_LOG(gAudioStreamLog, PR_LOG_DEBUG, MOZ_LOG(gAudioStreamLog, PR_LOG_DEBUG,
("Not starting waiting %s-latency stream", ("Not starting waiting %s-latency stream",
mLatencyRequest == LowLatency ? "low" : "high")); mLatencyRequest == LowLatency ? "low" : "high"));
} }
@ -644,7 +644,7 @@ AudioStream::Write(const AudioDataValue* aBuf, uint32_t aFrames, TimeStamp *aTim
remains = mBuffer.Length() - bytesToCopy; // Free up just enough space remains = mBuffer.Length() - bytesToCopy; // Free up just enough space
} }
// account for dropping samples // account for dropping samples
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p dropping %u bytes (%u frames)in Write()", MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p dropping %u bytes (%u frames)in Write()",
this, mBuffer.Length() - remains, BytesToFrames(mBuffer.Length() - remains))); this, mBuffer.Length() - remains, BytesToFrames(mBuffer.Length() - remains)));
mReadPoint += BytesToFrames(mBuffer.Length() - remains); mReadPoint += BytesToFrames(mBuffer.Length() - remains);
mBuffer.ContractTo(remains); mBuffer.ContractTo(remains);
@ -652,14 +652,14 @@ AudioStream::Write(const AudioDataValue* aBuf, uint32_t aFrames, TimeStamp *aTim
// If we are not playing, but our buffer is full, start playing to make // If we are not playing, but our buffer is full, start playing to make
// room for soon-to-be-decoded data. // room for soon-to-be-decoded data.
if (mState != STARTED && mState != RUNNING) { if (mState != STARTED && mState != RUNNING) {
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Starting stream %p in Write (%u waiting)", MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Starting stream %p in Write (%u waiting)",
this, bytesToCopy)); this, bytesToCopy));
StartUnlocked(); StartUnlocked();
if (mState == ERRORED) { if (mState == ERRORED) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
} }
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p waiting in Write() (%u waiting)", MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING, ("Stream %p waiting in Write() (%u waiting)",
this, bytesToCopy)); this, bytesToCopy));
mon.Wait(); mon.Wait();
} }
@ -1072,16 +1072,16 @@ AudioStream::DataCallback(void* aBuffer, long aFrames)
TimeStamp now = TimeStamp::Now(); TimeStamp now = TimeStamp::Now();
if (!mStartTime.IsNull()) { if (!mStartTime.IsNull()) {
int64_t timeMs = (now - mStartTime).ToMilliseconds(); int64_t timeMs = (now - mStartTime).ToMilliseconds();
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
("Stream took %lldms to start after first Write() @ %u", timeMs, mOutRate)); ("Stream took %lldms to start after first Write() @ %u", timeMs, mOutRate));
} else { } else {
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
("Stream started before Write() @ %u", mOutRate)); ("Stream started before Write() @ %u", mOutRate));
} }
if (old_len != available) { if (old_len != available) {
// Note that we may have dropped samples in Write() as well! // Note that we may have dropped samples in Write() as well!
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
("AudioStream %p dropped %u + %u initial frames @ %u", this, ("AudioStream %p dropped %u + %u initial frames @ %u", this,
mReadPoint, BytesToFrames(old_len - available), mOutRate)); mReadPoint, BytesToFrames(old_len - available), mOutRate));
mReadPoint += BytesToFrames(old_len - available); mReadPoint += BytesToFrames(old_len - available);
@ -1122,7 +1122,7 @@ AudioStream::DataCallback(void* aBuffer, long aFrames)
uint8_t* rpos = static_cast<uint8_t*>(aBuffer) + FramesToBytes(aFrames - underrunFrames); uint8_t* rpos = static_cast<uint8_t*>(aBuffer) + FramesToBytes(aFrames - underrunFrames);
memset(rpos, 0, FramesToBytes(underrunFrames)); memset(rpos, 0, FramesToBytes(underrunFrames));
if (underrunFrames) { if (underrunFrames) {
PR_LOG(gAudioStreamLog, PR_LOG_WARNING, MOZ_LOG(gAudioStreamLog, PR_LOG_WARNING,
("AudioStream %p lost %d frames", this, underrunFrames)); ("AudioStream %p lost %d frames", this, underrunFrames));
} }
servicedFrames += underrunFrames; servicedFrames += underrunFrames;

4
dom/media/GraphDriver.cpp
Просмотреть файл

@ -11,7 +11,7 @@
#endif #endif
extern PRLogModuleInfo* gMediaStreamGraphLog; extern PRLogModuleInfo* gMediaStreamGraphLog;
#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg) #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
// We don't use NSPR log here because we want this interleaved with adb logcat // We don't use NSPR log here because we want this interleaved with adb logcat
// on Android/B2G // on Android/B2G
@ -319,7 +319,7 @@ SystemClockDriver::GetIntervalForIteration(GraphTime& aFrom, GraphTime& aTo)
mCurrentTimeStamp = now; mCurrentTimeStamp = now;
PR_LOG(gMediaStreamGraphLog, PR_LOG_DEBUG+1, ("Updating current time to %f (real %f, mStateComputedTime %f)", MOZ_LOG(gMediaStreamGraphLog, PR_LOG_DEBUG+1, ("Updating current time to %f (real %f, mStateComputedTime %f)",
mGraphImpl->MediaTimeToSeconds(aTo), mGraphImpl->MediaTimeToSeconds(aTo),
(now - mInitialTimeStamp).ToSeconds(), (now - mInitialTimeStamp).ToSeconds(),
mGraphImpl->MediaTimeToSeconds(StateComputedTime()))); mGraphImpl->MediaTimeToSeconds(StateComputedTime())));

4
dom/media/Latency.cpp
Просмотреть файл

@ -191,11 +191,11 @@ void AsyncLatencyLogger::WriteLog(LatencyLogIndex aIndex, uint64_t aID, int64_t
TimeStamp aTimeStamp) TimeStamp aTimeStamp)
{ {
if (aTimeStamp.IsNull()) { if (aTimeStamp.IsNull()) {
PR_LOG(GetLatencyLog(), PR_LOG_DEBUG, MOZ_LOG(GetLatencyLog(), PR_LOG_DEBUG,
("Latency: %s,%llu,%lld,%lld", ("Latency: %s,%llu,%lld,%lld",
LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue)); LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue));
} else { } else {
PR_LOG(GetLatencyLog(), PR_LOG_DEBUG, MOZ_LOG(GetLatencyLog(), PR_LOG_DEBUG,
("Latency: %s,%llu,%lld,%lld,%lld", ("Latency: %s,%llu,%lld,%lld,%lld",
LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue, LatencyLogIndex2Strings[aIndex], aID, GetTimeStamp(), aValue,
static_cast<int64_t>((aTimeStamp - gAsyncLogger->mStart).ToMilliseconds()))); static_cast<int64_t>((aTimeStamp - gAsyncLogger->mStart).ToMilliseconds())));

2
dom/media/MediaCache.cpp
Просмотреть файл

@ -25,7 +25,7 @@
namespace mozilla { namespace mozilla {
PRLogModuleInfo* gMediaCacheLog; PRLogModuleInfo* gMediaCacheLog;
#define CACHE_LOG(type, msg) PR_LOG(gMediaCacheLog, type, msg) #define CACHE_LOG(type, msg) MOZ_LOG(gMediaCacheLog, type, msg)
// Readahead blocks for non-seekable streams will be limited to this // Readahead blocks for non-seekable streams will be limited to this
// fraction of the cache space. We don't normally evict such blocks // fraction of the cache space. We don't normally evict such blocks

2
dom/media/MediaDecoder.cpp
Просмотреть файл

@ -53,7 +53,7 @@ static const int64_t CAN_PLAY_THROUGH_MARGIN = 1;
PRLogModuleInfo* gMediaDecoderLog; PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(x, ...) \ #define DECODER_LOG(x, ...) \
PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, this, ##__VA_ARGS__)) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, this, ##__VA_ARGS__))
static const char* const gPlayStateStr[] = { static const char* const gPlayStateStr[] = {
"START", "START",

2
dom/media/MediaDecoderReader.cpp
Просмотреть файл

@ -22,7 +22,7 @@ namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(x, ...) \ #define DECODER_LOG(x, ...) \
PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__)) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
// Same workaround as MediaDecoderStateMachine.cpp. // Same workaround as MediaDecoderStateMachine.cpp.
#define DECODER_WARN_HELPER(a, b) NS_WARNING b #define DECODER_WARN_HELPER(a, b) NS_WARNING b

2
dom/media/MediaDecoderStateMachine.cpp
Просмотреть файл

@ -58,7 +58,7 @@ using namespace mozilla::gfx;
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
extern PRLogModuleInfo* gMediaSampleLog; extern PRLogModuleInfo* gMediaSampleLog;
#define LOG(m, l, x, ...) \ #define LOG(m, l, x, ...) \
PR_LOG(m, l, ("Decoder=%p " x, mDecoder.get(), ##__VA_ARGS__)) MOZ_LOG(m, l, ("Decoder=%p " x, mDecoder.get(), ##__VA_ARGS__))
#define DECODER_LOG(x, ...) \ #define DECODER_LOG(x, ...) \
LOG(gMediaDecoderLog, PR_LOG_DEBUG, x, ##__VA_ARGS__) LOG(gMediaDecoderLog, PR_LOG_DEBUG, x, ##__VA_ARGS__)
#define VERBOSE_LOG(x, ...) \ #define VERBOSE_LOG(x, ...) \

4
dom/media/MediaFormatReader.cpp
Просмотреть файл

@ -35,8 +35,8 @@ PRLogModuleInfo* GetFormatDecoderLog() {
} }
return log; return log;
} }
#define LOG(arg, ...) PR_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define LOG(arg, ...) MOZ_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define LOGV(arg, ...) PR_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG+1, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define LOGV(arg, ...) MOZ_LOG(GetFormatDecoderLog(), PR_LOG_DEBUG+1, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/MediaManager.cpp
Просмотреть файл

@ -111,7 +111,7 @@ GetMediaManagerLog()
sLog = PR_NewLogModule("MediaManager"); sLog = PR_NewLogModule("MediaManager");
return sLog; return sLog;
} }
#define LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg) #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
using dom::File; using dom::File;
using dom::MediaStreamConstraints; using dom::MediaStreamConstraints;

2
dom/media/MediaManager.h
Просмотреть файл

@ -49,7 +49,7 @@ struct MediaTrackConstraintSet;
} }
extern PRLogModuleInfo* GetMediaManagerLog(); extern PRLogModuleInfo* GetMediaManagerLog();
#define MM_LOG(msg) PR_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg) #define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), PR_LOG_DEBUG, msg)
/** /**
* This class is an implementation of MediaStreamListener. This is used * This class is an implementation of MediaStreamListener. This is used

2
dom/media/MediaPromise.h
Просмотреть файл

@ -31,7 +31,7 @@ extern PRLogModuleInfo* gMediaPromiseLog;
#define PROMISE_LOG(x, ...) \ #define PROMISE_LOG(x, ...) \
MOZ_ASSERT(gMediaPromiseLog); \ MOZ_ASSERT(gMediaPromiseLog); \
PR_LOG(gMediaPromiseLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__)) MOZ_LOG(gMediaPromiseLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
/* /*
* A promise manages an asynchronous request that may or may not be able to be * A promise manages an asynchronous request that may or may not be able to be

2
dom/media/MediaRecorder.cpp
Просмотреть файл

@ -32,7 +32,7 @@
#endif #endif
PRLogModuleInfo* gMediaRecorderLog; PRLogModuleInfo* gMediaRecorderLog;
#define LOG(type, msg) PR_LOG(gMediaRecorderLog, type, msg) #define LOG(type, msg) MOZ_LOG(gMediaRecorderLog, type, msg)
namespace mozilla { namespace mozilla {

2
dom/media/MediaResource.cpp
Просмотреть файл

@ -34,7 +34,7 @@
#include "nsIContentPolicy.h" #include "nsIContentPolicy.h"
PRLogModuleInfo* gMediaResourceLog; PRLogModuleInfo* gMediaResourceLog;
#define RESOURCE_LOG(msg, ...) PR_LOG(gMediaResourceLog, PR_LOG_DEBUG, \ #define RESOURCE_LOG(msg, ...) MOZ_LOG(gMediaResourceLog, PR_LOG_DEBUG, \
(msg, ##__VA_ARGS__)) (msg, ##__VA_ARGS__))
// Debug logging macro with object pointer and class name. // Debug logging macro with object pointer and class name.
#define CMLOG(msg, ...) \ #define CMLOG(msg, ...) \

2
dom/media/MediaShutdownManager.cpp
Просмотреть файл

@ -14,7 +14,7 @@
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver) NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver)

2
dom/media/MediaStreamGraph.cpp
Просмотреть файл

@ -42,7 +42,7 @@ using namespace mozilla::gfx;
namespace mozilla { namespace mozilla {
PRLogModuleInfo* gMediaStreamGraphLog; PRLogModuleInfo* gMediaStreamGraphLog;
#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg) #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
// #define ENABLE_LIFECYCLE_LOG // #define ENABLE_LIFECYCLE_LOG

2
dom/media/MediaTimer.h
Просмотреть файл

@ -23,7 +23,7 @@ extern PRLogModuleInfo* gMediaTimerLog;
#define TIMER_LOG(x, ...) \ #define TIMER_LOG(x, ...) \
MOZ_ASSERT(gMediaTimerLog); \ MOZ_ASSERT(gMediaTimerLog); \
PR_LOG(gMediaTimerLog, PR_LOG_DEBUG, ("[MediaTimer=%p relative_t=%lld]" x, this, \ MOZ_LOG(gMediaTimerLog, PR_LOG_DEBUG, ("[MediaTimer=%p relative_t=%lld]" x, this, \
RelativeMicroseconds(TimeStamp::Now()), ##__VA_ARGS__)) RelativeMicroseconds(TimeStamp::Now()), ##__VA_ARGS__))
// This promise type is only exclusive because so far there isn't a reason for // This promise type is only exclusive because so far there isn't a reason for

2
dom/media/RtspMediaResource.cpp
Просмотреть файл

@ -21,7 +21,7 @@
using namespace mozilla::net; using namespace mozilla::net;
PRLogModuleInfo* gRtspMediaResourceLog; PRLogModuleInfo* gRtspMediaResourceLog;
#define RTSP_LOG(msg, ...) PR_LOG(gRtspMediaResourceLog, PR_LOG_DEBUG, \ #define RTSP_LOG(msg, ...) MOZ_LOG(gRtspMediaResourceLog, PR_LOG_DEBUG, \
(msg, ##__VA_ARGS__)) (msg, ##__VA_ARGS__))
// Debug logging macro with object pointer and class name. // Debug logging macro with object pointer and class name.
#define RTSPMLOG(msg, ...) \ #define RTSPMLOG(msg, ...) \

2
dom/media/StateMirroring.h
Просмотреть файл

@ -50,7 +50,7 @@ namespace mozilla {
// the same log module. // the same log module.
#define MIRROR_LOG(x, ...) \ #define MIRROR_LOG(x, ...) \
MOZ_ASSERT(gStateWatchingLog); \ MOZ_ASSERT(gStateWatchingLog); \
PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__)) MOZ_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
template<typename T> class AbstractMirror; template<typename T> class AbstractMirror;

2
dom/media/StateWatching.h
Просмотреть файл

@ -60,7 +60,7 @@ extern PRLogModuleInfo* gStateWatchingLog;
#define WATCH_LOG(x, ...) \ #define WATCH_LOG(x, ...) \
MOZ_ASSERT(gStateWatchingLog); \ MOZ_ASSERT(gStateWatchingLog); \
PR_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__)) MOZ_LOG(gStateWatchingLog, PR_LOG_DEBUG, (x, ##__VA_ARGS__))
/* /*
* AbstractWatcher is a superclass from which all watchers must inherit. * AbstractWatcher is a superclass from which all watchers must inherit.

2
dom/media/StreamBuffer.cpp
Просмотреть файл

@ -10,7 +10,7 @@
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaStreamGraphLog; extern PRLogModuleInfo* gMediaStreamGraphLog;
#define STREAM_LOG(type, msg) PR_LOG(gMediaStreamGraphLog, type, msg) #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
#ifdef DEBUG #ifdef DEBUG
void void

2
dom/media/TrackUnionStream.cpp
Просмотреть файл

@ -43,7 +43,7 @@ namespace mozilla {
#endif #endif
PRLogModuleInfo* gTrackUnionStreamLog; PRLogModuleInfo* gTrackUnionStreamLog;
#define STREAM_LOG(type, msg) PR_LOG(gTrackUnionStreamLog, type, msg) #define STREAM_LOG(type, msg) MOZ_LOG(gTrackUnionStreamLog, type, msg)
TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) : TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
ProcessedMediaStream(aWrapper) ProcessedMediaStream(aWrapper)

2
dom/media/WebVTTListener.cpp
Просмотреть файл

@ -29,7 +29,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(WebVTTListener)
NS_IMPL_CYCLE_COLLECTING_RELEASE(WebVTTListener) NS_IMPL_CYCLE_COLLECTING_RELEASE(WebVTTListener)
PRLogModuleInfo* gTextTrackLog; PRLogModuleInfo* gTextTrackLog;
# define VTT_LOG(...) PR_LOG(gTextTrackLog, PR_LOG_DEBUG, (__VA_ARGS__)) # define VTT_LOG(...) MOZ_LOG(gTextTrackLog, PR_LOG_DEBUG, (__VA_ARGS__))
WebVTTListener::WebVTTListener(HTMLTrackElement* aElement) WebVTTListener::WebVTTListener(HTMLTrackElement* aElement)
: mElement(aElement) : mElement(aElement)

6
dom/media/apple/AppleMP3Reader.cpp
Просмотреть файл

@ -22,9 +22,9 @@
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define LOGE(...) PR_LOG(gMediaDecoderLog, PR_LOG_ERROR, (__VA_ARGS__)) #define LOGE(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_ERROR, (__VA_ARGS__))
#define LOGW(...) PR_LOG(gMediaDecoderLog, PR_LOG_WARNING, (__VA_ARGS__)) #define LOGW(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_WARNING, (__VA_ARGS__))
#define LOGD(...) PR_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__)) #define LOGD(...) MOZ_LOG(gMediaDecoderLog, PR_LOG_DEBUG, (__VA_ARGS__))
#define PROPERTY_ID_FORMAT "%c%c%c%c" #define PROPERTY_ID_FORMAT "%c%c%c%c"
#define PROPERTY_ID_PRINT(x) ((x) >> 24), \ #define PROPERTY_ID_PRINT(x) ((x) >> 24), \

2
dom/media/directshow/AudioSinkFilter.cpp
Просмотреть файл

@ -24,7 +24,7 @@ using namespace mozilla::media;
namespace mozilla { namespace mozilla {
PRLogModuleInfo* GetDirectShowLog(); PRLogModuleInfo* GetDirectShowLog();
#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
AudioSinkFilter::AudioSinkFilter(const wchar_t* aObjectName, HRESULT* aOutResult) AudioSinkFilter::AudioSinkFilter(const wchar_t* aObjectName, HRESULT* aOutResult)
: BaseFilter(aObjectName, CLSID_MozAudioSinkFilter), : BaseFilter(aObjectName, CLSID_MozAudioSinkFilter),

2
dom/media/directshow/AudioSinkInputPin.cpp
Просмотреть файл

@ -16,7 +16,7 @@ using namespace mozilla::media;
namespace mozilla { namespace mozilla {
PRLogModuleInfo* GetDirectShowLog(); PRLogModuleInfo* GetDirectShowLog();
#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
AudioSinkInputPin::AudioSinkInputPin(wchar_t* aObjectName, AudioSinkInputPin::AudioSinkInputPin(wchar_t* aObjectName,
AudioSinkFilter* aFilter, AudioSinkFilter* aFilter,

2
dom/media/directshow/DirectShowReader.cpp
Просмотреть файл

@ -26,7 +26,7 @@ GetDirectShowLog() {
return log; return log;
} }
#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
DirectShowReader::DirectShowReader(AbstractMediaDecoder* aDecoder) DirectShowReader::DirectShowReader(AbstractMediaDecoder* aDecoder)
: MediaDecoderReader(aDecoder), : MediaDecoderReader(aDecoder),

2
dom/media/directshow/SampleSink.cpp
Просмотреть файл

@ -15,7 +15,7 @@ using namespace mozilla::media;
namespace mozilla { namespace mozilla {
PRLogModuleInfo* GetDirectShowLog(); PRLogModuleInfo* GetDirectShowLog();
#define LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
SampleSink::SampleSink() SampleSink::SampleSink()
: mMonitor("SampleSink"), : mMonitor("SampleSink"),

2
dom/media/directshow/SourceFilter.cpp
Просмотреть файл

@ -21,7 +21,7 @@ namespace mozilla {
#if defined (DEBUG_SOURCE_TRACE) #if defined (DEBUG_SOURCE_TRACE)
PRLogModuleInfo* GetDirectShowLog(); PRLogModuleInfo* GetDirectShowLog();
#define DIRECTSHOW_LOG(...) PR_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define DIRECTSHOW_LOG(...) MOZ_LOG(GetDirectShowLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#else #else
#define DIRECTSHOW_LOG(...) #define DIRECTSHOW_LOG(...)
#endif #endif

4
dom/media/eme/EMEUtils.h
Просмотреть файл

@ -14,13 +14,13 @@ namespace mozilla {
#ifndef EME_LOG #ifndef EME_LOG
PRLogModuleInfo* GetEMELog(); PRLogModuleInfo* GetEMELog();
#define EME_LOG(...) PR_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define EME_LOG(...) MOZ_LOG(GetEMELog(), PR_LOG_DEBUG, (__VA_ARGS__))
#define EME_LOG_ENABLED() PR_LOG_TEST(GetEMELog(), PR_LOG_DEBUG) #define EME_LOG_ENABLED() PR_LOG_TEST(GetEMELog(), PR_LOG_DEBUG)
#endif #endif
#ifndef EME_VERBOSE_LOG #ifndef EME_VERBOSE_LOG
PRLogModuleInfo* GetEMEVerboseLog(); PRLogModuleInfo* GetEMEVerboseLog();
#define EME_VERBOSE_LOG(...) PR_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define EME_VERBOSE_LOG(...) MOZ_LOG(GetEMEVerboseLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#else #else
#ifndef EME_LOG #ifndef EME_LOG
#define EME_LOG(...) #define EME_LOG(...)

2
dom/media/encoder/MediaEncoder.cpp
Просмотреть файл

@ -32,7 +32,7 @@
#endif #endif
PRLogModuleInfo* gMediaEncoderLog; PRLogModuleInfo* gMediaEncoderLog;
#define LOG(type, msg) PR_LOG(gMediaEncoderLog, type, msg) #define LOG(type, msg) MOZ_LOG(gMediaEncoderLog, type, msg)
namespace mozilla { namespace mozilla {

2
dom/media/encoder/TrackEncoder.cpp
Просмотреть файл

@ -19,7 +19,7 @@
namespace mozilla { namespace mozilla {
PRLogModuleInfo* gTrackEncoderLog; PRLogModuleInfo* gTrackEncoderLog;
#define TRACK_LOG(type, msg) PR_LOG(gTrackEncoderLog, type, msg) #define TRACK_LOG(type, msg) MOZ_LOG(gTrackEncoderLog, type, msg)
static const int DEFAULT_CHANNELS = 1; static const int DEFAULT_CHANNELS = 1;
static const int DEFAULT_SAMPLING_RATE = 16000; static const int DEFAULT_SAMPLING_RATE = 16000;

2
dom/media/encoder/VP8TrackEncoder.cpp
Просмотреть файл

@ -16,7 +16,7 @@
namespace mozilla { namespace mozilla {
PRLogModuleInfo* gVP8TrackEncoderLog; PRLogModuleInfo* gVP8TrackEncoderLog;
#define VP8LOG(msg, ...) PR_LOG(gVP8TrackEncoderLog, PR_LOG_DEBUG, \ #define VP8LOG(msg, ...) MOZ_LOG(gVP8TrackEncoderLog, PR_LOG_DEBUG, \
(msg, ##__VA_ARGS__)) (msg, ##__VA_ARGS__))
// Debug logging macro with object pointer and class name. // Debug logging macro with object pointer and class name.

2
dom/media/encoder/VorbisTrackEncoder.cpp
Просмотреть файл

@ -18,7 +18,7 @@ namespace mozilla {
#undef LOG #undef LOG
PRLogModuleInfo* gVorbisTrackEncoderLog; PRLogModuleInfo* gVorbisTrackEncoderLog;
#define VORBISLOG(msg, ...) PR_LOG(gVorbisTrackEncoderLog, PR_LOG_DEBUG, \ #define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, PR_LOG_DEBUG, \
(msg, ##__VA_ARGS__)) (msg, ##__VA_ARGS__))
VorbisTrackEncoder::VorbisTrackEncoder() VorbisTrackEncoder::VorbisTrackEncoder()

4
dom/media/fmp4/MP4Reader.cpp
Просмотреть файл

@ -40,8 +40,8 @@ PRLogModuleInfo* GetDemuxerLog() {
} }
return log; return log;
} }
#define LOG(arg, ...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define LOG(arg, ...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define VLOG(arg, ...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define VLOG(arg, ...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, ("MP4Reader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
using namespace mp4_demuxer; using namespace mp4_demuxer;

4
dom/media/gmp/GMPAudioDecoderParent.cpp
Просмотреть файл

@ -19,8 +19,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
namespace gmp { namespace gmp {

2
dom/media/gmp/GMPChild.cpp
Просмотреть файл

@ -46,7 +46,7 @@ namespace mozilla {
#undef LOGD #undef LOGD
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOG(level, x, ...) PR_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__)) #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
#define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPChild[pid=%d] " x, (int)base::GetCurrentProcId(), ##__VA_ARGS__) #define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPChild[pid=%d] " x, (int)base::GetCurrentProcId(), ##__VA_ARGS__)
namespace gmp { namespace gmp {

4
dom/media/gmp/GMPContentParent.cpp
Просмотреть файл

@ -21,8 +21,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

2
dom/media/gmp/GMPParent.cpp
Просмотреть файл

@ -42,7 +42,7 @@ namespace mozilla {
#undef LOGD #undef LOGD
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOG(level, x, ...) PR_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__)) #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
#define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPParent[%p|childPid=%d] " x, this, mChildPid, ##__VA_ARGS__) #define LOGD(x, ...) LOG(PR_LOG_DEBUG, "GMPParent[%p|childPid=%d] " x, this, mChildPid, ##__VA_ARGS__)
namespace gmp { namespace gmp {

4
dom/media/gmp/GMPService.cpp
Просмотреть файл

@ -50,8 +50,8 @@ GetGMPLog()
return sLog; return sLog;
} }
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

4
dom/media/gmp/GMPServiceChild.cpp
Просмотреть файл

@ -12,8 +12,8 @@ namespace mozilla {
#undef LOG #undef LOG
#endif #endif
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

4
dom/media/gmp/GMPServiceParent.cpp
Просмотреть файл

@ -40,8 +40,8 @@ namespace mozilla {
#undef LOG #undef LOG
#endif #endif
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

4
dom/media/gmp/GMPStorageParent.cpp
Просмотреть файл

@ -28,8 +28,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

4
dom/media/gmp/GMPTimerParent.cpp
Просмотреть файл

@ -15,8 +15,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

4
dom/media/gmp/GMPVideoDecoderParent.cpp
Просмотреть файл

@ -23,8 +23,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
namespace gmp { namespace gmp {

4
dom/media/gmp/GMPVideoEncoderParent.cpp
Просмотреть файл

@ -25,8 +25,8 @@ namespace mozilla {
extern PRLogModuleInfo* GetGMPLog(); extern PRLogModuleInfo* GetGMPLog();
#define LOGD(msg) PR_LOG(GetGMPLog(), PR_LOG_DEBUG, msg) #define LOGD(msg) MOZ_LOG(GetGMPLog(), PR_LOG_DEBUG, msg)
#define LOG(level, msg) PR_LOG(GetGMPLog(), (level), msg) #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
#ifdef __CLASS__ #ifdef __CLASS__
#undef __CLASS__ #undef __CLASS__

2
dom/media/gstreamer/GStreamerReader.cpp
Просмотреть файл

@ -31,7 +31,7 @@ using namespace layers;
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define LOG(type, msg, ...) \ #define LOG(type, msg, ...) \
PR_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__)) MOZ_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__))
#if DEBUG #if DEBUG
static const unsigned int MAX_CHANNELS = 4; static const unsigned int MAX_CHANNELS = 4;

2
dom/media/imagecapture/ImageCapture.h
Просмотреть файл

@ -15,7 +15,7 @@ namespace mozilla {
#ifndef IC_LOG #ifndef IC_LOG
PRLogModuleInfo* GetICLog(); PRLogModuleInfo* GetICLog();
#define IC_LOG(...) PR_LOG(GetICLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define IC_LOG(...) MOZ_LOG(GetICLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#endif #endif
namespace dom { namespace dom {

2
dom/media/mediasource/ContainerParser.cpp
Просмотреть файл

@ -25,7 +25,7 @@ extern PRLogModuleInfo* GetMediaSourceLog();
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x) #define TOSTRING(x) STRINGIFY(x)
#define MSE_DEBUG(name, arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUG(name, arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, (TOSTRING(name) "(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

4
dom/media/mediasource/MediaSource.cpp
Просмотреть файл

@ -57,8 +57,8 @@ PRLogModuleInfo* GetMediaSourceAPILog()
return sLogModule; return sLogModule;
} }
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("MediaSource(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
// Arbitrary limit. // Arbitrary limit.
static const unsigned int MAX_SOURCE_BUFFERS = 16; static const unsigned int MAX_SOURCE_BUFFERS = 16;

4
dom/media/mediasource/MediaSourceDecoder.cpp
Просмотреть файл

@ -17,8 +17,8 @@
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

4
dom/media/mediasource/MediaSourceReader.cpp
Просмотреть файл

@ -25,8 +25,8 @@
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("MediaSourceReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
// When a stream hits EOS it needs to decide what other stream to switch to. Due // When a stream hits EOS it needs to decide what other stream to switch to. Due
// to inaccuracies is determining buffer end frames (Bug 1065207) and rounding // to inaccuracies is determining buffer end frames (Bug 1065207) and rounding

2
dom/media/mediasource/MediaSourceResource.h
Просмотреть файл

@ -13,7 +13,7 @@
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#define UNIMPLEMENTED() MSE_DEBUG("UNIMPLEMENTED FUNCTION at %s:%d", __FILE__, __LINE__) #define UNIMPLEMENTED() MSE_DEBUG("UNIMPLEMENTED FUNCTION at %s:%d", __FILE__, __LINE__)

4
dom/media/mediasource/ResourceQueue.cpp
Просмотреть файл

@ -15,8 +15,8 @@ extern PRLogModuleInfo* GetSourceBufferResourceLog();
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__
#endif #endif
#define SBR_DEBUG(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define SBR_DEBUGV(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

6
dom/media/mediasource/SourceBuffer.cpp
Просмотреть файл

@ -29,9 +29,9 @@ class JSObject;
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
extern PRLogModuleInfo* GetMediaSourceAPILog(); extern PRLogModuleInfo* GetMediaSourceAPILog();
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#define MSE_DEBUGV(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG + 1, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/mediasource/SourceBufferDecoder.cpp
Просмотреть файл

@ -16,7 +16,7 @@ extern PRLogModuleInfo* GetMediaSourceLog();
#define __func__ __FUNCTION__ #define __func__ __FUNCTION__
#endif #endif
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferDecoder(%p:%s)::%s: " arg, this, mResource->GetContentType().get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferDecoder(%p:%s)::%s: " arg, this, mResource->GetContentType().get(), __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

4
dom/media/mediasource/SourceBufferList.cpp
Просмотреть файл

@ -19,8 +19,8 @@
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
extern PRLogModuleInfo* GetMediaSourceAPILog(); extern PRLogModuleInfo* GetMediaSourceAPILog();
#define MSE_API(arg, ...) PR_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
struct JSContext; struct JSContext;
class JSObject; class JSObject;

4
dom/media/mediasource/SourceBufferResource.cpp
Просмотреть файл

@ -22,8 +22,8 @@ PRLogModuleInfo* GetSourceBufferResourceLog()
return sLogModule; return sLogModule;
} }
#define SBR_DEBUG(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
#define SBR_DEBUGV(arg, ...) PR_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), PR_LOG_DEBUG+1, ("SourceBufferResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/mediasource/TrackBuffer.cpp
Просмотреть файл

@ -24,7 +24,7 @@
extern PRLogModuleInfo* GetMediaSourceLog(); extern PRLogModuleInfo* GetMediaSourceLog();
#define MSE_DEBUG(arg, ...) PR_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("TrackBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__)) #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), PR_LOG_DEBUG, ("TrackBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
// Time in seconds to substract from the current time when deciding the // Time in seconds to substract from the current time when deciding the
// time point to evict data before in a decoder. This is used to help // time point to evict data before in a decoder. This is used to help

2
dom/media/ogg/OggCodecState.cpp
Просмотреть файл

@ -33,7 +33,7 @@
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
/** Decoder base class for Ogg-encapsulated streams. */ /** Decoder base class for Ogg-encapsulated streams. */
OggCodecState* OggCodecState*

4
dom/media/ogg/OggReader.cpp
Просмотреть файл

@ -37,9 +37,9 @@ namespace mozilla {
//#define SEEK_LOGGING //#define SEEK_LOGGING
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
#ifdef SEEK_LOGGING #ifdef SEEK_LOGGING
#define SEEK_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
#else #else
#define SEEK_LOG(type, msg) #define SEEK_LOG(type, msg)
#endif #endif

2
dom/media/ogg/OpusParser.cpp
Просмотреть файл

@ -25,7 +25,7 @@ extern "C" {
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define OPUS_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define OPUS_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
OpusParser::OpusParser(): OpusParser::OpusParser():
mRate(0), mRate(0),

2
dom/media/omx/AudioOffloadPlayer.cpp
Просмотреть файл

@ -44,7 +44,7 @@ namespace mozilla {
PRLogModuleInfo* gAudioOffloadPlayerLog; PRLogModuleInfo* gAudioOffloadPlayerLog;
#define AUDIO_OFFLOAD_LOG(type, msg) \ #define AUDIO_OFFLOAD_LOG(type, msg) \
PR_LOG(gAudioOffloadPlayerLog, type, msg) MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
// maximum time in paused state when offloading audio decompression. // maximum time in paused state when offloading audio decompression.
// When elapsed, the GonkAudioSink is destroyed to allow the audio DSP to power down. // When elapsed, the GonkAudioSink is destroyed to allow the audio DSP to power down.

4
dom/media/omx/AudioOutput.cpp
Просмотреть файл

@ -20,13 +20,13 @@
#include <stagefright/foundation/ADebug.h> #include <stagefright/foundation/ADebug.h>
#include "AudioOutput.h" #include "AudioOutput.h"
#include "prlog.h" #include "mozilla/Logging.h"
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gAudioOffloadPlayerLog; extern PRLogModuleInfo* gAudioOffloadPlayerLog;
#define AUDIO_OFFLOAD_LOG(type, msg) \ #define AUDIO_OFFLOAD_LOG(type, msg) \
PR_LOG(gAudioOffloadPlayerLog, type, msg) MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
using namespace android; using namespace android;

2
dom/media/omx/I420ColorConverterHelper.cpp
Просмотреть файл

@ -11,7 +11,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
PRLogModuleInfo *gI420ColorConverterHelperLog; PRLogModuleInfo *gI420ColorConverterHelperLog;
#define LOG(msg...) PR_LOG(gI420ColorConverterHelperLog, PR_LOG_WARNING, (msg)) #define LOG(msg...) MOZ_LOG(gI420ColorConverterHelperLog, PR_LOG_WARNING, (msg))
namespace android { namespace android {

2
dom/media/omx/MediaOmxCommonDecoder.cpp
Просмотреть файл

@ -21,7 +21,7 @@ using namespace android;
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
MediaOmxCommonDecoder::MediaOmxCommonDecoder() MediaOmxCommonDecoder::MediaOmxCommonDecoder()
: MediaDecoder() : MediaDecoder()

2
dom/media/omx/MediaOmxCommonReader.cpp
Просмотреть файл

@ -23,7 +23,7 @@ using namespace android;
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
MediaOmxCommonReader::MediaOmxCommonReader(AbstractMediaDecoder *aDecoder) MediaOmxCommonReader::MediaOmxCommonReader(AbstractMediaDecoder *aDecoder)
: MediaDecoderReader(aDecoder) : MediaDecoderReader(aDecoder)

2
dom/media/omx/MediaOmxReader.cpp
Просмотреть файл

@ -28,7 +28,7 @@ using namespace android;
namespace mozilla { namespace mozilla {
extern PRLogModuleInfo* gMediaDecoderLog; extern PRLogModuleInfo* gMediaDecoderLog;
#define DECODER_LOG(type, msg) PR_LOG(gMediaDecoderLog, type, msg) #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
class MediaOmxReader::ProcessCachedDataTask : public Task class MediaOmxReader::ProcessCachedDataTask : public Task
{ {

2
dom/media/omx/OmxDecoder.cpp
Просмотреть файл

@ -38,7 +38,7 @@
#undef LOG #undef LOG
PRLogModuleInfo *gOmxDecoderLog; PRLogModuleInfo *gOmxDecoderLog;
#define LOG(type, msg...) PR_LOG(gOmxDecoderLog, type, (msg)) #define LOG(type, msg...) MOZ_LOG(gOmxDecoderLog, type, (msg))
using namespace MPAPI; using namespace MPAPI;
using namespace mozilla; using namespace mozilla;

2
dom/media/platforms/apple/AppleATDecoder.cpp
Просмотреть файл

@ -13,7 +13,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0}) #define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0})
namespace mozilla { namespace mozilla {

2
dom/media/platforms/apple/AppleCMLinker.cpp
Просмотреть файл

@ -13,7 +13,7 @@
#include "nsDebug.h" #include "nsDebug.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/apple/AppleVDADecoder.cpp
Просмотреть файл

@ -24,7 +24,7 @@
#include "gfxPlatform.h" #include "gfxPlatform.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
//#define LOG_MEDIA_SHA1 //#define LOG_MEDIA_SHA1
namespace mozilla { namespace mozilla {

2
dom/media/platforms/apple/AppleVDALinker.cpp
Просмотреть файл

@ -11,7 +11,7 @@
#include "nsDebug.h" #include "nsDebug.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/apple/AppleVTDecoder.cpp
Просмотреть файл

@ -21,7 +21,7 @@
#include "gfxPlatform.h" #include "gfxPlatform.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
//#define LOG_MEDIA_SHA1 //#define LOG_MEDIA_SHA1
#ifdef LOG_MEDIA_SHA1 #ifdef LOG_MEDIA_SHA1

2
dom/media/platforms/apple/AppleVTLinker.cpp
Просмотреть файл

@ -12,7 +12,7 @@
#include "nsDebug.h" #include "nsDebug.h"
PRLogModuleInfo* GetAppleMediaLog(); PRLogModuleInfo* GetAppleMediaLog();
#define LOG(...) PR_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetAppleMediaLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/ffmpeg/FFmpegLog.h
Просмотреть файл

@ -8,6 +8,6 @@
#define __FFmpegLog_h__ #define __FFmpegLog_h__
extern PRLogModuleInfo* GetFFmpegDecoderLog(); extern PRLogModuleInfo* GetFFmpegDecoderLog();
#define FFMPEG_LOG(...) PR_LOG(GetFFmpegDecoderLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define FFMPEG_LOG(...) MOZ_LOG(GetFFmpegDecoderLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#endif // __FFmpegLog_h__ #endif // __FFmpegLog_h__

2
dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
Просмотреть файл

@ -26,7 +26,7 @@
#define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__) #define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__)
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
#define READ_OUTPUT_BUFFER_TIMEOUT_US 3000 #define READ_OUTPUT_BUFFER_TIMEOUT_US 3000
using namespace android; using namespace android;

2
dom/media/platforms/gonk/GonkMediaDataDecoder.cpp
Просмотреть файл

@ -14,7 +14,7 @@
#define GMDD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkMediaDataDecoder", __VA_ARGS__) #define GMDD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkMediaDataDecoder", __VA_ARGS__)
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
using namespace android; using namespace android;

2
dom/media/platforms/gonk/GonkVideoDecoderManager.cpp
Просмотреть файл

@ -32,7 +32,7 @@
#define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__) #define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__)
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
using namespace mozilla::layers; using namespace mozilla::layers;
using namespace android; using namespace android;
typedef android::MediaCodecProxy MediaCodecProxy; typedef android::MediaCodecProxy MediaCodecProxy;

2
dom/media/platforms/wmf/MFTDecoder.cpp
Просмотреть файл

@ -10,7 +10,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/wmf/WMFAudioMFTManager.cpp
Просмотреть файл

@ -13,7 +13,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
Просмотреть файл

@ -13,7 +13,7 @@
#include "mozilla/Logging.h" #include "mozilla/Logging.h"
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
namespace mozilla { namespace mozilla {

2
dom/media/platforms/wmf/WMFVideoMFTManager.cpp
Просмотреть файл

@ -22,7 +22,7 @@
#include "mozilla/WindowsVersion.h" #include "mozilla/WindowsVersion.h"
PRLogModuleInfo* GetDemuxerLog(); PRLogModuleInfo* GetDemuxerLog();
#define LOG(...) PR_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__)) #define LOG(...) MOZ_LOG(GetDemuxerLog(), PR_LOG_DEBUG, (__VA_ARGS__))
using mozilla::layers::Image; using mozilla::layers::Image;
using mozilla::layers::IMFYCbCrImage; using mozilla::layers::IMFYCbCrImage;

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше