зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1494533 - Fix log message of copy-paste error r=nical
This commit is contained in:
Родитель
35b751d9cd
Коммит
27f253ccf7
|
@ -120,13 +120,13 @@ RenderCompositorANGLE::Initialize()
|
|||
mDevice = GetDeviceOfEGLDisplay();
|
||||
|
||||
if (!mDevice) {
|
||||
gfxCriticalNote << "[D3D11] failed to get compositor device.";
|
||||
gfxCriticalNote << "[WR] failed to get compositor device.";
|
||||
return false;
|
||||
}
|
||||
|
||||
mDevice->GetImmediateContext(getter_AddRefs(mCtx));
|
||||
if (!mCtx) {
|
||||
gfxCriticalNote << "[D3D11] failed to get immediate context.";
|
||||
gfxCriticalNote << "[WR] failed to get immediate context.";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -160,7 +160,10 @@ RenderThread::AccumulateMemoryReport(MemoryReport aInitial)
|
|||
RefPtr<MemoryReportPromise::Private> p = new MemoryReportPromise::Private(__func__);
|
||||
MOZ_ASSERT(!IsInRenderThread());
|
||||
if (!Get() || !Get()->Loop()) {
|
||||
// Seems to happen sometimes, see bug 1494430.
|
||||
// This happens when the GPU process fails to start and we fall back to the
|
||||
// basic compositor in the parent process. We could assert against this if we
|
||||
// made the webrender detection code in gfxPlatform.cpp smarter.
|
||||
// See bug 1494430 comment 12.
|
||||
NS_WARNING("No render thread, returning empty memory report");
|
||||
p->Resolve(aInitial, __func__);
|
||||
return p;
|
||||
|
|
Загрузка…
Ссылка в новой задаче