Bug 1494533 - Fix log message of copy-paste error r=nical
authorsotaro <sotaro.ikeda.g@gmail.com>
Fri, 28 Sep 2018 14:36:30 +0900
changeset 438691 238fb42f209eb4c03ca1af6210b9175891b40cc9
parent 438690 f2b071db0a8a5fc8d93610d6f3225ea6e08ea48c
child 438692 4ba7d42459f512ac30bbfb8ed391a6607e99d4e8
push id70086
push usertoros@mozilla.com
push dateFri, 28 Sep 2018 15:41:28 +0000
treeherderautoland@dbe2506cadd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1494533
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1494533 - Fix log message of copy-paste error r=nical
gfx/webrender_bindings/RenderCompositorANGLE.cpp
gfx/webrender_bindings/RenderThread.cpp
--- a/gfx/webrender_bindings/RenderCompositorANGLE.cpp
+++ b/gfx/webrender_bindings/RenderCompositorANGLE.cpp
@@ -115,23 +115,23 @@ RenderCompositorANGLE::Initialize()
   if (!gl::GLLibraryEGL::EnsureInitialized(/* forceAccel */ true, &discardFailureId)) {
     gfxCriticalNote << "Failed to load EGL library: " << discardFailureId.get();
     return false;
   }
 
   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;
   }
 
   HWND hwnd = mWidget->AsWindows()->GetHwnd();
 
   RefPtr<IDXGIDevice> dxgiDevice;
   mDevice->QueryInterface((IDXGIDevice**)getter_AddRefs(dxgiDevice));
 
--- a/gfx/webrender_bindings/RenderThread.cpp
+++ b/gfx/webrender_bindings/RenderThread.cpp
@@ -155,17 +155,20 @@ RenderThread::DoAccumulateMemoryReport(M
 
 // static
 RefPtr<MemoryReportPromise>
 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;
   }
 
   Get()->Loop()->PostTask(
     NewRunnableMethod<MemoryReport, RefPtr<MemoryReportPromise::Private>>(
       "wr::RenderThread::DoAccumulateMemoryReport",