Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1339097 - Allow PuppetWidget::GetLayerManager to return a layer manager even if it doesn't have a tabchild. r=dvander

Browse Source 
MozReview-Commit-ID: Ee41WIUIC4U

--HG--
extra : rebase_source : 0e6bd742031e978d8954df321485054d4dc45824
This commit is contained in:
Kartikaya Gupta 2017-02-14 13:15:50 -05:00
parent 01132453b1
commit 752898da60
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/PuppetWidget.cpp
View File

@ -10,6 +10,7 @@
#include "ClientLayerManager.h"
#include "gfxPlatform.h"
#include "mozilla/dom/TabChild.h"
#include "mozilla/gfx/gfxVars.h"
#include "mozilla/Hal.h"
#include "mozilla/IMEStateManager.h"
#include "mozilla/layers/APZChild.h"
@ -598,10 +599,10 @@ PuppetWidget::GetLayerManager(PLayerTransactionChild* aShadowManager,
return mLayerManager;
}
if (!mTabChild) {
return nullptr;
}
if (mTabChild->GetCompositorOptions().UseWebRender()) {
bool useWebRender = mTabChild
? mTabChild->GetCompositorOptions().UseWebRender()
: gfxVars::UseWebRender();
if (useWebRender) {
mLayerManager = new WebRenderLayerManager(this);
} else {
mLayerManager = new ClientLayerManager(this);