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

Commit af17331

Browse files
committed
Address review comments
1 parent 4248e61 commit af17331

File tree

3 files changed

+35
-25
lines changed

3 files changed

+35
-25
lines changed

shell/platform/darwin/common/framework/Headers/FlutterChannels.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,42 +146,42 @@ FLUTTER_DARWIN_EXPORT
146146
*
147147
* @param name The channel name.
148148
* @param messenger The binary messenger.
149-
* @param newSize The new size of the buffer.
149+
* @param newSize The number of messages that will get buffered.
150150
*/
151151
+ (void)resizeChannelWithName:(NSString*)name
152152
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
153-
newSize:(NSInteger)newSize;
153+
size:(NSInteger)newSize;
154154

155155
/**
156156
* Adjusts the number of messages that will get buffered when sending messages to
157157
* channels that aren't fully set up yet. For example, the engine isn't running
158158
* yet or the channel's message handler isn't set up on the Dart side yet.
159159
*
160-
* @param newSize The new size of the buffer.
160+
* @param newSize The number of messages that will get buffered.
161161
*/
162162
- (void)resizeChannelBuffer:(NSInteger)newSize;
163163

164164
/**
165-
* Toggles whether the channel should show warning messages when discarding messages
165+
* Defines whether the channel should show warning messages when discarding messages
166166
* due to overflow.
167167
*
168-
* @param name The channel name.
169-
* @param messenger The binary messenger.
170168
* @param allowed When true, the channel is expected to overflow and warning messages
171169
* will not be shown.
170+
* @param name The channel name.
171+
* @param messenger The binary messenger.
172172
*/
173-
+ (void)setAllowOverflowChannelWithName:(NSString*)name
174-
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
175-
allowed:(BOOL)allowed;
173+
+ (void)setWarnsOnOverflow:(BOOL)allowed
174+
forChannelWithName:(NSString*)name
175+
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger;
176176

177177
/**
178-
* Toggles whether the channel should show warning messages when discarding messages
178+
* Defines whether the channel should show warning messages when discarding messages
179179
* due to overflow.
180180
*
181181
* @param allowed When true, the channel is expected to overflow and warning messages
182182
* will not be shown.
183183
*/
184-
- (void)setAllowOverflow:(BOOL)allowed;
184+
- (void)setWarnsOnOverflow:(BOOL)allowed;
185185

186186
@end
187187

shell/platform/darwin/common/framework/Source/FlutterChannels.mm

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,28 @@
1515
static void ResizeChannelBuffer(NSObject<FlutterBinaryMessenger>* binaryMessenger,
1616
NSString* channel,
1717
NSInteger newSize) {
18-
NSArray* args = @[ channel, [NSNumber numberWithInt:newSize] ];
18+
NSCAssert(newSize >= 0, @"Channel buffer size must be non-negative");
19+
NSArray* args = @[ channel, @(newSize) ];
1920
FlutterMethodCall* resizeMethodCall = [FlutterMethodCall methodCallWithMethodName:kResizeMethod
2021
arguments:args];
2122
NSObject<FlutterMethodCodec>* codec = [FlutterStandardMethodCodec sharedInstance];
2223
NSData* message = [codec encodeMethodCall:resizeMethodCall];
2324
[binaryMessenger sendOnChannel:kFlutterChannelBuffersChannel message:message];
2425
}
2526

26-
static void SetAllowChannelOverflow(NSObject<FlutterBinaryMessenger>* binaryMessenger,
27-
NSString* channel,
28-
BOOL allowed) {
29-
NSArray* args = @[ channel, [NSNumber numberWithBool:allowed] ];
27+
/**
28+
* Defines whether a channel should show warning messages when discarding messages
29+
* due to overflow.
30+
*
31+
* @param binaryMessenger The binary messenger.
32+
* @param channel The channel name.
33+
* @param allowed When true, the channel is expected to overflow and warning messages
34+
* will not be shown.
35+
*/
36+
static void SetWarnsOnOverflow(NSObject<FlutterBinaryMessenger>* binaryMessenger,
37+
NSString* channel,
38+
BOOL allowed) {
39+
NSArray* args = @[ channel, @(allowed) ];
3040
FlutterMethodCall* overflowMethodCall =
3141
[FlutterMethodCall methodCallWithMethodName:kOverflowMethod arguments:args];
3242
NSObject<FlutterMethodCodec>* codec = [FlutterStandardMethodCodec sharedInstance];
@@ -132,22 +142,22 @@ - (void)setMessageHandler:(FlutterMessageHandler)handler {
132142

133143
+ (void)resizeChannelWithName:(NSString*)name
134144
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
135-
newSize:(NSInteger)newSize {
145+
size:(NSInteger)newSize {
136146
ResizeChannelBuffer(messenger, name, newSize);
137147
}
138148

139149
- (void)resizeChannelBuffer:(NSInteger)newSize {
140150
ResizeChannelBuffer(_messenger, _name, newSize);
141151
}
142152

143-
+ (void)setAllowOverflowChannelWithName:(NSString*)name
144-
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger
145-
allowed:(BOOL)allowed {
146-
SetAllowChannelOverflow(messenger, name, allowed);
153+
+ (void)setWarnsOnOverflow:(BOOL)allowed
154+
forChannelWithName:(NSString*)name
155+
binaryMessenger:(NSObject<FlutterBinaryMessenger>*)messenger {
156+
SetWarnsOnOverflow(messenger, name, allowed);
147157
}
148158

149-
- (void)setAllowOverflow:(BOOL)allowed {
150-
SetAllowChannelOverflow(_messenger, _name, allowed);
159+
- (void)setWarnsOnOverflow:(BOOL)allowed {
160+
SetWarnsOnOverflow(_messenger, _name, allowed);
151161
}
152162

153163
@end

shell/platform/darwin/common/framework/Source/FlutterChannelsTest.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ - (void)testResize {
170170
[binaryMessenger stopMocking];
171171
}
172172

173-
- (bool)testetAllowChannelOverflow {
173+
- (bool)testSetWarnsOnOverflow {
174174
NSString* channelName = @"flutter/test";
175175
id binaryMessenger = OCMStrictProtocolMock(@protocol(FlutterBinaryMessenger));
176176
id codec = OCMProtocolMock(@protocol(FlutterMethodCodec));
@@ -188,7 +188,7 @@ - (bool)testetAllowChannelOverflow {
188188
NSData* expectedMessage = [NSData dataWithBytes:bytes length:sizeof(bytes)];
189189

190190
OCMExpect([binaryMessenger sendOnChannel:@"dev.flutter/channel-buffers" message:expectedMessage]);
191-
[channel setAllowOverflow:YES];
191+
[channel setWarnsOnOverflow:YES];
192192
OCMVerifyAll(binaryMessenger);
193193
[binaryMessenger stopMocking];
194194
}

0 commit comments

Comments
 (0)