mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Merge mozilla-central to autoland. r=merge a=merge on a CLOSED TREE
This commit is contained in:
commit
da48e83ed3
@ -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
|
||||
|
@ -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...>>
|
||||
{
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user