Move helper functions to core_implementations.cc

Author: bleroux

shell/platform/common/client_wrapper/core_implementations.cc

@@ -19,6 +19,8 @@
 
 #include "binary_messenger_impl.h"
 #include "include/flutter/engine_method_result.h"
+#include "include/flutter/method_channel.h"
+#include "include/flutter/standard_method_codec.h"
 #include "texture_registrar_impl.h"
 
 namespace flutter {
@@ -164,6 +166,46 @@ void ReplyManager::SendResponseData(const std::vector<uint8_t>* data) {
 
 }  // namespace internal
 
+// ========== method_channel.h ==========
+
+namespace {
+
+constexpr char kControlChannelName[] = "dev.flutter/channel-buffers";
+constexpr char kResizeMethod[] = "resize";
+constexpr char kOverflowMethod[] = "overflow";
+
+}  // namespace
+
+namespace internal {
+
+void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size) {
+  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
+      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
+
+  // The deserialization logic handles only 32 bits values, see
+  // https://github.com/flutter/engine/blob/93e8901490e78c7ba7e319cce4470d9c6478c6dc/lib/ui/channel_buffers.dart#L495.
+  control_channel->InvokeMethod(
+      kResizeMethod, std::make_unique<EncodableValue>(EncodableList{
+                         EncodableValue(name),
+                         EncodableValue(static_cast<int32_t>(new_size)),
+                     }));
+}
+
+void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
+                               std::string name,
+                               bool warns) {
+  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
+      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
+
+  control_channel->InvokeMethod(kOverflowMethod,
+                                std::make_unique<EncodableValue>(EncodableList{
+                                    EncodableValue(name),
+                                    EncodableValue(!warns),
+                                }));
+}
+
+}  // namespace internal
+
 // ========== texture_registrar_impl.h ==========
 
 TextureRegistrarImpl::TextureRegistrarImpl(

shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h

@@ -11,10 +11,29 @@
 
 #include "binary_messenger.h"
 #include "message_codec.h"
-#include "method_channel.h"
 
 namespace flutter {
 
+namespace internal {
+// Internal helper functions used by BasicMessageChannel and MethodChannel.
+
+// Adjusts the number of messages that will get buffered when sending messages
+// to channels that aren't fully set up yet. For example, the engine isn't
+// running yet or the channel's message handler isn't set up on the Dart side
+// yet.
+void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size);
+
+// Defines whether the channel should show warning messages when discarding
+// messages due to overflow.
+//
+// When |warns| is false, the channel is expected to overflow and warning
+// messages will not be shown.
+void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
+                               std::string name,
+                               bool warns);
+
+}  // namespace internal
+
 class EncodableValue;
 
 // A message reply callback.
@@ -106,15 +125,17 @@ class BasicMessageChannel {
   // to channels that aren't fully set up yet. For example, the engine isn't
   // running yet or the channel's message handler isn't set up on the Dart side
   // yet.
-  void Resize(int new_size) { ResizeChannel(messenger_, name_, new_size); }
+  void Resize(int new_size) {
+    internal::ResizeChannel(messenger_, name_, new_size);
+  }
 
   // Defines whether the channel should show warning messages when discarding
   // messages due to overflow.
   //
   // When |warns| is false, the channel is expected to overflow and warning
   // messages will not be shown.
   void SetWarnsOnOverflow(bool warns) {
-    SetChannelWarnsOnOverflow(messenger_, name_, warns);
+    internal::SetChannelWarnsOnOverflow(messenger_, name_, warns);
   }
 
  private:

shell/platform/common/client_wrapper/include/flutter/method_channel.h

@@ -8,25 +8,15 @@
 #include <iostream>
 #include <string>
 
+#include "basic_message_channel.h"
 #include "binary_messenger.h"
 #include "engine_method_result.h"
 #include "method_call.h"
 #include "method_codec.h"
 #include "method_result.h"
-#include "standard_method_codec.h"
 
 namespace flutter {
 
-namespace {
-
-void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size);
-
-void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
-                               std::string name,
-                               bool warns);
-
-}  // namespace
-
 class EncodableValue;
 
 // A handler for receiving a method call from the Flutter engine.
@@ -137,15 +127,17 @@ class MethodChannel {
   // to channels that aren't fully set up yet. For example, the engine isn't
   // running yet or the channel's message handler isn't set up on the Dart side
   // yet.
-  void Resize(int new_size) { ResizeChannel(messenger_, name_, new_size); }
+  void Resize(int new_size) {
+    internal::ResizeChannel(messenger_, name_, new_size);
+  }
 
   // Defines whether the channel should show warning messages when discarding
   // messages due to overflow.
   //
   // When |warns| is false, the channel is expected to overflow and warning
   // messages will not be shown.
   void SetWarnsOnOverflow(bool warns) {
-    SetChannelWarnsOnOverflow(messenger_, name_, warns);
+    internal::SetChannelWarnsOnOverflow(messenger_, name_, warns);
   }
 
  private:
@@ -154,49 +146,6 @@ class MethodChannel {
   const MethodCodec<T>* codec_;
 };
 
-namespace {
-
-static constexpr char kControlChannelName[] = "dev.flutter/channel-buffers";
-static constexpr char kResizeMethod[] = "resize";
-static constexpr char kOverflowMethod[] = "overflow";
-
-// Adjusts the number of messages that will get buffered when sending messages
-// to channels that aren't fully set up yet. For example, the engine isn't
-// running yet or the channel's message handler isn't set up on the Dart side
-// yet.
-void ResizeChannel(BinaryMessenger* messenger, std::string name, int new_size) {
-  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
-      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
-
-  // The deserialization logic handles only 32 bits values, see
-  // https://github.com/flutter/engine/blob/93e8901490e78c7ba7e319cce4470d9c6478c6dc/lib/ui/channel_buffers.dart#L495.
-  control_channel->InvokeMethod(
-      kResizeMethod, std::make_unique<EncodableValue>(EncodableList{
-                         EncodableValue(name),
-                         EncodableValue(static_cast<int32_t>(new_size)),
-                     }));
-}
-
-// Defines whether the channel should show warning messages when discarding
-// messages due to overflow.
-//
-// When |warns| is false, the channel is expected to overflow and warning
-// messages will not be shown.
-void SetChannelWarnsOnOverflow(BinaryMessenger* messenger,
-                               std::string name,
-                               bool warns) {
-  auto control_channel = std::make_unique<MethodChannel<EncodableValue>>(
-      messenger, kControlChannelName, &StandardMethodCodec::GetInstance());
-
-  control_channel->InvokeMethod(kOverflowMethod,
-                                std::make_unique<EncodableValue>(EncodableList{
-                                    EncodableValue(name),
-                                    EncodableValue(!warns),
-                                }));
-}
-
-}  // namespace
-
 }  // namespace flutter
 
 #endif  // FLUTTER_SHELL_PLATFORM_COMMON_CLIENT_WRAPPER_INCLUDE_FLUTTER_METHOD_CHANNEL_H_