Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1374089 part 2 - Use nsRefPtrHashtable instead of nsDataHashtable with a RefPtr<> data type, since it's clearer and avoids unnecessary AddRef/Release calls. r=froydnj

Browse Source 
MozReview-Commit-ID: 3PshFI1cO38
This commit is contained in:
Mats Palmgren 2017-06-19 18:19:14 +02:00
parent 1da7b46948
commit a0ff91e5d1
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/ipc/LayerTransactionParent.cpp
View File

@ -1004,7 +1004,7 @@ LayerTransactionParent::AsLayer(const LayerHandle& aHandle)
if (!aHandle) {
return nullptr;
}
return mLayerMap.Get(aHandle.Value()).get();
return mLayerMap.GetWeak(aHandle.Value());
}
mozilla::ipc::IPCResult
@ -1019,14 +1019,11 @@ LayerTransactionParent::RecvNewCompositable(const CompositableHandle& aHandle, c
mozilla::ipc::IPCResult
LayerTransactionParent::RecvReleaseLayer(const LayerHandle& aHandle)
{
if (!aHandle) {
RefPtr<Layer> layer;
if (!aHandle || !mLayerMap.Remove(aHandle.Value(), getter_AddRefs(layer))) {
return IPC_FAIL_NO_REASON(this);
}
Maybe<RefPtr<Layer>> maybeLayer = mLayerMap.GetAndRemove(aHandle.Value());
if (!maybeLayer) {
return IPC_FAIL_NO_REASON(this);
}
(*maybeLayer)->Disconnect();
layer->Disconnect();
return IPC_OK();
}

4
gfx/layers/ipc/LayerTransactionParent.h
View File

@ -14,7 +14,7 @@
#include "mozilla/Attributes.h" // for override
#include "mozilla/ipc/SharedMemory.h" // for SharedMemory, etc
#include "mozilla/layers/PLayerTransactionParent.h"
#include "nsDataHashtable.h"
#include "nsRefPtrHashtable.h"
#include "nsTArrayForwardDeclare.h" // for InfallibleTArray
namespace mozilla {
@ -180,7 +180,7 @@ private:
RefPtr<Layer> mRoot;
// Mapping from LayerHandles to Layers.
nsDataHashtable<nsUint64HashKey, RefPtr<Layer>> mLayerMap;
nsRefPtrHashtable<nsUint64HashKey, Layer> mLayerMap;
// When this is nonzero, it refers to a layer tree owned by the
// compositor thread. It is always true that