mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
16988569b9
- Bug 1177892 part 1 - Remove BOOLEAN_TO_JSVAL and STRING_TO_JSVAL. r=evilpie (1fac17ff3) - Bug 1177892 part 2 - Remove PRIVATE_TO_JSVAL. r=evilpie (4d7e80200) - pointer style (cd27bd41a) - Bug 1177892 part 3 - Remove OBJECT_TO_JSVAL. r=evilpie (ff66aebe5) - Bug 1155342 - Disallow flagging a [NewObject] method with a [DependsOn] value that implies it might return the same value when called twice. r=bzbarsky (7ba1bb806) - Bug 1129239. Don't require 'optional' keyword on trailing dictionary arguments if the dictionary has a required member. r=smaug (3ee24f57b) - Bug 1152902 part 1. Add a way to flag a method in webidl as being identity-testable, so we'll expose such an identity test from bindings to other C++ code. r=peterv (43e038677) - Bug 1152902 part 2. Add a fast path for the case when a Promise is resolved with another Promise. r=nsm (59f56603e) - Bug 1172785 - Adding StaticClassOverride routing for JS implemented WebIDL, r=peterv (6ae76e198) - Bug 1172785 - Using RTCCertificate for WebRTC, r=ekr (a69ee6167) - fix build, file built twice (04f7e3d75) - Bug 1155942. Treat USVString and ByteString as serializable values. r=bkelly (33e635737) - Bug 913053. Split up IDLTypedef and IDLTypedefType, and likewise for IDLCallback vs IDLCallbackType, so it's clearer whether we're operating on types or objects represented by those types. r=khuey (661f45319) - Bug 1168471 - Implement support for SharedArrayBuffers and SharedArrayViews in WebIDL. r=bz, r=lth, r=luke (77d63babc) - Bug 1151269 - Fix the test used by Ion ICs for whether values can definitely be written to an unboxed object, r=jandem. (0463d6b53) - Bug 1139474 - Watch for unboxed object properties when attaching Ion SETPROP ICs, r=jandem. (67bc9884d) - Bug 1162199 - Use unboxed objects by default, r=jandem. (4dba9da90) - Bug 1166678 - Inline first ObjectGroup::maybeSweep test, r=jandem. (ff179acb3) - Bug 1166709 - After converting unboxed objects created by some initializer to natives, create native objects at that allocation site in the future, r=jandem. (14a5c92b5) - Bug 1166709 - Mark definite properties when replacing the unboxed group used for literals at some pc, r=jandem. (487017105) - Bug 1170372 - Use unboxed arrays for Array() and other functions keyed to allocation sites, r=jandem. (9153a5313) - Bug 1175535 - Don't require objects embedded in MIR nodes to always be tenured, r=jandem. (75399d353) - Bug 1190272 - Improve type checks when storing values into unboxed objects in Ion code, r=jandem. (0a91a08d5) - Bug 1216130 - Fix extra checks for unboxed objects in PropertyWriteNeedsTypeBarrier. r=bhackett (4862b91ca) - Bug 1166700 - Tolerate null failures targets when storing to an unboxed object must fail, r=jandem. (87a07aa3d) - backport of Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame (5f6fc9f18) - Bug 1164374 - Use StaticMutex in BrowserProcessSubThread. r=froydnj. (b0ad93d17) - Bug 1167771 - Simplify the pre-barrier verifier's tracer use; r=sfink (0fc926804) - Bug 1166037 - Part 2 - Modify common Baseline code for ARM64. r=djvj (739b36d83) - Bug 1168864 followup - Remove unnecessary addProperty check from CheckHasNoSuchProperty. r=bhackett (3a464d07e) - Bug 1166037 - Follow-up - Revert SimulatorType to Simulator. no_r=me (613b095d3) - Bug 1166944 - Inline the only user of TraceObjectSlots; r=jonco (d830d12f0) - pointer style (d567d3be2) - Bug 1167291 - Generalize the marking tracer's cross-compartment check; r=jonco (b5f753147) - Bug 1167318 - Remove GetGCThingTraceKind in favor of the typed Cell variants; r=jonco (f698f3a64) - Bug 1167323 - Use internal interfaces to implement MarkCycleCollectorChildren; r=jonco (4acf85bdb) - Bug 1167433 - AccessorShape is an AllocKind but not a TraceKind; r=jonco (ea92cd26a) - pointer style (403e83b64) - remove namespace hack (e3663d39b) - Bug 1167453 - Rename JSGCTraceKind and make it a C++11 enum class; r=jonco (f7f435a16) - Bug 1165966 - Update destructor assertions to handle failed initalization r=terrence (48237ed24) - pointer style (f637042fc) - Bug 774364 - Part 1: Inline Math.random() in Ion on x86_64. r=sstangl (8379ab0b2) - Bug 1167677 - Try harder to find scratch registers for memory->memory MoveGroup moves, r=sunfish. (14d4b9962) - pointer style (93bb53345) - Bug 1185653 - Fix enumerate hook on unboxed objects to skip non-enume#able properties. r=jorendorff (4ecf41a10) - Bug 1125624, part 1 - Implement ValidateAndApplyPropertyDescriptor steps 3-4, so that (once the corresponding code in StandardDefineProperty is deleted) freezing an already-frozen object with an addProperty class hook will not call the hook. r=Waldo. (f67f98231) - Bug 1125624, part 2 - Change js::StandardDefineProperty to forward to s::DefineProperty. r=Waldo. (3ac5d9e30) - Bug 1148568 - In JSON.parse with a reviver callback, ignore failure when defining properties. r=Waldo. (30c35a758) - pointer style (826d092cf) - Bug 1166950 - Only give constructor functions a prototype. r=efaust (d1b909603) - Bug 1140482 - Add JSPROP_RESOLVING. Give NativeDefineProperty standard behavior in cases where a non-resolving define needs to trigger a resolve hook. r=Waldo. (b2d650abd) - Bug 1140482 followup: Update ResolveInterpretedFunctionPrototype() failure-cases to return false instead of nullptr, now that return type is bool. rs=jorendorff (38eef1812) - Bug 1148188 - part1: defaultShims. r=billm (9eb98a8fa) - pointer style (ec74889f1) - Bug 1101182 - One interpose call for one property access. r=bholley (111afff12) - pointer style (b8dd593e9) - Bug 1148188 - part2: interposeCall. r=billm (6fce5829e) - Bug 1125624, part 3 - Remove js::StandardDefineProperty and js::DefineOwnProperty. r=Waldo. (a8a228f6e) - Bug 1167244 - Handle nullptr return from maybeGetProperty(). r=bhackett (91958bdfc) - pointer style (ebfc629a6) - Bug 1170355 - Watch for indexes that don't fit in a jsid in Array.shift, r=jandem. (6c2f0a8a2) - pointer style (a31367643) - Bug 1165348 - Move Scalar Replacement after GVN. r=jandem (9296335d1) - Bug 1161584 - Add TrackedStrategy::SetProp_InlineCache. r=shu (612ea0b32) - Bug 923717 - Add IC fuzzing mode. r=efaust (a6a6a7460) - Bug 1166711 part 2.1 - Check Scalar Replacement with both unboxed object and without. r=bhackett (e839f034a) - Bug 1172943 - Use unboxed arrays for JSON and script literal arrays, r=jandem. (964d5a42f) - Bug 1162986 - Relax type requirements for using baseline cache information when compiling GETPROP, r=jandem. (68e234a08) - Bug 1168500 - Replace the operator, by variadic templates. r=Waldo (ccb173cb7) - Bug 1166711 part 0.1 - Use JitSpewPrinter instead of stderr. r=bhackett (239022b72) - Bug 1166711 part 0.2 - JitSpew add scope-base indentation level. r=bhackett (89288621e) - Bug 1129313 - Scalar Replacement: Remove PostWriteBarrier at the same time as the stores. r=h4writer (f9df0503e)
534 lines
14 KiB
C++
534 lines
14 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 "KeyPath.h"
|
|
#include "IDBObjectStore.h"
|
|
#include "Key.h"
|
|
#include "ReportInternalError.h"
|
|
|
|
#include "nsCharSeparatedTokenizer.h"
|
|
#include "nsJSUtils.h"
|
|
#include "xpcpublic.h"
|
|
|
|
#include "mozilla/dom/BindingDeclarations.h"
|
|
#include "mozilla/dom/IDBObjectStoreBinding.h"
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
namespace indexedDB {
|
|
|
|
namespace {
|
|
|
|
inline
|
|
bool
|
|
IgnoreWhitespace(char16_t c)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
typedef nsCharSeparatedTokenizerTemplate<IgnoreWhitespace> KeyPathTokenizer;
|
|
|
|
bool
|
|
IsValidKeyPathString(const nsAString& aKeyPath)
|
|
{
|
|
NS_ASSERTION(!aKeyPath.IsVoid(), "What?");
|
|
|
|
KeyPathTokenizer tokenizer(aKeyPath, '.');
|
|
|
|
while (tokenizer.hasMoreTokens()) {
|
|
nsString token(tokenizer.nextToken());
|
|
|
|
if (!token.Length()) {
|
|
return false;
|
|
}
|
|
|
|
if (!JS_IsIdentifier(token.get(), token.Length())) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
// If the very last character was a '.', the tokenizer won't give us an empty
|
|
// token, but the keyPath is still invalid.
|
|
if (!aKeyPath.IsEmpty() &&
|
|
aKeyPath.CharAt(aKeyPath.Length() - 1) == '.') {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
enum KeyExtractionOptions {
|
|
DoNotCreateProperties,
|
|
CreateProperties
|
|
};
|
|
|
|
nsresult
|
|
GetJSValFromKeyPathString(JSContext* aCx,
|
|
const JS::Value& aValue,
|
|
const nsAString& aKeyPathString,
|
|
JS::Value* aKeyJSVal,
|
|
KeyExtractionOptions aOptions,
|
|
KeyPath::ExtractOrCreateKeyCallback aCallback,
|
|
void* aClosure)
|
|
{
|
|
NS_ASSERTION(aCx, "Null pointer!");
|
|
NS_ASSERTION(IsValidKeyPathString(aKeyPathString),
|
|
"This will explode!");
|
|
NS_ASSERTION(!(aCallback || aClosure) || aOptions == CreateProperties,
|
|
"This is not allowed!");
|
|
NS_ASSERTION(aOptions != CreateProperties || aCallback,
|
|
"If properties are created, there must be a callback!");
|
|
|
|
nsresult rv = NS_OK;
|
|
*aKeyJSVal = aValue;
|
|
|
|
KeyPathTokenizer tokenizer(aKeyPathString, '.');
|
|
|
|
nsString targetObjectPropName;
|
|
JS::Rooted<JSObject*> targetObject(aCx, nullptr);
|
|
JS::Rooted<JSObject*> obj(aCx,
|
|
aValue.isPrimitive() ? nullptr : aValue.toObjectOrNull());
|
|
|
|
while (tokenizer.hasMoreTokens()) {
|
|
const nsDependentSubstring& token = tokenizer.nextToken();
|
|
|
|
NS_ASSERTION(!token.IsEmpty(), "Should be a valid keypath");
|
|
|
|
const char16_t* keyPathChars = token.BeginReading();
|
|
const size_t keyPathLen = token.Length();
|
|
|
|
bool hasProp;
|
|
if (!targetObject) {
|
|
// We're still walking the chain of existing objects
|
|
if (!obj) {
|
|
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
|
|
bool ok = JS_HasUCProperty(aCx, obj, keyPathChars, keyPathLen,
|
|
&hasProp);
|
|
IDB_ENSURE_TRUE(ok, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
|
|
|
|
if (hasProp) {
|
|
// Get if the property exists...
|
|
JS::Rooted<JS::Value> intermediate(aCx);
|
|
bool ok = JS_GetUCProperty(aCx, obj, keyPathChars, keyPathLen, &intermediate);
|
|
IDB_ENSURE_TRUE(ok, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
|
|
|
|
// Treat explicitly undefined as an error.
|
|
if (intermediate.isUndefined()) {
|
|
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
if (tokenizer.hasMoreTokens()) {
|
|
// ...and walk to it if there are more steps...
|
|
if (intermediate.isPrimitive()) {
|
|
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
obj = intermediate.toObjectOrNull();
|
|
}
|
|
else {
|
|
// ...otherwise use it as key
|
|
*aKeyJSVal = intermediate;
|
|
}
|
|
}
|
|
else {
|
|
// If the property doesn't exist, fall into below path of starting
|
|
// to define properties, if allowed.
|
|
if (aOptions == DoNotCreateProperties) {
|
|
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
|
|
targetObject = obj;
|
|
targetObjectPropName = token;
|
|
}
|
|
}
|
|
|
|
if (targetObject) {
|
|
// We have started inserting new objects or are about to just insert
|
|
// the first one.
|
|
|
|
aKeyJSVal->setUndefined();
|
|
|
|
if (tokenizer.hasMoreTokens()) {
|
|
// If we're not at the end, we need to add a dummy object to the
|
|
// chain.
|
|
JS::Rooted<JSObject*> dummy(aCx, JS_NewPlainObject(aCx));
|
|
if (!dummy) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
rv = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
break;
|
|
}
|
|
|
|
if (!JS_DefineUCProperty(aCx, obj, token.BeginReading(),
|
|
token.Length(), dummy, JSPROP_ENUMERATE)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
rv = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
break;
|
|
}
|
|
|
|
obj = dummy;
|
|
}
|
|
else {
|
|
JS::Rooted<JSObject*> dummy(aCx,
|
|
JS_NewObject(aCx, IDBObjectStore::DummyPropClass()));
|
|
if (!dummy) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
rv = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
break;
|
|
}
|
|
|
|
if (!JS_DefineUCProperty(aCx, obj, token.BeginReading(),
|
|
token.Length(), dummy, JSPROP_ENUMERATE)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
rv = NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
break;
|
|
}
|
|
|
|
obj = dummy;
|
|
}
|
|
}
|
|
}
|
|
|
|
// We guard on rv being a success because we need to run the property
|
|
// deletion code below even if we should not be running the callback.
|
|
if (NS_SUCCEEDED(rv) && aCallback) {
|
|
rv = (*aCallback)(aCx, aClosure);
|
|
}
|
|
|
|
if (targetObject) {
|
|
// If this fails, we lose, and the web page sees a magical property
|
|
// appear on the object :-(
|
|
JS::ObjectOpResult succeeded;
|
|
if (!JS_DeleteUCProperty(aCx, targetObject,
|
|
targetObjectPropName.get(),
|
|
targetObjectPropName.Length(),
|
|
succeeded)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
IDB_ENSURE_TRUE(succeeded, NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR);
|
|
}
|
|
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
return rv;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// static
|
|
nsresult
|
|
KeyPath::Parse(const nsAString& aString, KeyPath* aKeyPath)
|
|
{
|
|
KeyPath keyPath(0);
|
|
keyPath.SetType(STRING);
|
|
|
|
if (!keyPath.AppendStringWithValidation(aString)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
*aKeyPath = keyPath;
|
|
return NS_OK;
|
|
}
|
|
|
|
//static
|
|
nsresult
|
|
KeyPath::Parse(const Sequence<nsString>& aStrings, KeyPath* aKeyPath)
|
|
{
|
|
KeyPath keyPath(0);
|
|
keyPath.SetType(ARRAY);
|
|
|
|
for (uint32_t i = 0; i < aStrings.Length(); ++i) {
|
|
if (!keyPath.AppendStringWithValidation(aStrings[i])) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
*aKeyPath = keyPath;
|
|
return NS_OK;
|
|
}
|
|
|
|
// static
|
|
nsresult
|
|
KeyPath::Parse(const Nullable<OwningStringOrStringSequence>& aValue, KeyPath* aKeyPath)
|
|
{
|
|
KeyPath keyPath(0);
|
|
|
|
aKeyPath->SetType(NONEXISTENT);
|
|
|
|
if (aValue.IsNull()) {
|
|
*aKeyPath = keyPath;
|
|
return NS_OK;
|
|
}
|
|
|
|
if (aValue.Value().IsString()) {
|
|
return Parse(aValue.Value().GetAsString(), aKeyPath);
|
|
}
|
|
|
|
MOZ_ASSERT(aValue.Value().IsStringSequence());
|
|
|
|
const Sequence<nsString>& seq = aValue.Value().GetAsStringSequence();
|
|
if (seq.Length() == 0) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return Parse(seq, aKeyPath);
|
|
}
|
|
|
|
void
|
|
KeyPath::SetType(KeyPathType aType)
|
|
{
|
|
mType = aType;
|
|
mStrings.Clear();
|
|
}
|
|
|
|
bool
|
|
KeyPath::AppendStringWithValidation(const nsAString& aString)
|
|
{
|
|
if (!IsValidKeyPathString(aString)) {
|
|
return false;
|
|
}
|
|
|
|
if (IsString()) {
|
|
NS_ASSERTION(mStrings.Length() == 0, "Too many strings!");
|
|
mStrings.AppendElement(aString);
|
|
return true;
|
|
}
|
|
|
|
if (IsArray()) {
|
|
mStrings.AppendElement(aString);
|
|
return true;
|
|
}
|
|
|
|
NS_NOTREACHED("What?!");
|
|
return false;
|
|
}
|
|
|
|
nsresult
|
|
KeyPath::ExtractKey(JSContext* aCx, const JS::Value& aValue, Key& aKey) const
|
|
{
|
|
uint32_t len = mStrings.Length();
|
|
JS::Rooted<JS::Value> value(aCx);
|
|
|
|
aKey.Unset();
|
|
|
|
for (uint32_t i = 0; i < len; ++i) {
|
|
nsresult rv = GetJSValFromKeyPathString(aCx, aValue, mStrings[i],
|
|
value.address(),
|
|
DoNotCreateProperties, nullptr,
|
|
nullptr);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
if (NS_FAILED(aKey.AppendItem(aCx, IsArray() && i == 0, value))) {
|
|
NS_ASSERTION(aKey.IsUnset(), "Encoding error should unset");
|
|
return NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
}
|
|
|
|
aKey.FinishArray();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
KeyPath::ExtractKeyAsJSVal(JSContext* aCx, const JS::Value& aValue,
|
|
JS::Value* aOutVal) const
|
|
{
|
|
NS_ASSERTION(IsValid(), "This doesn't make sense!");
|
|
|
|
if (IsString()) {
|
|
return GetJSValFromKeyPathString(aCx, aValue, mStrings[0], aOutVal,
|
|
DoNotCreateProperties, nullptr, nullptr);
|
|
}
|
|
|
|
const uint32_t len = mStrings.Length();
|
|
JS::Rooted<JSObject*> arrayObj(aCx, JS_NewArrayObject(aCx, len));
|
|
if (!arrayObj) {
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
JS::Rooted<JS::Value> value(aCx);
|
|
for (uint32_t i = 0; i < len; ++i) {
|
|
nsresult rv = GetJSValFromKeyPathString(aCx, aValue, mStrings[i],
|
|
value.address(),
|
|
DoNotCreateProperties, nullptr,
|
|
nullptr);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
if (!JS_DefineElement(aCx, arrayObj, i, value, JSPROP_ENUMERATE)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
}
|
|
|
|
aOutVal->setObject(*arrayObj);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
KeyPath::ExtractOrCreateKey(JSContext* aCx, const JS::Value& aValue,
|
|
Key& aKey, ExtractOrCreateKeyCallback aCallback,
|
|
void* aClosure) const
|
|
{
|
|
NS_ASSERTION(IsString(), "This doesn't make sense!");
|
|
|
|
JS::Rooted<JS::Value> value(aCx);
|
|
|
|
aKey.Unset();
|
|
|
|
nsresult rv = GetJSValFromKeyPathString(aCx, aValue, mStrings[0],
|
|
value.address(),
|
|
CreateProperties, aCallback,
|
|
aClosure);
|
|
if (NS_FAILED(rv)) {
|
|
return rv;
|
|
}
|
|
|
|
if (NS_FAILED(aKey.AppendItem(aCx, false, value))) {
|
|
NS_ASSERTION(aKey.IsUnset(), "Should be unset");
|
|
return value.isUndefined() ? NS_OK : NS_ERROR_DOM_INDEXEDDB_DATA_ERR;
|
|
}
|
|
|
|
aKey.FinishArray();
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
KeyPath::SerializeToString(nsAString& aString) const
|
|
{
|
|
NS_ASSERTION(IsValid(), "Check to see if I'm valid first!");
|
|
|
|
if (IsString()) {
|
|
aString = mStrings[0];
|
|
return;
|
|
}
|
|
|
|
if (IsArray()) {
|
|
// We use a comma in the beginning to indicate that it's an array of
|
|
// key paths. This is to be able to tell a string-keypath from an
|
|
// array-keypath which contains only one item.
|
|
// It also makes serializing easier :-)
|
|
uint32_t len = mStrings.Length();
|
|
for (uint32_t i = 0; i < len; ++i) {
|
|
aString.Append(',');
|
|
aString.Append(mStrings[i]);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
NS_NOTREACHED("What?");
|
|
}
|
|
|
|
// static
|
|
KeyPath
|
|
KeyPath::DeserializeFromString(const nsAString& aString)
|
|
{
|
|
KeyPath keyPath(0);
|
|
|
|
if (!aString.IsEmpty() && aString.First() == ',') {
|
|
keyPath.SetType(ARRAY);
|
|
|
|
// We use a comma in the beginning to indicate that it's an array of
|
|
// key paths. This is to be able to tell a string-keypath from an
|
|
// array-keypath which contains only one item.
|
|
nsCharSeparatedTokenizerTemplate<IgnoreWhitespace> tokenizer(aString, ',');
|
|
tokenizer.nextToken();
|
|
while (tokenizer.hasMoreTokens()) {
|
|
keyPath.mStrings.AppendElement(tokenizer.nextToken());
|
|
}
|
|
|
|
return keyPath;
|
|
}
|
|
|
|
keyPath.SetType(STRING);
|
|
keyPath.mStrings.AppendElement(aString);
|
|
|
|
return keyPath;
|
|
}
|
|
|
|
nsresult
|
|
KeyPath::ToJSVal(JSContext* aCx, JS::MutableHandle<JS::Value> aValue) const
|
|
{
|
|
if (IsArray()) {
|
|
uint32_t len = mStrings.Length();
|
|
JS::Rooted<JSObject*> array(aCx, JS_NewArrayObject(aCx, len));
|
|
if (!array) {
|
|
IDB_WARNING("Failed to make array!");
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
|
|
for (uint32_t i = 0; i < len; ++i) {
|
|
JS::Rooted<JS::Value> val(aCx);
|
|
nsString tmp(mStrings[i]);
|
|
if (!xpc::StringToJsval(aCx, tmp, &val)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
|
|
if (!JS_DefineElement(aCx, array, i, val, JSPROP_ENUMERATE)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
}
|
|
|
|
aValue.setObject(*array);
|
|
return NS_OK;
|
|
}
|
|
|
|
if (IsString()) {
|
|
nsString tmp(mStrings[0]);
|
|
if (!xpc::StringToJsval(aCx, tmp, aValue)) {
|
|
IDB_REPORT_INTERNAL_ERR();
|
|
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
aValue.setNull();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
KeyPath::ToJSVal(JSContext* aCx, JS::Heap<JS::Value>& aValue) const
|
|
{
|
|
JS::Rooted<JS::Value> value(aCx);
|
|
nsresult rv = ToJSVal(aCx, &value);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
aValue = value;
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
bool
|
|
KeyPath::IsAllowedForObjectStore(bool aAutoIncrement) const
|
|
{
|
|
// Any keypath that passed validation is allowed for non-autoIncrement
|
|
// objectStores.
|
|
if (!aAutoIncrement) {
|
|
return true;
|
|
}
|
|
|
|
// Array keypaths are not allowed for autoIncrement objectStores.
|
|
if (IsArray()) {
|
|
return false;
|
|
}
|
|
|
|
// Neither are empty strings.
|
|
if (IsEmpty()) {
|
|
return false;
|
|
}
|
|
|
|
// Everything else is ok.
|
|
return true;
|
|
}
|
|
|
|
} // namespace indexedDB
|
|
} // namespace dom
|
|
} // namespace mozilla
|