Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1101635 - Enable tiling on 10.6. r=jrmuizel f=milan

Browse Source
This commit is contained in:
Markus Stange 2014-12-19 14:48:33 -05:00
parent cf9273c036
commit 9f8bb48452
6 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/client/ClientPaintedLayer.cpp
View File

@ -162,7 +162,7 @@ ClientLayerManager::CreatePaintedLayerWithHint(PaintedLayerCreationHint aHint)
#ifdef MOZ_B2G
aHint == SCROLLABLE &&
#endif
gfxPlatform::GetPlatform()->UseTiling()
gfxPrefs::LayersTilesEnabled()
#ifndef MOZ_X11
&& (AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_OPENGL ||
AsShadowForwarder()->GetCompositorBackendType() == LayersBackend::LAYERS_D3D9 ||

1
gfx/thebes/gfxPlatform.h
View File

@ -274,7 +274,6 @@ public:
/// These should be used instead of directly accessing the preference,
/// as different platforms may override the behaviour.
virtual bool UseTiling() { return gfxPrefs::LayersTilesEnabledDoNotUseDirectly(); }
virtual bool UseProgressivePaint() { return gfxPrefs::ProgressivePaintDoNotUseDirectly(); }
void GetAzureBackendInfo(mozilla::widget::InfoObject &aObj) {

11
gfx/thebes/gfxPlatformMac.cpp
View File

@ -20,7 +20,6 @@
#include "mozilla/VsyncDispatcher.h"
#include "qcms.h"
#include "gfx2DGlue.h"
#include "gfxPrefs.h"
#include <dlfcn.h>
#include <CoreVideo/CoreVideo.h>
@ -405,16 +404,6 @@ gfxPlatformMac::UseAcceleratedCanvas()
return nsCocoaFeatures::OnLionOrLater() && Preferences::GetBool("gfx.canvas.azure.accelerated", false);
}
bool
gfxPlatformMac::UseTiling()
{
if (gfxPrefs::LayersTilesForceEnabled()) {
return true;
}
// Tiling seems to be slow on 10.6 so disable it until we figure it out
return nsCocoaFeatures::OnLionOrLater() && gfxPlatform::UseTiling();
}
bool
gfxPlatformMac::UseProgressivePaint()
{

1
gfx/thebes/gfxPlatformMac.h
View File

@ -70,7 +70,6 @@ public:
bool UseAcceleratedCanvas();
virtual bool UseTiling() MOZ_OVERRIDE;
virtual bool UseProgressivePaint() MOZ_OVERRIDE;
virtual already_AddRefed<mozilla::gfx::VsyncSource> CreateHardwareVsyncSource() MOZ_OVERRIDE;

3
gfx/thebes/gfxPrefs.h
View File

@ -278,8 +278,7 @@ private:
DECL_GFX_PREF(Live, "layers.effect.grayscale", LayersEffectGrayscale, bool, false);
DECL_GFX_PREF(Live, "layers.effect.invert", LayersEffectInvert, bool, false);
DECL_GFX_PREF(Once, "layers.enable-tiles", LayersTilesEnabledDoNotUseDirectly, bool, false);
DECL_GFX_PREF(Once, "layers.force-enable-tiles", LayersTilesForceEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.enable-tiles", LayersTilesEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.tiled-drawtarget.enabled", TiledDrawTargetEnabled, bool, false);
// We allow for configurable and rectangular tile size to avoid wasting memory on devices whose
// screen size does not align nicely to the default tile size. Although layers can be any size,

2
layout/generic/nsGfxScrollFrame.cpp
View File

@ -1896,7 +1896,7 @@ ScrollFrameHelper::ScrollFrameHelper(nsContainerFrame* aOuter,
EnsureImageVisPrefsCached();
if (IsAlwaysActive() &&
gfxPlatform::GetPlatform()->UseTiling() &&
gfxPrefs::LayersTilesEnabled() &&
!nsLayoutUtils::UsesAsyncScrolling() &&
mOuter->GetContent()) {
// If we have tiling but no APZ, then set a 0-margin display port on