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

Bug 977255 - Backout for build bustage on a CLOSED TREE

Browse Source
This commit is contained in:
Nicolas Silva 2014-03-28 17:01:52 +01:00
parent 5f99db0399
commit 216960b7a3
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
View File

@ -252,15 +252,19 @@ NS_IMPL_ISUPPORTS1(GrallocReporter, nsIMemoryReporter)
int64_t GrallocReporter::sAmount = 0;
void InitGralloc() {
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
RegisterStrongMemoryReporter(new GrallocReporter());
}
GrallocBufferActor::GrallocBufferActor()
: mAllocBytes(0)
, mTextureHost(nullptr)
{
static bool registered;
if (!registered) {
// We want to be sure that the first call here will always run on
// the main thread.
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
RegisterStrongMemoryReporter(new GrallocReporter());
registered = true;
}
}
GrallocBufferActor::~GrallocBufferActor()

8
gfx/thebes/gfxPlatform.cpp
View File

@ -89,10 +89,6 @@
#include "nsIGfxInfo.h"
#include "nsIXULRuntime.h"
#ifdef MOZ_WIDGET_GONK
void mozilla::layers::InitGralloc();
#endif
using namespace mozilla;
using namespace mozilla::layers;
@ -422,10 +418,6 @@ gfxPlatform::Init()
mozilla::gl::TexturePoolOGL::Init();
#endif
#ifdef MOZ_WIDGET_GONK
mozilla::layers::InitGralloc();
#endif
// Force registration of the gfx component, thus arranging for
// ::Shutdown to be called.
nsCOMPtr<nsISupports> forceReg