Revision ef3e7753c6ee98e0c72c3cd915fda64ede27161b authored by Gaia Pushbot on 27 January 2014, 13:35:59 UTC, committed by Gaia Pushbot on 27 January 2014, 13:35:59 UTC
======== https://hg.mozilla.org/integration/gaia-1_3/rev/b013fab4b910 Author: Borja Salguero <borjasalguero@users.noreply.github.com> Desc: Merge pull request #14653 from fcampo/mms-forward-subject-941030 Bug 941030 - [Messages] Follow up Bug 919966 - Ensure that forwarding a MMS with a subject fills in the subject in the composer(cherry picked from commit 4df4a5b17839fc6ce748029fc1e79bb2bde3cc87) Conflicts: apps/sms/js/compose.js apps/sms/js/message_manager.js apps/sms/js/thread_ui.js apps/sms/test/unit/compose_test.js apps/sms/test/unit/mock_compose.js
1 parent d5545e0
mozStorageBindingParamsArray.cpp
/* -*- 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 "mozStorageBindingParamsArray.h"
#include "mozStorageBindingParams.h"
#include "StorageBaseStatementInternal.h"
namespace mozilla {
namespace storage {
////////////////////////////////////////////////////////////////////////////////
//// BindingParamsArray
BindingParamsArray::BindingParamsArray(
StorageBaseStatementInternal *aOwningStatement
)
: mOwningStatement(aOwningStatement)
, mLocked(false)
{
}
void
BindingParamsArray::lock()
{
NS_ASSERTION(mLocked == false, "Array has already been locked!");
mLocked = true;
// We also no longer need to hold a reference to our statement since it owns
// us.
mOwningStatement = nullptr;
}
const StorageBaseStatementInternal *
BindingParamsArray::getOwner() const
{
return mOwningStatement;
}
NS_IMPL_ISUPPORTS1(
BindingParamsArray,
mozIStorageBindingParamsArray
)
///////////////////////////////////////////////////////////////////////////////
//// mozIStorageBindingParamsArray
NS_IMETHODIMP
BindingParamsArray::NewBindingParams(mozIStorageBindingParams **_params)
{
NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
nsCOMPtr<mozIStorageBindingParams> params(
mOwningStatement->newBindingParams(this));
NS_ENSURE_TRUE(params, NS_ERROR_UNEXPECTED);
params.forget(_params);
return NS_OK;
}
NS_IMETHODIMP
BindingParamsArray::AddParams(mozIStorageBindingParams *aParameters)
{
NS_ENSURE_FALSE(mLocked, NS_ERROR_UNEXPECTED);
BindingParams *params = static_cast<BindingParams *>(aParameters);
// Check to make sure that this set of parameters was created with us.
if (params->getOwner() != this)
return NS_ERROR_UNEXPECTED;
NS_ENSURE_TRUE(mArray.AppendElement(params), NS_ERROR_OUT_OF_MEMORY);
// Lock the parameters only after we've successfully added them.
params->lock();
return NS_OK;
}
NS_IMETHODIMP
BindingParamsArray::GetLength(uint32_t *_length)
{
*_length = length();
return NS_OK;
}
} // namespace storage
} // namespace mozilla
Computing file changes ...