mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 22:32:46 +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
59 lines
1.9 KiB
C++
59 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "mozilla/dom/StructuredClone.h"
|
|
|
|
#include "js/StructuredClone.h"
|
|
#include "mozilla/dom/ImageData.h"
|
|
#include "mozilla/dom/StructuredCloneTags.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
JSObject*
|
|
ReadStructuredCloneImageData(JSContext* aCx, JSStructuredCloneReader* aReader)
|
|
{
|
|
// Read the information out of the stream.
|
|
uint32_t width, height;
|
|
JS::Rooted<JS::Value> dataArray(aCx);
|
|
if (!JS_ReadUint32Pair(aReader, &width, &height) ||
|
|
!JS_ReadTypedArray(aReader, &dataArray)) {
|
|
return nullptr;
|
|
}
|
|
MOZ_ASSERT(dataArray.isObject());
|
|
|
|
// Protect the result from a moving GC in ~nsRefPtr.
|
|
JS::Rooted<JSObject*> result(aCx);
|
|
{
|
|
// Construct the ImageData.
|
|
RefPtr<ImageData> imageData = new ImageData(width, height,
|
|
dataArray.toObject());
|
|
// Wrap it in a JS::Value.
|
|
if (!imageData->WrapObject(aCx, nullptr, &result)) {
|
|
return nullptr;
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
bool
|
|
WriteStructuredCloneImageData(JSContext* aCx, JSStructuredCloneWriter* aWriter,
|
|
ImageData* aImageData)
|
|
{
|
|
uint32_t width = aImageData->Width();
|
|
uint32_t height = aImageData->Height();
|
|
JS::Rooted<JSObject*> dataArray(aCx, aImageData->GetDataObject());
|
|
|
|
JSAutoCompartment ac(aCx, dataArray);
|
|
JS::Rooted<JS::Value> arrayValue(aCx, JS::ObjectValue(*dataArray));
|
|
return JS_WriteUint32Pair(aWriter, SCTAG_DOM_IMAGEDATA, 0) &&
|
|
JS_WriteUint32Pair(aWriter, width, height) &&
|
|
JS_WriteTypedArray(aWriter, arrayValue);
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|