Backed out changeset 4e63305fe592 (bug 1191040) for Linux gtest crashes.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-08-07 16:24:59 -04:00
parent 9724ee4047
commit 41b12d46e3
4 changed files with 12 additions and 10 deletions

View File

@ -682,6 +682,8 @@ CompositorParent::CompositorParent(nsIWidget* aWidget,
mCompositorScheduler = new CompositorSoftwareTimerScheduler(this);
}
gfxPlatform::GetPlatform()->ComputeTileSize();
LayerScope::SetPixelScale(mWidget->GetDefaultScale().scale);
}
@ -1733,6 +1735,7 @@ public:
, mNotifyAfterRemotePaint(false)
{
MOZ_ASSERT(NS_IsMainThread());
gfxPlatform::GetPlatform()->ComputeTileSize();
}
// IToplevelProtocol::CloneToplevel()

View File

@ -11,6 +11,8 @@ namespace mozilla {
namespace layers {
TEST(TiledLayerBuffer, TileStart) {
gfxPlatform::GetPlatform()->ComputeTileSize();
ASSERT_EQ(RoundDownToTileEdge(10, 256), 0);
ASSERT_EQ(RoundDownToTileEdge(-10, 256), -256);
}

View File

@ -504,8 +504,6 @@ gfxPlatform::Init()
InitLayersAccelerationPrefs();
InitLayersIPC();
gPlatform->ComputeTileSize();
nsresult rv;
bool usePlatformFontList = true;
@ -1004,7 +1002,7 @@ gfxPlatform::ComputeTileSize()
// The tile size should be picked in the parent processes
// and sent to the child processes over IPDL GetTileSize.
if (!XRE_IsParentProcess()) {
return;
NS_RUNTIMEABORT("wrong process.");
}
int32_t w = gfxPrefs::LayersTileWidth();

View File

@ -307,6 +307,12 @@ public:
int GetTileWidth();
int GetTileHeight();
void SetTileSize(int aWidth, int aHeight);
/**
* Calling this function will compute and set the ideal tile size for the
* platform. This should only be called in the parent process; child processes
* should be updated via SetTileSize to match the value computed in the parent.
*/
void ComputeTileSize();
/**
* Rebuilds the any cached system font lists
@ -754,13 +760,6 @@ private:
virtual void GetPlatformCMSOutputProfile(void *&mem, size_t &size);
/**
* Calling this function will compute and set the ideal tile size for the
* platform. This will only have an effect in the parent process; child processes
* should be updated via SetTileSize to match the value computed in the parent.
*/
void ComputeTileSize();
nsRefPtr<gfxASurface> mScreenReferenceSurface;
nsTArray<uint32_t> mCJKPrefLangs;
nsCOMPtr<nsIObserver> mSRGBOverrideObserver;