forked from mirrors/gecko-dev
		
	nsIXPCScriptable flags handling in xpc_map_end.h is a bit of a mess. - Half the flags relate to whether various functions are defined (PreCreate, GetProperty, etc). These are set using the XPC_MAP_WANT_* macros; for each one xpc_map_end.h inserts the corresponding flag using the preprocessor (see XPC_MAP_CLASSNAME::GetScriptableFlags()). - The other half of the flags relate to other things (IS_GLOBAL_OBJECT, DONT_REFLECT_INTERFACE_NAMES, etc). These are set using the XPC_MAP_FLAGS macro. Having two similar but different mechanisms to set the flags for a class is confusing. (Indeed, until recently we had some classes where a single flag was redundantly specified via both mechanisms.) Note also that the classes done in dom/base/nsIDOMClassInfo.h also specify all the flags in a single value, similar to how XPC_MAP_FLAGS works. This patch removes the XPC_MAP_WANT_* macros. All flags are now set via XPC_MAP_FLAGS. This is a significant simplification to xpc_map_end.h and all the places that use it. The downside of this change is that I had to change the flag constants from class constants (i.e. nsIXPCScriptable::FOO) to macros (i.e. NSIXPCSCRIPTABLE_FOO) because they need to be used in #if statements like this in xpc_map_end.h: #if !((XPC_MAP_FLAGS) & NSIXPCSCRIPTABLE_WANT_PRECREATE) and you can't use a '::'-qualified name inside a #if. I think this downside is outweighed by the simplification described above. Overall the patch removes 80 lines of code. --HG-- extra : rebase_source : 6d5c341d0deba8f1529d81c17bb8819e09620b05
		
			
				
	
	
		
			157 lines
		
	
	
	
		
			4.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			157 lines
		
	
	
	
		
			4.7 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 | 
						|
 * vim: sw=2 ts=2 et lcs=trail\:.,tab\:>~ :
 | 
						|
 * 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 "nsMemory.h"
 | 
						|
#include "nsString.h"
 | 
						|
 | 
						|
#include "mozStorageStatementRow.h"
 | 
						|
#include "mozStorageStatement.h"
 | 
						|
 | 
						|
#include "jsapi.h"
 | 
						|
 | 
						|
#include "xpc_make_class.h"
 | 
						|
 | 
						|
namespace mozilla {
 | 
						|
namespace storage {
 | 
						|
 | 
						|
////////////////////////////////////////////////////////////////////////////////
 | 
						|
//// StatementRow
 | 
						|
 | 
						|
StatementRow::StatementRow(Statement *aStatement)
 | 
						|
: mStatement(aStatement)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
NS_IMPL_ISUPPORTS(
 | 
						|
  StatementRow,
 | 
						|
  mozIStorageStatementRow,
 | 
						|
  nsIXPCScriptable
 | 
						|
)
 | 
						|
 | 
						|
////////////////////////////////////////////////////////////////////////////////
 | 
						|
//// nsIXPCScriptable
 | 
						|
 | 
						|
#define XPC_MAP_CLASSNAME         StatementRow
 | 
						|
#define XPC_MAP_QUOTED_CLASSNAME "StatementRow"
 | 
						|
#define XPC_MAP_FLAGS (XPC_SCRIPTABLE_WANT_GETPROPERTY | \
 | 
						|
                       XPC_SCRIPTABLE_WANT_RESOLVE | \
 | 
						|
                       XPC_SCRIPTABLE_ALLOW_PROP_MODS_DURING_RESOLVE)
 | 
						|
#include "xpc_map_end.h"
 | 
						|
 | 
						|
NS_IMETHODIMP
 | 
						|
StatementRow::GetProperty(nsIXPConnectWrappedNative *aWrapper,
 | 
						|
                          JSContext *aCtx,
 | 
						|
                          JSObject *aScopeObj,
 | 
						|
                          jsid aId,
 | 
						|
                          JS::Value *_vp,
 | 
						|
                          bool *_retval)
 | 
						|
{
 | 
						|
  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
 | 
						|
 | 
						|
  JS::RootedObject scope(aCtx, aScopeObj);
 | 
						|
  if (JSID_IS_STRING(aId)) {
 | 
						|
    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
 | 
						|
    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
 | 
						|
    nsDependentCString jsid(idBytes.ptr());
 | 
						|
 | 
						|
    uint32_t idx;
 | 
						|
    nsresult rv = mStatement->GetColumnIndex(jsid, &idx);
 | 
						|
    NS_ENSURE_SUCCESS(rv, rv);
 | 
						|
    int32_t type;
 | 
						|
    rv = mStatement->GetTypeOfIndex(idx, &type);
 | 
						|
    NS_ENSURE_SUCCESS(rv, rv);
 | 
						|
 | 
						|
    if (type == mozIStorageValueArray::VALUE_TYPE_INTEGER ||
 | 
						|
        type == mozIStorageValueArray::VALUE_TYPE_FLOAT) {
 | 
						|
      double dval;
 | 
						|
      rv = mStatement->GetDouble(idx, &dval);
 | 
						|
      NS_ENSURE_SUCCESS(rv, rv);
 | 
						|
      *_vp = ::JS_NumberValue(dval);
 | 
						|
    }
 | 
						|
    else if (type == mozIStorageValueArray::VALUE_TYPE_TEXT) {
 | 
						|
      uint32_t bytes;
 | 
						|
      const char16_t *sval = reinterpret_cast<const char16_t *>(
 | 
						|
        static_cast<mozIStorageStatement *>(mStatement)->
 | 
						|
          AsSharedWString(idx, &bytes)
 | 
						|
      );
 | 
						|
      JSString *str = ::JS_NewUCStringCopyN(aCtx, sval, bytes / 2);
 | 
						|
      if (!str) {
 | 
						|
        *_retval = false;
 | 
						|
        return NS_OK;
 | 
						|
      }
 | 
						|
      _vp->setString(str);
 | 
						|
    }
 | 
						|
    else if (type == mozIStorageValueArray::VALUE_TYPE_BLOB) {
 | 
						|
      uint32_t length;
 | 
						|
      const uint8_t *blob = static_cast<mozIStorageStatement *>(mStatement)->
 | 
						|
        AsSharedBlob(idx, &length);
 | 
						|
      JSObject *obj = ::JS_NewArrayObject(aCtx, length);
 | 
						|
      if (!obj) {
 | 
						|
        *_retval = false;
 | 
						|
        return NS_OK;
 | 
						|
      }
 | 
						|
      _vp->setObject(*obj);
 | 
						|
 | 
						|
      // Copy the blob over to the JS array.
 | 
						|
      for (uint32_t i = 0; i < length; i++) {
 | 
						|
        if (!::JS_DefineElement(aCtx, scope, i, blob[i], JSPROP_ENUMERATE)) {
 | 
						|
          *_retval = false;
 | 
						|
          return NS_OK;
 | 
						|
        }
 | 
						|
      }
 | 
						|
    }
 | 
						|
    else if (type == mozIStorageValueArray::VALUE_TYPE_NULL) {
 | 
						|
      _vp->setNull();
 | 
						|
    }
 | 
						|
    else {
 | 
						|
      NS_ERROR("unknown column type returned, what's going on?");
 | 
						|
    }
 | 
						|
  }
 | 
						|
 | 
						|
  return NS_OK;
 | 
						|
}
 | 
						|
 | 
						|
NS_IMETHODIMP
 | 
						|
StatementRow::Resolve(nsIXPConnectWrappedNative *aWrapper,
 | 
						|
                      JSContext *aCtx,
 | 
						|
                      JSObject *aScopeObj,
 | 
						|
                      jsid aId,
 | 
						|
                      bool *aResolvedp,
 | 
						|
                      bool *_retval)
 | 
						|
{
 | 
						|
  JS::Rooted<JSObject*> scopeObj(aCtx, aScopeObj);
 | 
						|
 | 
						|
  NS_ENSURE_TRUE(mStatement, NS_ERROR_NOT_INITIALIZED);
 | 
						|
  // We do not throw at any point after this because we want to allow the
 | 
						|
  // prototype chain to be checked for the property.
 | 
						|
 | 
						|
  if (JSID_IS_STRING(aId)) {
 | 
						|
    ::JSAutoByteString idBytes(aCtx, JSID_TO_STRING(aId));
 | 
						|
    NS_ENSURE_TRUE(!!idBytes, NS_ERROR_OUT_OF_MEMORY);
 | 
						|
    nsDependentCString name(idBytes.ptr());
 | 
						|
 | 
						|
    uint32_t idx;
 | 
						|
    nsresult rv = mStatement->GetColumnIndex(name, &idx);
 | 
						|
    if (NS_FAILED(rv)) {
 | 
						|
      // It's highly likely that the name doesn't exist, so let the JS engine
 | 
						|
      // check the prototype chain and throw if that doesn't have the property
 | 
						|
      // either.
 | 
						|
      *aResolvedp = false;
 | 
						|
      return NS_OK;
 | 
						|
    }
 | 
						|
 | 
						|
    JS::Rooted<jsid> id(aCtx, aId);
 | 
						|
    *_retval = ::JS_DefinePropertyById(aCtx, scopeObj, id, JS::UndefinedHandleValue,
 | 
						|
                                       JSPROP_RESOLVING);
 | 
						|
    *aResolvedp = true;
 | 
						|
    return NS_OK;
 | 
						|
  }
 | 
						|
 | 
						|
  return NS_OK;
 | 
						|
}
 | 
						|
 | 
						|
} // namespace storage
 | 
						|
} // namespace mozilla
 |