mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-06 09:05:45 +00:00
01583602a9
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout. The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.
CLOSED TREE makes big refactorings like this a piece of cake.
# The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
xargs perl -p -i -e '
s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
s/nsRefPtr ?</RefPtr</g; # handle declarations and variables
'
# Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h
# Handle nsRefPtr.h itself, a couple places that define constructors
# from nsRefPtr, and code generators specially. We do this here, rather
# than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
# things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
mfbt/nsRefPtr.h \
xpcom/glue/nsCOMPtr.h \
xpcom/base/OwningNonNull.h \
ipc/ipdl/ipdl/lower.py \
ipc/ipdl/ipdl/builtin.py \
dom/bindings/Codegen.py \
python/lldbutils/lldbutils/utils.py
# In our indiscriminate substitution above, we renamed
# nsRefPtrGetterAddRefs, the class behind getter_AddRefs. Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'
if [ -d .git ]; then
git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi
--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
74 lines
2.0 KiB
C++
74 lines
2.0 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsSerializationHelper.h"
|
|
|
|
|
|
#include "mozilla/Base64.h"
|
|
#include "nsISerializable.h"
|
|
#include "nsIObjectOutputStream.h"
|
|
#include "nsIObjectInputStream.h"
|
|
#include "nsString.h"
|
|
#include "nsBase64Encoder.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsStringStream.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
nsresult
|
|
NS_SerializeToString(nsISerializable* obj, nsCSubstring& str)
|
|
{
|
|
RefPtr<nsBase64Encoder> stream(new nsBase64Encoder());
|
|
if (!stream)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
nsCOMPtr<nsIObjectOutputStream> objstream =
|
|
do_CreateInstance("@mozilla.org/binaryoutputstream;1");
|
|
if (!objstream)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
objstream->SetOutputStream(stream);
|
|
nsresult rv =
|
|
objstream->WriteCompoundObject(obj, NS_GET_IID(nsISupports), true);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return stream->Finish(str);
|
|
}
|
|
|
|
nsresult
|
|
NS_DeserializeObject(const nsCSubstring& str, nsISupports** obj)
|
|
{
|
|
nsCString decodedData;
|
|
nsresult rv = Base64Decode(str, decodedData);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIInputStream> stream;
|
|
rv = NS_NewCStringInputStream(getter_AddRefs(stream), decodedData);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsCOMPtr<nsIObjectInputStream> objstream =
|
|
do_CreateInstance("@mozilla.org/binaryinputstream;1");
|
|
if (!objstream)
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
|
|
objstream->SetInputStream(stream);
|
|
return objstream->ReadObject(true, obj);
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS(nsSerializationHelper, nsISerializationHelper)
|
|
|
|
NS_IMETHODIMP
|
|
nsSerializationHelper::SerializeToString(nsISerializable *serializable,
|
|
nsACString & _retval)
|
|
{
|
|
return NS_SerializeToString(serializable, _retval);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsSerializationHelper::DeserializeObject(const nsACString & input,
|
|
nsISupports **_retval)
|
|
{
|
|
return NS_DeserializeObject(input, _retval);
|
|
}
|