firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'explicit' to darwin embedder constructors (flutter/engine#29827)

Browse Source
This commit is contained in:
Jenn Magder
2021-11-19 10:54:29 -08:00
committed by GitHub
parent edb87942de
commit c08aa6c73d
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/fml/platform/darwin/cf_utils.h
View File

@@ -16,6 +16,7 @@ class CFRef {
public:
CFRef() : instance_(nullptr) {}
// NOLINTNEXTLINE(google-explicit-constructor)
CFRef(T instance) : instance_(instance) {}
CFRef(const CFRef& other) : instance_(other.instance_) {
@@ -54,9 +55,10 @@ class CFRef {
return instance;
}
// NOLINTNEXTLINE(google-explicit-constructor)
operator T() const { return instance_; }
operator bool() const { return instance_ != nullptr; }
explicit operator bool() const { return instance_ != nullptr; }
private:
T instance_;

1
engine/src/flutter/fml/platform/darwin/scoped_block.h
View File

@@ -67,6 +67,7 @@ class ScopedBlock {
bool operator!=(B that) const { return block_ != that; }
// NOLINTNEXTLINE(google-explicit-constructor)
operator B() const { return block_; }
B get() const { return block_; }

5
engine/src/flutter/fml/platform/darwin/scoped_nsobject.h
View File

@@ -45,6 +45,7 @@ class scoped_nsprotocol {
scoped_nsprotocol(const scoped_nsprotocol<NST>& that) : object_([that.object_ retain]) {}
template <typename NSU>
// NOLINTNEXTLINE(google-explicit-constructor)
scoped_nsprotocol(const scoped_nsprotocol<NSU>& that) : object_([that.get() retain]) {}
~scoped_nsprotocol() { [object_ release]; }
@@ -66,7 +67,7 @@ class scoped_nsprotocol {
bool operator==(NST that) const { return object_ == that; }
bool operator!=(NST that) const { return object_ != that; }
operator NST() const { return object_; }
operator NST() const { return object_; } // NOLINT(google-explicit-constructor)
NST get() const { return object_; }
@@ -116,6 +117,7 @@ class scoped_nsobject : public scoped_nsprotocol<NST*> {
scoped_nsobject(const scoped_nsobject<NST>& that) : scoped_nsprotocol<NST*>(that) {}
template <typename NSU>
// NOLINTNEXTLINE(google-explicit-constructor)
scoped_nsobject(const scoped_nsobject<NSU>& that) : scoped_nsprotocol<NST*>(that) {}
scoped_nsobject& operator=(const scoped_nsobject<NST>& that) {
@@ -133,6 +135,7 @@ class scoped_nsobject<id> : public scoped_nsprotocol<id> {
scoped_nsobject(const scoped_nsobject<id>& that) : scoped_nsprotocol<id>(that) {}
template <typename NSU>
// NOLINTNEXTLINE(google-explicit-constructor)
scoped_nsobject(const scoped_nsobject<NSU>& that) : scoped_nsprotocol<id>(that) {}
scoped_nsobject& operator=(const scoped_nsobject<id>& that) {

3
engine/src/flutter/shell/platform/common/accessibility_bridge.h
View File

@@ -106,7 +106,8 @@ class AccessibilityBridge
/// @param[in] user_data A custom pointer to the data of your
/// choice. This pointer can be retrieve later
/// through GetUserData().
AccessibilityBridge(std::unique_ptr<AccessibilityBridgeDelegate> delegate);
explicit AccessibilityBridge(
std::unique_ptr<AccessibilityBridgeDelegate> delegate);
~AccessibilityBridge();
//------------------------------------------------------------------------------

4
engine/src/flutter/shell/platform/common/text_editing_delta.h
View File

@@ -23,9 +23,9 @@ struct TextEditingDelta {
TextRange range,
const std::string& text);
TextEditingDelta(const std::u16string& text);
explicit TextEditingDelta(const std::u16string& text);
TextEditingDelta(const std::string& text);
explicit TextEditingDelta(const std::string& text);
virtual ~TextEditingDelta() = default;

2
engine/src/flutter/shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.h
View File

@@ -40,7 +40,7 @@ namespace flutter {
class VsyncWaiterIOS final : public VsyncWaiter {
public:
VsyncWaiterIOS(flutter::TaskRunners task_runners);
explicit VsyncWaiterIOS(flutter::TaskRunners task_runners);
~VsyncWaiterIOS() override;

2
engine/src/flutter/shell/platform/darwin/ios/ios_switchable_gl_context.h
View File

@@ -26,7 +26,7 @@ namespace flutter {
/// |GLContextSwitch| and should be destroyed when The |GLContectSwitch| destroys.
class IOSSwitchableGLContext final : public SwitchableGLContext {
public:
IOSSwitchableGLContext(EAGLContext* context);
explicit IOSSwitchableGLContext(EAGLContext* context);
bool SetCurrent() override;

2
engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
View File

@@ -19,7 +19,7 @@ namespace flutter {
// Platform views are not yet supported.
class FlutterCompositor {
public:
FlutterCompositor(FlutterViewController* view_controller);
explicit FlutterCompositor(FlutterViewController* view_controller);
virtual ~FlutterCompositor() = default;