Bug 981315 - Followup: Readd accidentally removed macro - for real this time on a CLOSED TREE. r=bustage
authorBas Schouten <bschouten@mozilla.com>
Thu, 13 Mar 2014 06:44:41 +0100
changeset 191532 0ab20c0165043200cbbf646849a27725ab2cb506
parent 191531 e30ce0237dac19f913fe4127e2ef57da151d657e
child 191533 a5377cd1e45e3b3cb68ea3012a6de8d57ed1d0c2
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs981315
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 981315 - Followup: Readd accidentally removed macro - for real this time on a CLOSED TREE. r=bustage
gfx/layers/client/TiledContentClient.cpp
--- a/gfx/layers/client/TiledContentClient.cpp
+++ b/gfx/layers/client/TiledContentClient.cpp
@@ -310,16 +310,17 @@ gfxMemorySharedReadLock::GetReadCount()
 
 gfxShmSharedReadLock::gfxShmSharedReadLock(ISurfaceAllocator* aAllocator)
   : mAllocator(aAllocator)
   , mAllocSuccess(false)
 {
   MOZ_COUNT_CTOR(gfxShmSharedReadLock);
   MOZ_ASSERT(mAllocator);
   if (mAllocator) {
+#define MOZ_ALIGN_WORD(x) (((x) + 3) & ~3)
     if (mAllocator->AllocShmemSection(MOZ_ALIGN_WORD(sizeof(ShmReadLockInfo)), &mShmemSection)) {
       ShmReadLockInfo* info = GetShmReadLockInfoPtr();
       info->readCount = 1;
       mAllocSuccess = true;
     }
   }
 }