forked from mirrors/gecko-dev
501b078b36
--HG-- rename : dom/base/Console.cpp => dom/console/Console.cpp rename : dom/base/Console.h => dom/console/Console.h rename : dom/base/ConsoleAPI.manifest => dom/console/ConsoleAPI.manifest rename : dom/base/ConsoleAPIStorage.js => dom/console/ConsoleAPIStorage.js rename : dom/base/ConsoleReportCollector.cpp => dom/console/ConsoleReportCollector.cpp rename : dom/base/ConsoleReportCollector.h => dom/console/ConsoleReportCollector.h rename : dom/base/nsIConsoleAPIStorage.idl => dom/console/nsIConsoleAPIStorage.idl rename : dom/base/nsIConsoleReportCollector.h => dom/console/nsIConsoleReportCollector.h rename : dom/base/test/test_bug659625.html => dom/console/tests/test_bug659625.html rename : dom/base/test/test_bug978522.html => dom/console/tests/test_bug978522.html rename : dom/base/test/test_bug979109.html => dom/console/tests/test_bug979109.html rename : dom/base/test/test_bug989665.html => dom/console/tests/test_bug989665.html rename : dom/base/test/test_console.xul => dom/console/tests/test_console.xul rename : dom/base/test/test_consoleEmptyStack.html => dom/console/tests/test_consoleEmptyStack.html rename : dom/base/test/test_console_binding.html => dom/console/tests/test_console_binding.html rename : dom/base/test/test_console_proto.html => dom/console/tests/test_console_proto.html
107 lines
3.6 KiB
C++
107 lines
3.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/ConsoleReportCollector.h"
|
|
|
|
#include "nsNetUtil.h"
|
|
|
|
namespace mozilla {
|
|
|
|
NS_IMPL_ISUPPORTS(ConsoleReportCollector, nsIConsoleReportCollector)
|
|
|
|
ConsoleReportCollector::ConsoleReportCollector()
|
|
: mMutex("mozilla::ConsoleReportCollector")
|
|
{
|
|
}
|
|
|
|
void
|
|
ConsoleReportCollector::AddConsoleReport(uint32_t aErrorFlags,
|
|
const nsACString& aCategory,
|
|
nsContentUtils::PropertiesFile aPropertiesFile,
|
|
const nsACString& aSourceFileURI,
|
|
uint32_t aLineNumber,
|
|
uint32_t aColumnNumber,
|
|
const nsACString& aMessageName,
|
|
const nsTArray<nsString>& aStringParams)
|
|
{
|
|
// any thread
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
mPendingReports.AppendElement(PendingReport(aErrorFlags, aCategory,
|
|
aPropertiesFile, aSourceFileURI,
|
|
aLineNumber, aColumnNumber,
|
|
aMessageName, aStringParams));
|
|
}
|
|
|
|
void
|
|
ConsoleReportCollector::FlushConsoleReports(nsIDocument* aDocument)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
|
|
nsTArray<PendingReport> reports;
|
|
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
mPendingReports.SwapElements(reports);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < reports.Length(); ++i) {
|
|
PendingReport& report = reports[i];
|
|
|
|
// It would be nice if we did not have to do this since ReportToConsole()
|
|
// just turns around and converts it back to a spec.
|
|
nsCOMPtr<nsIURI> uri;
|
|
nsresult rv = NS_NewURI(getter_AddRefs(uri), report.mSourceFileURI);
|
|
if (NS_FAILED(rv)) {
|
|
continue;
|
|
}
|
|
|
|
// Convert back from nsTArray<nsString> to the char16_t** format required
|
|
// by our l10n libraries and ReportToConsole. (bug 1219762)
|
|
UniquePtr<const char16_t*[]> params;
|
|
uint32_t paramsLength = report.mStringParams.Length();
|
|
if (paramsLength > 0) {
|
|
params = MakeUnique<const char16_t*[]>(paramsLength);
|
|
for (uint32_t j = 0; j < paramsLength; ++j) {
|
|
params[j] = report.mStringParams[j].get();
|
|
}
|
|
}
|
|
|
|
nsContentUtils::ReportToConsole(report.mErrorFlags, report.mCategory,
|
|
aDocument, report.mPropertiesFile,
|
|
report.mMessageName.get(),
|
|
params.get(),
|
|
paramsLength, uri, EmptyString(),
|
|
report.mLineNumber, report.mColumnNumber);
|
|
}
|
|
}
|
|
|
|
void
|
|
ConsoleReportCollector::FlushConsoleReports(nsIConsoleReportCollector* aCollector)
|
|
{
|
|
MOZ_ASSERT(aCollector);
|
|
|
|
nsTArray<PendingReport> reports;
|
|
|
|
{
|
|
MutexAutoLock lock(mMutex);
|
|
mPendingReports.SwapElements(reports);
|
|
}
|
|
|
|
for (uint32_t i = 0; i < reports.Length(); ++i) {
|
|
PendingReport& report = reports[i];
|
|
aCollector->AddConsoleReport(report.mErrorFlags, report.mCategory,
|
|
report.mPropertiesFile, report.mSourceFileURI,
|
|
report.mLineNumber, report.mColumnNumber,
|
|
report.mMessageName, report.mStringParams);
|
|
}
|
|
}
|
|
|
|
ConsoleReportCollector::~ConsoleReportCollector()
|
|
{
|
|
}
|
|
|
|
} // namespace mozilla
|