Merge mozilla-central to autoland. r=merge a=merge on a CLOSED TREE

This commit is contained in:
Cosmin Sabou 2017-12-28 11:49:12 +02:00
commit da48e83ed3
3 changed files with 25 additions and 1 deletions

View File

@ -635,6 +635,9 @@ NotificationController::WillRefresh(mozilla::TimeStamp aTime)
// e.g. tab event and content event.
if (WaitingForParent()) {
mDocument->ParentDocument()->mNotificationController->WillRefresh(aTime);
if (!mDocument) {
return;
}
}
// Any generic notifications should be queued if we're processing content

View File

@ -14,6 +14,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/dom/ipc/StructuredCloneData.h"
#include "mozilla/EnumSet.h"
#include "mozilla/Maybe.h"
#include "mozilla/net/WebSocketFrame.h"
#include "mozilla/TimeStamp.h"
@ -918,6 +919,27 @@ struct ParamTraits<mozilla::Maybe<T>>
}
};
template<typename T>
struct ParamTraits<mozilla::EnumSet<T>>
{
typedef mozilla::EnumSet<T> paramType;
static void Write(Message* msg, const paramType& param)
{
WriteParam(msg, param.serialize());
}
static bool Read(const Message* msg, PickleIterator* iter, paramType* result)
{
decltype(result->serialize()) tmp;
if (ReadParam(msg, iter, &tmp)) {
result->deserialize(tmp);
return true;
}
return false;
}
};
template<class... Ts>
struct ParamTraits<mozilla::Variant<Ts...>>
{

View File

@ -547,7 +547,6 @@ def main(args):
prepare_checkout_dir(args.vcs_checkout)
prepare_checkout_dir(args.tools_checkout)
prepare_checkout_dir(args.comm_checkout)
if args.vcs_checkout or args.tools_checkout or args.comm_checkout:
prepare_hg_store_path()