Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-07 07:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1061209 - Fix WError build failure on a CLOSED TREE

Browse Source
This commit is contained in:
Nicolas Silva 2014-09-03 14:59:36 +02:00
parent 6390d21942
commit d7db229da6
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
widget/xpwidgets/nsBaseWidget.cpp
View File

@ -872,19 +872,6 @@ nsBaseWidget::GetPreferredCompositorBackends(nsTArray<LayersBackend>& aHints)
aHints.AppendElement(LayersBackend::LAYERS_BASIC);
}
static void
RemoveBasicBackend(nsTArray<LayersBackend>& aHints)
{
#ifndef XP_WIN
for (size_t i = 0; i < aHints.Length(); ++i) {
if (aHints[i] == LayersBackend::LAYERS_BASIC &&
!Preferences::GetBool("layers.offmainthreadcomposition.force-basic", false)) {
aHints[i] = LayersBackend::LAYERS_NONE;
}
}
#endif
}
void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
{
MOZ_ASSERT(gfxPlatform::UsesOffMainThreadCompositing(),
@ -914,9 +901,14 @@ void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)
nsTArray<LayersBackend> backendHints;
GetPreferredCompositorBackends(backendHints);
#ifndef MOZ_X11
if (!mRequireOffMainThreadCompositing) {
RemoveBasicBackend(backendHints);
#if !defined(MOZ_X11) && !defined(XP_WIN)
if (!mRequireOffMainThreadCompositing &&
!Preferences::GetBool("layers.offmainthreadcomposition.force-basic", false)) {
for (size_t i = 0; i < backendHints.Length(); ++i) {
if (backendHints[i] == LayersBackend::LAYERS_BASIC) {
backendHints[i] = LayersBackend::LAYERS_NONE;
}
}
}
#endif