mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-26 23:23:33 +00:00
ace6d1063f
The inclusions were removed with the following very crude script and the
resulting breakage was fixed up by hand. The manual fixups did either
revert the changes done by the script, replace a generic header with a more
specific one or replace a header with a forward declaration.
find . -name "*.idl" | grep -v web-platform | grep -v third_party | while read path; do
interfaces=$(grep "^\(class\|interface\).*:.*" "$path" | cut -d' ' -f2)
if [ -n "$interfaces" ]; then
if [[ "$interfaces" == *$'\n'* ]]; then
regexp="\("
for i in $interfaces; do regexp="$regexp$i\|"; done
regexp="${regexp%%\\\|}\)"
else
regexp="$interfaces"
fi
interface=$(basename "$path")
rg -l "#include.*${interface%%.idl}.h" . | while read path2; do
hits=$(grep -v "#include.*${interface%%.idl}.h" "$path2" | grep -c "$regexp" )
if [ $hits -eq 0 ]; then
echo "Removing ${interface} from ${path2}"
grep -v "#include.*${interface%%.idl}.h" "$path2" > "$path2".tmp
mv -f "$path2".tmp "$path2"
fi
done
fi
done
Differential Revision: https://phabricator.services.mozilla.com/D55442
--HG--
extra : moz-landing-system : lando
64 lines
2.1 KiB
C++
64 lines
2.1 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 "js/JSON.h"
|
|
#include "nsArrayUtils.h"
|
|
#include "PaymentRequestUtils.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
nsresult SerializeFromJSObject(JSContext* aCx, JS::HandleObject aObject,
|
|
nsAString& aSerializedObject) {
|
|
MOZ_ASSERT(aCx);
|
|
JS::RootedValue value(aCx, JS::ObjectValue(*aObject));
|
|
return SerializeFromJSVal(aCx, value, aSerializedObject);
|
|
}
|
|
|
|
nsresult SerializeFromJSVal(JSContext* aCx, JS::HandleValue aValue,
|
|
nsAString& aSerializedValue) {
|
|
aSerializedValue.Truncate();
|
|
nsAutoString serializedValue;
|
|
JS::RootedValue value(aCx, aValue.get());
|
|
NS_ENSURE_TRUE(nsContentUtils::StringifyJSON(aCx, &value, serializedValue),
|
|
NS_ERROR_XPC_BAD_CONVERT_JS);
|
|
NS_ENSURE_TRUE(!serializedValue.IsEmpty(), NS_ERROR_FAILURE);
|
|
aSerializedValue = serializedValue;
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult DeserializeToJSObject(const nsAString& aSerializedObject,
|
|
JSContext* aCx,
|
|
JS::MutableHandleObject aObject) {
|
|
MOZ_ASSERT(aCx);
|
|
JS::RootedValue value(aCx);
|
|
nsresult rv = DeserializeToJSValue(aSerializedObject, aCx, &value);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
if (value.isObject()) {
|
|
aObject.set(&value.toObject());
|
|
} else {
|
|
aObject.set(nullptr);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult DeserializeToJSValue(const nsAString& aSerializedObject,
|
|
JSContext* aCx, JS::MutableHandleValue aValue) {
|
|
MOZ_ASSERT(aCx);
|
|
if (!JS_ParseJSON(aCx,
|
|
static_cast<const char16_t*>(
|
|
PromiseFlatString(aSerializedObject).get()),
|
|
aSerializedObject.Length(), aValue)) {
|
|
return NS_ERROR_UNEXPECTED;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
} // end of namespace dom
|
|
} // end of namespace mozilla
|