Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 839432c

Browse files
blerouxbleroux
committed
Address review comments except send_on_channel error handling
1 parent 12541b0 commit 839432c

File tree

6 files changed

+43
-39
lines changed

6 files changed

+43
-39
lines changed

‎shell/platform/linux/fl_binary_messenger.cc

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <gmodule.h>
1515

1616
static constexpr char kControlChannelName[] = "dev.flutter/channel-buffers";
17+
static constexpr char kResizeMethod[] = "resize";
18+
static constexpr char kOverflowMethod[] = "overflow";
1719

1820
G_DEFINE_QUARK(fl_binary_messenger_codec_error_quark,
1921
fl_binary_messenger_codec_error)
@@ -318,26 +320,26 @@ static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger,
318320

319321
static void resize_channel(FlBinaryMessenger* messenger,
320322
const gchar* channel,
321-
int new_size) {
323+
int64_t new_size) {
322324
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
323325
g_autoptr(FlValue) args = fl_value_new_list();
324326
fl_value_append_take(args, fl_value_new_string(channel));
325327
fl_value_append_take(args, fl_value_new_int(new_size));
326328
g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
327-
FL_METHOD_CODEC(codec), "resize", args, nullptr);
329+
FL_METHOD_CODEC(codec), kResizeMethod, args, nullptr);
328330
fl_binary_messenger_send_on_channel(messenger, kControlChannelName, message,
329331
nullptr, nullptr, nullptr);
330332
}
331333

332-
static void allow_channel_overflow(FlBinaryMessenger* messenger,
333-
const gchar* channel,
334-
bool allowed) {
334+
static void set_allow_channel_overflow(FlBinaryMessenger* messenger,
335+
const gchar* channel,
336+
bool allowed) {
335337
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
336338
g_autoptr(FlValue) args = fl_value_new_list();
337339
fl_value_append_take(args, fl_value_new_string(channel));
338340
fl_value_append_take(args, fl_value_new_bool(allowed));
339341
g_autoptr(GBytes) message = fl_method_codec_encode_method_call(
340-
FL_METHOD_CODEC(codec), "overflow", args, nullptr);
342+
FL_METHOD_CODEC(codec), kOverflowMethod, args, nullptr);
341343
fl_binary_messenger_send_on_channel(messenger, kControlChannelName, message,
342344
nullptr, nullptr, nullptr);
343345
}
@@ -354,7 +356,7 @@ static void fl_binary_messenger_impl_iface_init(
354356
iface->send_on_channel = send_on_channel;
355357
iface->send_on_channel_finish = send_on_channel_finish;
356358
iface->resize_channel = resize_channel;
357-
iface->allow_channel_overflow = allow_channel_overflow;
359+
iface->set_allow_channel_overflow = set_allow_channel_overflow;
358360
}
359361

360362
static void fl_binary_messenger_impl_init(FlBinaryMessengerImpl* self) {
@@ -433,19 +435,19 @@ G_MODULE_EXPORT GBytes* fl_binary_messenger_send_on_channel_finish(
433435

434436
G_MODULE_EXPORT void fl_binary_messenger_resize_channel(FlBinaryMessenger* self,
435437
const gchar* channel,
436-
int new_size) {
438+
int64_t new_size) {
437439
g_return_if_fail(FL_IS_BINARY_MESSENGER(self));
438440

439441
return FL_BINARY_MESSENGER_GET_IFACE(self)->resize_channel(self, channel,
440442
new_size);
441443
}
442444

443-
G_MODULE_EXPORT void fl_binary_messenger_allow_channel_overflow(
445+
G_MODULE_EXPORT void fl_binary_messenger_set_allow_channel_overflow(
444446
FlBinaryMessenger* self,
445447
const gchar* channel,
446448
bool allowed) {
447449
g_return_if_fail(FL_IS_BINARY_MESSENGER(self));
448450

449-
return FL_BINARY_MESSENGER_GET_IFACE(self)->allow_channel_overflow(
451+
return FL_BINARY_MESSENGER_GET_IFACE(self)->set_allow_channel_overflow(
450452
self, channel, allowed);
451453
}

‎shell/platform/linux/fl_binary_messenger_test.cc

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger,
132132

133133
static void resize_channel(FlBinaryMessenger* messenger,
134134
const gchar* channel,
135-
int new_size) {
135+
int64_t new_size) {
136136
// Fake implementation. Do nothing.
137137
}
138138

139-
static void allow_channel_overflow(FlBinaryMessenger* messenger,
140-
const gchar* channel,
141-
bool allowed) {
139+
static void set_allow_channel_overflow(FlBinaryMessenger* messenger,
140+
const gchar* channel,
141+
bool allowed) {
142142
// Fake implementation. Do nothing.
143143
}
144144

@@ -149,7 +149,7 @@ static void fl_fake_binary_messenger_iface_init(
149149
iface->send_on_channel = send_on_channel;
150150
iface->send_on_channel_finish = send_on_channel_finish;
151151
iface->resize_channel = resize_channel;
152-
iface->allow_channel_overflow = allow_channel_overflow;
152+
iface->set_allow_channel_overflow = set_allow_channel_overflow;
153153
}
154154

155155
static void fl_fake_binary_messenger_init(FlFakeBinaryMessenger* self) {}
@@ -495,7 +495,8 @@ TEST(FlBinaryMessengerTest, AllowOverflowChannel) {
495495
EXPECT_EQ(error, nullptr);
496496

497497
FlBinaryMessenger* messenger = fl_binary_messenger_new(engine);
498-
fl_binary_messenger_allow_channel_overflow(messenger, "flutter/test", true);
498+
fl_binary_messenger_set_allow_channel_overflow(messenger, "flutter/test",
499+
true);
499500

500501
EXPECT_TRUE(called);
501502
}

‎shell/platform/linux/fl_keyboard_manager_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ static GBytes* fl_mock_key_binary_messenger_send_on_channel_finish(
218218
static void fl_mock_binary_messenger_resize_channel(
219219
FlBinaryMessenger* messenger,
220220
const gchar* channel,
221-
int new_size) {
221+
int64_t new_size) {
222222
// Mock implementation. Do nothing.
223223
}
224224

225-
static void fl_mock_binary_messenger_allow_channel_overflow(
225+
static void fl_mock_binary_messenger_set_allow_channel_overflow(
226226
FlBinaryMessenger* messenger,
227227
const gchar* channel,
228228
bool allowed) {
@@ -251,8 +251,8 @@ static void fl_mock_key_binary_messenger_iface_init(
251251
iface->send_on_channel_finish =
252252
fl_mock_key_binary_messenger_send_on_channel_finish;
253253
iface->resize_channel = fl_mock_binary_messenger_resize_channel;
254-
iface->allow_channel_overflow =
255-
fl_mock_binary_messenger_allow_channel_overflow;
254+
iface->set_allow_channel_overflow =
255+
fl_mock_binary_messenger_set_allow_channel_overflow;
256256
}
257257

258258
static void fl_mock_key_binary_messenger_init(FlMockKeyBinaryMessenger* self) {}

‎shell/platform/linux/public/flutter_linux/fl_binary_messenger.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ struct _FlBinaryMessengerInterface {
9696

9797
void (*resize_channel)(FlBinaryMessenger* messenger,
9898
const gchar* channel,
99-
int new_size);
99+
int64_t new_size);
100100

101-
void (*allow_channel_overflow)(FlBinaryMessenger* messenger,
102-
const gchar* channel,
103-
bool allowed);
101+
void (*set_allow_channel_overflow)(FlBinaryMessenger* messenger,
102+
const gchar* channel,
103+
bool allowed);
104104
};
105105

106106
struct _FlBinaryMessengerResponseHandleClass {
@@ -184,7 +184,7 @@ void fl_binary_messenger_send_on_channel(FlBinaryMessenger* messenger,
184184

185185
/**
186186
* fl_binary_messenger_send_on_channel_finish:
187-
* @binary_messenger: an #FlBinaryMessenger.
187+
* @messenger: an #FlBinaryMessenger.
188188
* @result: a #GAsyncResult.
189189
* @error: (allow-none): #GError location to store the error occurring, or %NULL
190190
* to ignore.
@@ -207,21 +207,22 @@ GBytes* fl_binary_messenger_send_on_channel_finish(FlBinaryMessenger* messenger,
207207
*/
208208
void fl_binary_messenger_resize_channel(FlBinaryMessenger* messenger,
209209
const gchar* channel,
210-
int new_size);
210+
int64_t new_size);
211211

212212
/**
213-
* fl_binary_messenger_allow_channel_overflow:
214-
* @binary_messenger: an #FlBinaryMessenger.
213+
* fl_binary_messenger_set_allow_channel_overflow:
214+
* @messenger: an #FlBinaryMessenger.
215215
* @channel: channel to be allowed to overflow silently.
216216
* @allowed: when true the channel is expected to overflow and warning messages
217217
* will not be shown.
218218
*
219219
* Sends a message to the control channel asking to allow or disallow a channel
220220
* to overflow silently.
221221
*/
222-
void fl_binary_messenger_allow_channel_overflow(FlBinaryMessenger* messenger,
223-
const gchar* channel,
224-
bool allowed);
222+
void fl_binary_messenger_set_allow_channel_overflow(
223+
FlBinaryMessenger* messenger,
224+
const gchar* channel,
225+
bool allowed);
225226

226227
G_END_DECLS
227228

‎shell/platform/linux/testing/mock_binary_messenger.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,20 @@ static GBytes* fl_mock_binary_messenger_send_on_channel_finish(
125125
static void fl_mock_binary_messenger_resize_channel(
126126
FlBinaryMessenger* messenger,
127127
const gchar* channel,
128-
int new_size) {
128+
int64_t new_size) {
129129
g_return_if_fail(FL_IS_MOCK_BINARY_MESSENGER(messenger));
130130
FlMockBinaryMessenger* self = FL_MOCK_BINARY_MESSENGER(messenger);
131131
self->mock->fl_binary_messenger_resize_channel(messenger, channel, new_size);
132132
}
133133

134-
static void fl_mock_binary_messenger_allow_channel_overflow(
134+
static void fl_mock_binary_messenger_set_allow_channel_overflow(
135135
FlBinaryMessenger* messenger,
136136
const gchar* channel,
137137
bool allowed) {
138138
g_return_if_fail(FL_IS_MOCK_BINARY_MESSENGER(messenger));
139139
FlMockBinaryMessenger* self = FL_MOCK_BINARY_MESSENGER(messenger);
140-
self->mock->fl_binary_messenger_allow_channel_overflow(messenger, channel,
141-
allowed);
140+
self->mock->fl_binary_messenger_set_allow_channel_overflow(messenger, channel,
141+
allowed);
142142
}
143143

144144
static void fl_mock_binary_messenger_iface_init(
@@ -150,8 +150,8 @@ static void fl_mock_binary_messenger_iface_init(
150150
iface->send_on_channel_finish =
151151
fl_mock_binary_messenger_send_on_channel_finish;
152152
iface->resize_channel = fl_mock_binary_messenger_resize_channel;
153-
iface->allow_channel_overflow =
154-
fl_mock_binary_messenger_allow_channel_overflow;
153+
iface->set_allow_channel_overflow =
154+
fl_mock_binary_messenger_set_allow_channel_overflow;
155155
}
156156

157157
static void fl_mock_binary_messenger_init(FlMockBinaryMessenger* self) {}

‎shell/platform/linux/testing/mock_binary_messenger.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class MockBinaryMessenger {
5151
MOCK_METHOD3(fl_binary_messenger_resize_channel,
5252
void(FlBinaryMessenger* messenger,
5353
const gchar* channel,
54-
int new_size));
54+
int64_t new_size));
5555

56-
MOCK_METHOD3(fl_binary_messenger_allow_channel_overflow,
56+
MOCK_METHOD3(fl_binary_messenger_set_allow_channel_overflow,
5757
void(FlBinaryMessenger* messenger,
5858
const gchar* channel,
5959
bool allowed));

0 commit comments

Comments
 (0)