wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 885573 - Stop forcing layers acceleration when we have OMTC enabled. r=nrc

Browse Source
This commit is contained in:
Matt Woodrow 2013-06-24 17:27:29 +12:00
parent 6cc4b5354b
commit e1a0d2923b
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/thebes/gfxPlatform.cpp
View File

@ -1825,8 +1825,7 @@ void InitLayersAccelerationPrefs()
sPrefLayersOffMainThreadCompositionEnabled = Preferences::GetBool("layers.offmainthreadcomposition.enabled", false); sPrefLayersOffMainThreadCompositionEnabled = Preferences::GetBool("layers.offmainthreadcomposition.enabled", false);
sPrefLayersOffMainThreadCompositionTestingEnabled = Preferences::GetBool("layers.offmainthreadcomposition.testing.enabled", false); sPrefLayersOffMainThreadCompositionTestingEnabled = Preferences::GetBool("layers.offmainthreadcomposition.testing.enabled", false);
sPrefLayersOffMainThreadCompositionForceEnabled = Preferences::GetBool("layers.offmainthreadcomposition.force-enabled", false); sPrefLayersOffMainThreadCompositionForceEnabled = Preferences::GetBool("layers.offmainthreadcomposition.force-enabled", false);
sPrefLayersAccelerationForceEnabled = Preferences::GetBool("layers.acceleration.force-enabled", false) || sPrefLayersAccelerationForceEnabled = Preferences::GetBool("layers.acceleration.force-enabled", false);
Preferences::GetBool("browser.tabs.remote", false);
sPrefLayersAccelerationDisabled = Preferences::GetBool("layers.acceleration.disabled", false); sPrefLayersAccelerationDisabled = Preferences::GetBool("layers.acceleration.disabled", false);
sPrefLayersPreferOpenGL = Preferences::GetBool("layers.prefer-opengl", false); sPrefLayersPreferOpenGL = Preferences::GetBool("layers.prefer-opengl", false);
sPrefLayersPreferD3D9 = Preferences::GetBool("layers.prefer-d3d9", false); sPrefLayersPreferD3D9 = Preferences::GetBool("layers.prefer-d3d9", false);

2
widget/cocoa/nsChildView.h
View File

@ -448,7 +448,7 @@ public:
NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus); NS_IMETHOD DispatchEvent(nsGUIEvent* event, nsEventStatus & aStatus);
virtual bool ComputeShouldAccelerate(bool aDefault); virtual bool ComputeShouldAccelerate(bool aDefault);
virtual bool ShouldUseOffMainThreadCompositing(); virtual bool ShouldUseOffMainThreadCompositing() MOZ_OVERRIDE;
NS_IMETHOD SetCursor(nsCursor aCursor); NS_IMETHOD SetCursor(nsCursor aCursor);
NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY); NS_IMETHOD SetCursor(imgIContainer* aCursor, uint32_t aHotspotX, uint32_t aHotspotY);

3
widget/cocoa/nsChildView.mm
View File

@ -1421,7 +1421,8 @@ nsChildView::ShouldUseOffMainThreadCompositing()
// OMTC doesn't work with Basic Layers on OS X right now. Once it works, we'll // OMTC doesn't work with Basic Layers on OS X right now. Once it works, we'll
// still want to disable it for certain kinds of windows (e.g. popups). // still want to disable it for certain kinds of windows (e.g. popups).
return nsBaseWidget::ShouldUseOffMainThreadCompositing() && return nsBaseWidget::ShouldUseOffMainThreadCompositing() &&
ComputeShouldAccelerate(mUseLayersAcceleration); (ComputeShouldAccelerate(mUseLayersAcceleration) ||
Preferences::GetBool("layers.offmainthreadcomposition.prefer-basic", false));
} }
inline uint16_t COLOR8TOCOLOR16(uint8_t color8) inline uint16_t COLOR8TOCOLOR16(uint8_t color8)

10
widget/xpwidgets/nsBaseWidget.cpp
View File

@ -910,15 +910,11 @@ void nsBaseWidget::CreateCompositor()
mozilla::layers::LayersBackend mozilla::layers::LayersBackend
nsBaseWidget::GetPreferredCompositorBackend() nsBaseWidget::GetPreferredCompositorBackend()
{ {
// We need a separate preference here (instead of using mUseLayersAcceleration) if (mUseLayersAcceleration) {
// because we force enable accelerated layers with e10s. Once the BasicCompositor return mozilla::layers::LAYERS_OPENGL;
// is stable enough to be used for Ripc/Cipc, then we can remove that and this
// pref.
if (Preferences::GetBool("layers.offmainthreadcomposition.prefer-basic", false)) {
return mozilla::layers::LAYERS_BASIC;
} }
return mozilla::layers::LAYERS_OPENGL; return mozilla::layers::LAYERS_BASIC;
} }
void nsBaseWidget::CreateCompositor(int aWidth, int aHeight) void nsBaseWidget::CreateCompositor(int aWidth, int aHeight)