forked from mirrors/gecko-dev
1a1f42da37
This changeset is the result of adding modernize-use-default-member-init to tools/clang-tidy/config.yaml then proceeding to run `./mach static-analysis check netwerk/ --fix` I then went through the resulting fix and manually updated all of the member variables which were missed due to them having a non-trivial constructor. Note that the tool was only run on Linux, so code that only runs on some platforms may have been missed. The member variables that are still initialized in the contructor definition are: - bitfields (not all currently supported compilers allow default-member-init - variables that are initialized via a parameter - variables that use code not visible in the header file There are a few advantages to landing this change: - fewer lines of code - now declaration is in the same place as initialization this also makes it easier to see when looking at the header. - it makes it harder to miss initializing a member when adding a new contructor - variables that depend on an include guard look much nicer now Additionally I removed some unnecessary reinitialization of NetAddr members (it has a constructor that does that now), and changed nsWifiScannerDBus to use the thread-safe strtok_r instead of strtok. Differential Revision: https://phabricator.services.mozilla.com/D116980
100 lines
2.5 KiB
C++
100 lines
2.5 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/. */
|
|
|
|
#ifndef mozilla_net_WebSocketFrame_h
|
|
#define mozilla_net_WebSocketFrame_h
|
|
|
|
#include <cstdint>
|
|
#include "nsISupports.h"
|
|
#include "nsIWebSocketEventService.h"
|
|
#include "nsString.h"
|
|
|
|
class PickleIterator;
|
|
|
|
// Avoid including nsDOMNavigationTiming.h here, where the canonical definition
|
|
// of DOMHighResTimeStamp resides.
|
|
using DOMHighResTimeStamp = double;
|
|
|
|
namespace IPC {
|
|
class Message;
|
|
template <class P>
|
|
struct ParamTraits;
|
|
} // namespace IPC
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
class WebSocketFrameData final {
|
|
public:
|
|
WebSocketFrameData();
|
|
|
|
explicit WebSocketFrameData(const WebSocketFrameData& aData);
|
|
|
|
WebSocketFrameData(DOMHighResTimeStamp aTimeStamp, bool aFinBit,
|
|
bool aRsvBit1, bool aRsvBit2, bool aRsvBit3,
|
|
uint8_t aOpCode, bool aMaskBit, uint32_t aMask,
|
|
const nsCString& aPayload);
|
|
|
|
~WebSocketFrameData();
|
|
|
|
// For IPC serialization
|
|
void WriteIPCParams(IPC::Message* aMessage) const;
|
|
bool ReadIPCParams(const IPC::Message* aMessage, PickleIterator* aIter);
|
|
|
|
DOMHighResTimeStamp mTimeStamp{0};
|
|
|
|
bool mFinBit : 1;
|
|
bool mRsvBit1 : 1;
|
|
bool mRsvBit2 : 1;
|
|
bool mRsvBit3 : 1;
|
|
bool mMaskBit : 1;
|
|
uint8_t mOpCode{0};
|
|
|
|
uint32_t mMask{0};
|
|
|
|
nsCString mPayload;
|
|
};
|
|
|
|
class WebSocketFrame final : public nsIWebSocketFrame {
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSIWEBSOCKETFRAME
|
|
|
|
explicit WebSocketFrame(const WebSocketFrameData& aData);
|
|
|
|
WebSocketFrame(bool aFinBit, bool aRsvBit1, bool aRsvBit2, bool aRsvBit3,
|
|
uint8_t aOpCode, bool aMaskBit, uint32_t aMask,
|
|
const nsCString& aPayload);
|
|
|
|
const WebSocketFrameData& Data() const { return mData; }
|
|
|
|
private:
|
|
~WebSocketFrame() = default;
|
|
|
|
WebSocketFrameData mData;
|
|
};
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
namespace IPC {
|
|
template <>
|
|
struct ParamTraits<mozilla::net::WebSocketFrameData> {
|
|
using paramType = mozilla::net::WebSocketFrameData;
|
|
|
|
static void Write(Message* aMsg, const paramType& aParam) {
|
|
aParam.WriteIPCParams(aMsg);
|
|
}
|
|
|
|
static bool Read(const Message* aMsg, PickleIterator* aIter,
|
|
paramType* aResult) {
|
|
return aResult->ReadIPCParams(aMsg, aIter);
|
|
}
|
|
};
|
|
|
|
} // namespace IPC
|
|
|
|
#endif // mozilla_net_WebSocketFrame_h
|