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

Commit 2e763e3

Browse files
0xZOne0xZOne
committed
Uses int64_t instead of int for the |viewId| parameter.
1 parent cbb7fc0 commit 2e763e3

19 files changed

+48
-46
lines changed

‎flow/embedded_views.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ class ExternalViewEmbedder {
420420
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger) = 0;
421421

422422
virtual void PrerollCompositeEmbeddedView(
423-
int view_id,
423+
int64_t view_id,
424424
std::unique_ptr<EmbeddedViewParams> params) = 0;
425425

426426
// This needs to get called after |Preroll| finishes on the layer tree.
@@ -436,7 +436,7 @@ class ExternalViewEmbedder {
436436
virtual std::vector<DisplayListBuilder*> GetCurrentBuilders() = 0;
437437

438438
// Must be called on the UI thread.
439-
virtual EmbedderPaintContext CompositeEmbeddedView(int view_id) = 0;
439+
virtual EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) = 0;
440440

441441
// Implementers must submit the frame by calling frame.Submit().
442442
//

‎flow/testing/mock_embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void MockViewEmbedder::BeginFrame(
3737

3838
// |ExternalViewEmbedder|
3939
void MockViewEmbedder::PrerollCompositeEmbeddedView(
40-
int view_id,
40+
int64_t view_id,
4141
std::unique_ptr<EmbeddedViewParams> params) {
4242
prerolled_views_.emplace_back(view_id);
4343
}
@@ -53,7 +53,7 @@ std::vector<DisplayListBuilder*> MockViewEmbedder::GetCurrentBuilders() {
5353
}
5454

5555
// |ExternalViewEmbedder|
56-
EmbedderPaintContext MockViewEmbedder::CompositeEmbeddedView(int view_id) {
56+
EmbedderPaintContext MockViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
5757
painted_views_.emplace_back(view_id);
5858
EmbedderPaintContext context = contexts_.front();
5959
contexts_.pop_front();

‎flow/testing/mock_embedder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MockViewEmbedder : public ExternalViewEmbedder {
3434

3535
// |ExternalViewEmbedder|
3636
void PrerollCompositeEmbeddedView(
37-
int view_id,
37+
int64_t view_id,
3838
std::unique_ptr<EmbeddedViewParams> params) override;
3939

4040
// |ExternalViewEmbedder|
@@ -44,7 +44,7 @@ class MockViewEmbedder : public ExternalViewEmbedder {
4444
std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
4545

4646
// |ExternalViewEmbedder|
47-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
47+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
4848

4949
std::vector<int64_t> prerolled_views() const { return prerolled_views_; }
5050
std::vector<int64_t> painted_views() const { return painted_views_; }

‎shell/common/rasterizer_unittests.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,14 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder {
6464
double device_pixel_ratio,
6565
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger));
6666
MOCK_METHOD2(PrerollCompositeEmbeddedView,
67-
void(int view_id, std::unique_ptr<EmbeddedViewParams> params));
67+
void(int64_t view_id,
68+
std::unique_ptr<EmbeddedViewParams> params));
6869
MOCK_METHOD1(PostPrerollAction,
6970
PostPrerollResult(
7071
fml::RefPtr<fml::RasterThreadMerger> raster_thread_merger));
7172
MOCK_METHOD0(GetCurrentCanvases, std::vector<SkCanvas*>());
7273
MOCK_METHOD0(GetCurrentBuilders, std::vector<DisplayListBuilder*>());
73-
MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int view_id));
74+
MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int64_t view_id));
7475
MOCK_METHOD2(SubmitFrame,
7576
void(GrDirectContext* context,
7677
std::unique_ptr<SurfaceFrame> frame));

‎shell/common/shell_test_external_view_embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void ShellTestExternalViewEmbedder::BeginFrame(
5252

5353
// |ExternalViewEmbedder|
5454
void ShellTestExternalViewEmbedder::PrerollCompositeEmbeddedView(
55-
int view_id,
55+
int64_t view_id,
5656
std::unique_ptr<EmbeddedViewParams> params) {
5757
SkRect view_bounds = SkRect::Make(frame_size_);
5858
std::unique_ptr<EmbedderViewSlice> view;
@@ -100,7 +100,7 @@ void ShellTestExternalViewEmbedder::PushFilterToVisitedPlatformViews(
100100
}
101101

102102
EmbedderPaintContext ShellTestExternalViewEmbedder::CompositeEmbeddedView(
103-
int view_id) {
103+
int64_t view_id) {
104104
return {slices_[view_id]->canvas(), slices_[view_id]->builder()};
105105
}
106106

‎shell/common/shell_test_external_view_embedder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
5555

5656
// |ExternalViewEmbedder|
5757
void PrerollCompositeEmbeddedView(
58-
int view_id,
58+
int64_t view_id,
5959
std::unique_ptr<EmbeddedViewParams> params) override;
6060

6161
// |ExternalViewEmbedder|
@@ -69,7 +69,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
6969
std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
7070

7171
// |ExternalViewEmbedder|
72-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
72+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
7373

7474
// |ExternalViewEmbedder|
7575
void PushVisitedPlatformView(int64_t view_id) override;

‎shell/platform/android/external_view_embedder/external_view_embedder.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ AndroidExternalViewEmbedder::AndroidExternalViewEmbedder(
2222

2323
// |ExternalViewEmbedder|
2424
void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView(
25-
int view_id,
25+
int64_t view_id,
2626
std::unique_ptr<EmbeddedViewParams> params) {
2727
TRACE_EVENT0("flutter",
2828
"AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView");
@@ -47,7 +47,7 @@ void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView(
4747

4848
// |ExternalViewEmbedder|
4949
EmbedderPaintContext AndroidExternalViewEmbedder::CompositeEmbeddedView(
50-
int view_id) {
50+
int64_t view_id) {
5151
if (slices_.count(view_id) == 1) {
5252
return {slices_.at(view_id)->canvas(), slices_.at(view_id)->builder()};
5353
}
@@ -79,7 +79,7 @@ AndroidExternalViewEmbedder::GetCurrentBuilders() {
7979
return builders;
8080
}
8181

82-
SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
82+
SkRect AndroidExternalViewEmbedder::GetViewRect(int64_t view_id) const {
8383
const EmbeddedViewParams& params = view_params_.at(view_id);
8484
// TODO(egarciad): The rect should be computed from the mutator stack.
8585
// (Clipping is missing)

‎shell/platform/android/external_view_embedder/external_view_embedder.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
3838

3939
// |ExternalViewEmbedder|
4040
void PrerollCompositeEmbeddedView(
41-
int view_id,
41+
int64_t view_id,
4242
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
4343

4444
// |ExternalViewEmbedder|
45-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
45+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
4646

4747
// |ExternalViewEmbedder|
4848
std::vector<SkCanvas*> GetCurrentCanvases() override;
@@ -85,7 +85,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
8585

8686
// Gets the rect based on the device pixel ratio of a platform view displayed
8787
// on the screen.
88-
SkRect GetViewRect(int view_id) const;
88+
SkRect GetViewRect(int64_t view_id) const;
8989

9090
private:
9191
// The number of frames the rasterizer task runner will continue

‎shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
380380
}
381381

382382
void FlutterPlatformViewsController::PrerollCompositeEmbeddedView(
383-
int view_id,
383+
int64_t view_id,
384384
std::unique_ptr<EmbeddedViewParams> params) {
385385
// All the CATransactions should be committed by the end of the last frame,
386386
// so catransaction_added_ must be false.
@@ -406,7 +406,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
406406
views_to_recomposite_.insert(view_id);
407407
}
408408

409-
UIView* FlutterPlatformViewsController::GetPlatformViewByID(int view_id) {
409+
UIView* FlutterPlatformViewsController::GetPlatformViewByID(int64_t view_id) {
410410
if (views_.empty()) {
411411
return nil;
412412
}
@@ -573,7 +573,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
573573
embedded_view.layer.transform = flutter::GetCATransform3DFromSkMatrix(transformMatrix);
574574
}
575575

576-
void FlutterPlatformViewsController::CompositeWithParams(int view_id,
576+
void FlutterPlatformViewsController::CompositeWithParams(int64_t view_id,
577577
const EmbeddedViewParams& params) {
578578
CGRect frame = CGRectMake(0, 0, params.sizePoints().width(), params.sizePoints().height());
579579
FlutterTouchInterceptingView* touchInterceptor = touch_interceptors_[view_id].get();
@@ -612,7 +612,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
612612
ApplyMutators(mutatorStack, touchInterceptor, rect);
613613
}
614614

615-
EmbedderPaintContext FlutterPlatformViewsController::CompositeEmbeddedView(int view_id) {
615+
EmbedderPaintContext FlutterPlatformViewsController::CompositeEmbeddedView(int64_t view_id) {
616616
// Any UIKit related code has to run on main thread.
617617
FML_DCHECK([[NSThread currentThread] isMainThread]);
618618
// Do nothing if the view doesn't need to be composited.
@@ -642,7 +642,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
642642
visited_platform_views_.clear();
643643
}
644644

645-
SkRect FlutterPlatformViewsController::GetPlatformViewRect(int view_id) {
645+
SkRect FlutterPlatformViewsController::GetPlatformViewRect(int64_t view_id) {
646646
UIView* platform_view = GetPlatformViewByID(view_id);
647647
UIScreen* screen = [UIScreen mainScreen];
648648
CGRect platform_view_cgrect = [platform_view convertRect:platform_view.bounds

‎shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,15 @@ class FlutterPlatformViewsController {
200200
// Also reverts the composition_order_ to its original state at the beginning of the frame.
201201
void CancelFrame();
202202

203-
void PrerollCompositeEmbeddedView(int view_id,
203+
void PrerollCompositeEmbeddedView(int64_t view_id,
204204
std::unique_ptr<flutter::EmbeddedViewParams> params);
205205

206206
// Returns the `FlutterPlatformView`'s `view` object associated with the view_id.
207207
//
208208
// If the `FlutterPlatformViewsController` does not contain any `FlutterPlatformView` object or
209209
// a `FlutterPlatformView` object asscociated with the view_id cannot be found, the method
210210
// returns nil.
211-
UIView* GetPlatformViewByID(int view_id);
211+
UIView* GetPlatformViewByID(int64_t view_id);
212212

213213
PostPrerollResult PostPrerollAction(
214214
const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger);
@@ -220,11 +220,11 @@ class FlutterPlatformViewsController {
220220

221221
std::vector<DisplayListBuilder*> GetCurrentBuilders();
222222

223-
EmbedderPaintContext CompositeEmbeddedView(int view_id);
223+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id);
224224

225225
// The rect of the platform view at index view_id. This rect has been translated into the
226226
// host view coordinate system. Units are device screen pixels.
227-
SkRect GetPlatformViewRect(int view_id);
227+
SkRect GetPlatformViewRect(int64_t view_id);
228228

229229
// Discards all platform views instances and auxiliary resources.
230230
void Reset();
@@ -289,7 +289,7 @@ class FlutterPlatformViewsController {
289289
void ApplyMutators(const MutatorsStack& mutators_stack,
290290
UIView* embedded_view,
291291
const SkRect& bounding_rect);
292-
void CompositeWithParams(int view_id, const EmbeddedViewParams& params);
292+
void CompositeWithParams(int64_t view_id, const EmbeddedViewParams& params);
293293

294294
// Allocates a new FlutterPlatformViewLayer if needed, draws the pixels within the rect from
295295
// the picture on the layer's canvas.

‎shell/platform/darwin/ios/ios_external_view_embedder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
3939

4040
// |ExternalViewEmbedder|
4141
void PrerollCompositeEmbeddedView(
42-
int view_id,
42+
int64_t view_id,
4343
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
4444

4545
// |ExternalViewEmbedder|
@@ -53,7 +53,7 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder {
5353
std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
5454

5555
// |ExternalViewEmbedder|
56-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
56+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
5757

5858
// |ExternalViewEmbedder|
5959
void SubmitFrame(GrDirectContext* context,

‎shell/platform/darwin/ios/ios_external_view_embedder.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
// |ExternalViewEmbedder|
4444
void IOSExternalViewEmbedder::PrerollCompositeEmbeddedView(
45-
int view_id,
45+
int64_t view_id,
4646
std::unique_ptr<EmbeddedViewParams> params) {
4747
TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PrerollCompositeEmbeddedView");
4848
FML_CHECK(platform_views_controller_);
@@ -71,7 +71,7 @@
7171
}
7272

7373
// |ExternalViewEmbedder|
74-
EmbedderPaintContext IOSExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
74+
EmbedderPaintContext IOSExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
7575
TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::CompositeEmbeddedView");
7676
FML_CHECK(platform_views_controller_);
7777
return platform_views_controller_->CompositeEmbeddedView(view_id);

‎shell/platform/embedder/embedder_external_view_embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void EmbedderExternalViewEmbedder::BeginFrame(
7171

7272
// |ExternalViewEmbedder|
7373
void EmbedderExternalViewEmbedder::PrerollCompositeEmbeddedView(
74-
int view_id,
74+
int64_t view_id,
7575
std::unique_ptr<EmbeddedViewParams> params) {
7676
auto vid = EmbedderExternalView::ViewIdentifier(view_id);
7777
FML_DCHECK(pending_views_.count(vid) == 0);
@@ -119,7 +119,7 @@ EmbedderExternalViewEmbedder::GetCurrentBuilders() {
119119

120120
// |ExternalViewEmbedder|
121121
EmbedderPaintContext EmbedderExternalViewEmbedder::CompositeEmbeddedView(
122-
int view_id) {
122+
int64_t view_id) {
123123
auto vid = EmbedderExternalView::ViewIdentifier(view_id);
124124
auto found = pending_views_.find(vid);
125125
if (found == pending_views_.end()) {

‎shell/platform/embedder/embedder_external_view_embedder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
8787

8888
// |ExternalViewEmbedder|
8989
void PrerollCompositeEmbeddedView(
90-
int view_id,
90+
int64_t view_id,
9191
std::unique_ptr<EmbeddedViewParams> params) override;
9292

9393
// |ExternalViewEmbedder|
@@ -97,7 +97,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder {
9797
std::vector<DisplayListBuilder*> GetCurrentBuilders() override;
9898

9999
// |ExternalViewEmbedder|
100-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
100+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
101101

102102
// |ExternalViewEmbedder|
103103
void SubmitFrame(GrDirectContext* context,

‎shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ FlatlandExternalViewEmbedder::GetCurrentBuilders() {
9696
}
9797

9898
void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView(
99-
int view_id,
99+
int64_t view_id,
100100
std::unique_ptr<flutter::EmbeddedViewParams> params) {
101101
zx_handle_t handle = static_cast<zx_handle_t>(view_id);
102102
FML_CHECK(frame_layers_.count(handle) == 0);
@@ -108,7 +108,7 @@ void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView(
108108
}
109109

110110
flutter::EmbedderPaintContext
111-
FlatlandExternalViewEmbedder::CompositeEmbeddedView(int view_id) {
111+
FlatlandExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) {
112112
zx_handle_t handle = static_cast<zx_handle_t>(view_id);
113113
auto found = frame_layers_.find(handle);
114114
FML_CHECK(found != frame_layers_.end());

‎shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ GfxExternalViewEmbedder::GetCurrentBuilders() {
170170
}
171171

172172
void GfxExternalViewEmbedder::PrerollCompositeEmbeddedView(
173-
int view_id,
173+
int64_t view_id,
174174
std::unique_ptr<flutter::EmbeddedViewParams> params) {
175175
zx_handle_t handle = static_cast<zx_handle_t>(view_id);
176176
FML_CHECK(frame_layers_.count(handle) == 0);
@@ -182,7 +182,7 @@ void GfxExternalViewEmbedder::PrerollCompositeEmbeddedView(
182182
}
183183

184184
flutter::EmbedderPaintContext GfxExternalViewEmbedder::CompositeEmbeddedView(
185-
int view_id) {
185+
int64_t view_id) {
186186
zx_handle_t handle = static_cast<zx_handle_t>(view_id);
187187
auto found = frame_layers_.find(handle);
188188
FML_CHECK(found != frame_layers_.end());

‎shell/platform/fuchsia/flutter/gfx_external_view_embedder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ class GfxExternalViewEmbedder final : public flutter::ExternalViewEmbedder {
9292

9393
// |ExternalViewEmbedder|
9494
void PrerollCompositeEmbeddedView(
95-
int view_id,
95+
int64_t view_id,
9696
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
9797

9898
// |ExternalViewEmbedder|
99-
flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override;
99+
flutter::EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override;
100100

101101
// |ExternalViewEmbedder|
102102
flutter::PostPrerollResult PostPrerollAction(

‎shell/platform/fuchsia/flutter/platform_view_unittest.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ class MockExternalViewEmbedder : public flutter::ExternalViewEmbedder {
6464
}
6565

6666
void PrerollCompositeEmbeddedView(
67-
int view_id,
67+
int64_t view_id,
6868
std::unique_ptr<flutter::EmbeddedViewParams> params) override {}
69-
flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override {
69+
flutter::EmbedderPaintContext CompositeEmbeddedView(
70+
int64_t view_id) override {
7071
return {nullptr, nullptr};
7172
}
7273
};

‎shell/testing/tester_main.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class TesterExternalViewEmbedder : public ExternalViewEmbedder {
5555

5656
// |ExternalViewEmbedder|
5757
void PrerollCompositeEmbeddedView(
58-
int view_id,
58+
int64_t view_id,
5959
std::unique_ptr<EmbeddedViewParams> params) override {}
6060

6161
// |ExternalViewEmbedder|
@@ -65,7 +65,7 @@ class TesterExternalViewEmbedder : public ExternalViewEmbedder {
6565
std::vector<DisplayListBuilder*> GetCurrentBuilders() override { return {}; }
6666

6767
// |ExternalViewEmbedder|
68-
EmbedderPaintContext CompositeEmbeddedView(int view_id) override {
68+
EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override {
6969
return {&canvas_, nullptr};
7070
}
7171

0 commit comments

Comments
 (0)