Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class TextureRegistrar {
// Unregisters an existing texture object.
// DEPRECATED: Use UnregisterTexture(texture_id, optional_callback) instead.
virtual bool UnregisterTexture(int64_t texture_id) = 0;
};
} SWIFT_UNSAFE_REFERENCE;

} // namespace flutter

Expand Down
9 changes: 9 additions & 0 deletions src/flutter/shell/platform/common/public/flutter_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,13 @@

#endif // FLUTTER_DESKTOP_LIBRARY

#if __has_include(<swift/bridging>)
#include <swift/bridging>
#else
#define SWIFT_UNSAFE_REFERENCE
#define SWIFT_SHARED_REFERENCE(_retain, _release)
#define SWIFT_RETURNS_RETAINED
#define SWIFT_RETURNS_UNRETAINED
#endif

#endif // FLUTTER_SHELL_PLATFORM_COMMON_PUBLIC_FLUTTER_EXPORT_H_
8 changes: 4 additions & 4 deletions src/flutter/shell/platform/common/public/flutter_messenger.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ FLUTTER_EXPORT void FlutterDesktopMessengerSetCallback(
// Operation is thread-safe.
//
// See also: |FlutterDesktopMessengerRelease|
FLUTTER_EXPORT FlutterDesktopMessengerRef
FlutterDesktopMessengerAddRef(FlutterDesktopMessengerRef messenger);
FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopMessengerAddRef(
FlutterDesktopMessengerRef messenger) SWIFT_RETURNS_RETAINED;

// Decrements the reference count for the |messenger|.
//
Expand Down Expand Up @@ -124,8 +124,8 @@ FLUTTER_EXPORT bool FlutterDesktopMessengerIsAvailable(
// Returns the |messenger| value.
//
// See also: |FlutterDesktopMessengerUnlock|
FLUTTER_EXPORT FlutterDesktopMessengerRef
FlutterDesktopMessengerLock(FlutterDesktopMessengerRef messenger);
FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopMessengerLock(
FlutterDesktopMessengerRef messenger) SWIFT_RETURNS_UNRETAINED;

// Unlocks the `FlutterDesktopMessengerRef`.
//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef void (*FlutterDesktopOnPluginRegistrarDestroyed)(
// Returns the engine messenger associated with this registrar.
FLUTTER_EXPORT FlutterDesktopMessengerRef
FlutterDesktopPluginRegistrarGetMessenger(
FlutterDesktopPluginRegistrarRef registrar);
FlutterDesktopPluginRegistrarRef registrar) SWIFT_RETURNS_UNRETAINED;

// Returns the texture registrar associated with this registrar.
FLUTTER_EXPORT FlutterDesktopTextureRegistrarRef
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ class FlutterELinuxEngine {
// Sets switches member to the given switches.
void SetSwitches(const std::vector<std::string>& switches);

FlutterDesktopMessengerRef messenger() { return messenger_.get(); }
FlutterDesktopMessengerRef messenger() SWIFT_RETURNS_UNRETAINED {
return messenger_.get();
}

IncomingMessageDispatcher* message_dispatcher() {
return message_dispatcher_.get();
Expand Down Expand Up @@ -195,7 +197,7 @@ class FlutterELinuxEngine {
std::unique_ptr<VsyncWaiter> vsync_waiter_;

bool enable_impeller_ = false;
};
} SWIFT_UNSAFE_REFERENCE;

} // namespace flutter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@
#include <memory>
#include <mutex>

#if __has_include(<swift/bridging>)
#include <swift/bridging>
#else
#define SWIFT_SHARED_REFERENCE(_retain, _release)
#endif

#include "flutter/shell/platform/common/client_wrapper/include/flutter/plugin_registrar.h"
#include "flutter/shell/platform/common/incoming_message_dispatcher.h"
#include "flutter/shell/platform/embedder/embedder.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class FlutterELinuxTextureRegistrar {
std::mutex map_mutex_;

int64_t EmplaceTexture(std::unique_ptr<ExternalTexture> texture);
};
} SWIFT_UNSAFE_REFERENCE;

}; // namespace flutter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class FlutterELinuxView : public WindowBindingHandlerDelegate {
// Current view rotation (FlutterTransformation).
FlutterTransformation view_rotation_transformation_ = {
1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0};
};
} SWIFT_UNSAFE_REFERENCE;

} // namespace flutter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView(
FlutterDesktopPluginRegistrarRef registrar);

// Returns the messenger associated with the engine.
FLUTTER_EXPORT FlutterDesktopMessengerRef
FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine);
FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(
FlutterDesktopEngineRef engine) SWIFT_RETURNS_UNRETAINED;

// Returns the texture registrar associated with the engine.
FLUTTER_EXPORT FlutterDesktopTextureRegistrarRef
Expand Down