From 2e763e314e593a2094d36be7b8d75d467f5b8024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rulong=20Chen=EF=BC=88=E9=99=88=E6=B1=9D=E9=BE=99=EF=BC=89?= Date: Tue, 14 Feb 2023 17:24:12 +0800 Subject: [PATCH] Uses `int64_t` instead of `int` for the |viewId| parameter. --- flow/embedded_views.h | 4 ++-- flow/testing/mock_embedder.cc | 4 ++-- flow/testing/mock_embedder.h | 4 ++-- shell/common/rasterizer_unittests.cc | 5 +++-- shell/common/shell_test_external_view_embedder.cc | 4 ++-- shell/common/shell_test_external_view_embedder.h | 4 ++-- .../external_view_embedder/external_view_embedder.cc | 6 +++--- .../external_view_embedder/external_view_embedder.h | 6 +++--- .../ios/framework/Source/FlutterPlatformViews.mm | 10 +++++----- .../framework/Source/FlutterPlatformViews_Internal.h | 10 +++++----- shell/platform/darwin/ios/ios_external_view_embedder.h | 4 ++-- .../platform/darwin/ios/ios_external_view_embedder.mm | 4 ++-- .../embedder/embedder_external_view_embedder.cc | 4 ++-- .../embedder/embedder_external_view_embedder.h | 4 ++-- .../fuchsia/flutter/flatland_external_view_embedder.cc | 4 ++-- .../fuchsia/flutter/gfx_external_view_embedder.cc | 4 ++-- .../fuchsia/flutter/gfx_external_view_embedder.h | 4 ++-- .../platform/fuchsia/flutter/platform_view_unittest.cc | 5 +++-- shell/testing/tester_main.cc | 4 ++-- 19 files changed, 48 insertions(+), 46 deletions(-) diff --git a/flow/embedded_views.h b/flow/embedded_views.h index 0ea0357e00245..544a4b08ffc30 100644 --- a/flow/embedded_views.h +++ b/flow/embedded_views.h @@ -420,7 +420,7 @@ class ExternalViewEmbedder { fml::RefPtr raster_thread_merger) = 0; virtual void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) = 0; // This needs to get called after |Preroll| finishes on the layer tree. @@ -436,7 +436,7 @@ class ExternalViewEmbedder { virtual std::vector GetCurrentBuilders() = 0; // Must be called on the UI thread. - virtual EmbedderPaintContext CompositeEmbeddedView(int view_id) = 0; + virtual EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) = 0; // Implementers must submit the frame by calling frame.Submit(). // diff --git a/flow/testing/mock_embedder.cc b/flow/testing/mock_embedder.cc index efd3c12824d5b..b725b12e7ed4c 100644 --- a/flow/testing/mock_embedder.cc +++ b/flow/testing/mock_embedder.cc @@ -37,7 +37,7 @@ void MockViewEmbedder::BeginFrame( // |ExternalViewEmbedder| void MockViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { prerolled_views_.emplace_back(view_id); } @@ -53,7 +53,7 @@ std::vector MockViewEmbedder::GetCurrentBuilders() { } // |ExternalViewEmbedder| -EmbedderPaintContext MockViewEmbedder::CompositeEmbeddedView(int view_id) { +EmbedderPaintContext MockViewEmbedder::CompositeEmbeddedView(int64_t view_id) { painted_views_.emplace_back(view_id); EmbedderPaintContext context = contexts_.front(); contexts_.pop_front(); diff --git a/flow/testing/mock_embedder.h b/flow/testing/mock_embedder.h index 8a82c3341c71a..d7c7da1ba7959 100644 --- a/flow/testing/mock_embedder.h +++ b/flow/testing/mock_embedder.h @@ -34,7 +34,7 @@ class MockViewEmbedder : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| @@ -44,7 +44,7 @@ class MockViewEmbedder : public ExternalViewEmbedder { std::vector GetCurrentBuilders() override; // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; std::vector prerolled_views() const { return prerolled_views_; } std::vector painted_views() const { return painted_views_; } diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc index 66e0de6140013..feb7e29a10fde 100644 --- a/shell/common/rasterizer_unittests.cc +++ b/shell/common/rasterizer_unittests.cc @@ -64,13 +64,14 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder { double device_pixel_ratio, fml::RefPtr raster_thread_merger)); MOCK_METHOD2(PrerollCompositeEmbeddedView, - void(int view_id, std::unique_ptr params)); + void(int64_t view_id, + std::unique_ptr params)); MOCK_METHOD1(PostPrerollAction, PostPrerollResult( fml::RefPtr raster_thread_merger)); MOCK_METHOD0(GetCurrentCanvases, std::vector()); MOCK_METHOD0(GetCurrentBuilders, std::vector()); - MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int view_id)); + MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int64_t view_id)); MOCK_METHOD2(SubmitFrame, void(GrDirectContext* context, std::unique_ptr frame)); diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc index 7d660b724b2f2..16f92d0ef6e14 100644 --- a/shell/common/shell_test_external_view_embedder.cc +++ b/shell/common/shell_test_external_view_embedder.cc @@ -52,7 +52,7 @@ void ShellTestExternalViewEmbedder::BeginFrame( // |ExternalViewEmbedder| void ShellTestExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { SkRect view_bounds = SkRect::Make(frame_size_); std::unique_ptr view; @@ -100,7 +100,7 @@ void ShellTestExternalViewEmbedder::PushFilterToVisitedPlatformViews( } EmbedderPaintContext ShellTestExternalViewEmbedder::CompositeEmbeddedView( - int view_id) { + int64_t view_id) { return {slices_[view_id]->canvas(), slices_[view_id]->builder()}; } diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h index 5bff1c97ebdc9..913c19c281850 100644 --- a/shell/common/shell_test_external_view_embedder.h +++ b/shell/common/shell_test_external_view_embedder.h @@ -55,7 +55,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| @@ -69,7 +69,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder { std::vector GetCurrentBuilders() override; // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; // |ExternalViewEmbedder| void PushVisitedPlatformView(int64_t view_id) override; diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc index d8e57dbbf11f6..8fd8285a158f4 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.cc +++ b/shell/platform/android/external_view_embedder/external_view_embedder.cc @@ -22,7 +22,7 @@ AndroidExternalViewEmbedder::AndroidExternalViewEmbedder( // |ExternalViewEmbedder| void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView"); @@ -47,7 +47,7 @@ void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView( // |ExternalViewEmbedder| EmbedderPaintContext AndroidExternalViewEmbedder::CompositeEmbeddedView( - int view_id) { + int64_t view_id) { if (slices_.count(view_id) == 1) { return {slices_.at(view_id)->canvas(), slices_.at(view_id)->builder()}; } @@ -79,7 +79,7 @@ AndroidExternalViewEmbedder::GetCurrentBuilders() { return builders; } -SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const { +SkRect AndroidExternalViewEmbedder::GetViewRect(int64_t view_id) const { const EmbeddedViewParams& params = view_params_.at(view_id); // TODO(egarciad): The rect should be computed from the mutator stack. // (Clipping is missing) diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h index 0b258854408d6..c171e4a1b8354 100644 --- a/shell/platform/android/external_view_embedder/external_view_embedder.h +++ b/shell/platform/android/external_view_embedder/external_view_embedder.h @@ -38,11 +38,11 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; // |ExternalViewEmbedder| std::vector GetCurrentCanvases() override; @@ -85,7 +85,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder { // Gets the rect based on the device pixel ratio of a platform view displayed // on the screen. - SkRect GetViewRect(int view_id) const; + SkRect GetViewRect(int64_t view_id) const; private: // The number of frames the rasterizer task runner will continue diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm index f5a57dcd35738..43c388b1e69f5 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm @@ -380,7 +380,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect, } void FlutterPlatformViewsController::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { // All the CATransactions should be committed by the end of the last frame, // so catransaction_added_ must be false. @@ -406,7 +406,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect, views_to_recomposite_.insert(view_id); } -UIView* FlutterPlatformViewsController::GetPlatformViewByID(int view_id) { +UIView* FlutterPlatformViewsController::GetPlatformViewByID(int64_t view_id) { if (views_.empty()) { return nil; } @@ -573,7 +573,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect, embedded_view.layer.transform = flutter::GetCATransform3DFromSkMatrix(transformMatrix); } -void FlutterPlatformViewsController::CompositeWithParams(int view_id, +void FlutterPlatformViewsController::CompositeWithParams(int64_t view_id, const EmbeddedViewParams& params) { CGRect frame = CGRectMake(0, 0, params.sizePoints().width(), params.sizePoints().height()); FlutterTouchInterceptingView* touchInterceptor = touch_interceptors_[view_id].get(); @@ -612,7 +612,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect, ApplyMutators(mutatorStack, touchInterceptor, rect); } -EmbedderPaintContext FlutterPlatformViewsController::CompositeEmbeddedView(int view_id) { +EmbedderPaintContext FlutterPlatformViewsController::CompositeEmbeddedView(int64_t view_id) { // Any UIKit related code has to run on main thread. FML_DCHECK([[NSThread currentThread] isMainThread]); // Do nothing if the view doesn't need to be composited. @@ -642,7 +642,7 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect, visited_platform_views_.clear(); } -SkRect FlutterPlatformViewsController::GetPlatformViewRect(int view_id) { +SkRect FlutterPlatformViewsController::GetPlatformViewRect(int64_t view_id) { UIView* platform_view = GetPlatformViewByID(view_id); UIScreen* screen = [UIScreen mainScreen]; CGRect platform_view_cgrect = [platform_view convertRect:platform_view.bounds diff --git a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h index 7ec51e3b8ffcf..ff8c8630da032 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h +++ b/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h @@ -200,7 +200,7 @@ class FlutterPlatformViewsController { // Also reverts the composition_order_ to its original state at the beginning of the frame. void CancelFrame(); - void PrerollCompositeEmbeddedView(int view_id, + void PrerollCompositeEmbeddedView(int64_t view_id, std::unique_ptr params); // Returns the `FlutterPlatformView`'s `view` object associated with the view_id. @@ -208,7 +208,7 @@ class FlutterPlatformViewsController { // If the `FlutterPlatformViewsController` does not contain any `FlutterPlatformView` object or // a `FlutterPlatformView` object asscociated with the view_id cannot be found, the method // returns nil. - UIView* GetPlatformViewByID(int view_id); + UIView* GetPlatformViewByID(int64_t view_id); PostPrerollResult PostPrerollAction( const fml::RefPtr& raster_thread_merger); @@ -220,11 +220,11 @@ class FlutterPlatformViewsController { std::vector GetCurrentBuilders(); - EmbedderPaintContext CompositeEmbeddedView(int view_id); + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id); // The rect of the platform view at index view_id. This rect has been translated into the // host view coordinate system. Units are device screen pixels. - SkRect GetPlatformViewRect(int view_id); + SkRect GetPlatformViewRect(int64_t view_id); // Discards all platform views instances and auxiliary resources. void Reset(); @@ -289,7 +289,7 @@ class FlutterPlatformViewsController { void ApplyMutators(const MutatorsStack& mutators_stack, UIView* embedded_view, const SkRect& bounding_rect); - void CompositeWithParams(int view_id, const EmbeddedViewParams& params); + void CompositeWithParams(int64_t view_id, const EmbeddedViewParams& params); // Allocates a new FlutterPlatformViewLayer if needed, draws the pixels within the rect from // the picture on the layer's canvas. diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.h b/shell/platform/darwin/ios/ios_external_view_embedder.h index 8779f936db838..0fc80e9e780ec 100644 --- a/shell/platform/darwin/ios/ios_external_view_embedder.h +++ b/shell/platform/darwin/ios/ios_external_view_embedder.h @@ -39,7 +39,7 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| @@ -53,7 +53,7 @@ class IOSExternalViewEmbedder : public ExternalViewEmbedder { std::vector GetCurrentBuilders() override; // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; // |ExternalViewEmbedder| void SubmitFrame(GrDirectContext* context, diff --git a/shell/platform/darwin/ios/ios_external_view_embedder.mm b/shell/platform/darwin/ios/ios_external_view_embedder.mm index 61fc7dc5bacd4..1372df7168261 100644 --- a/shell/platform/darwin/ios/ios_external_view_embedder.mm +++ b/shell/platform/darwin/ios/ios_external_view_embedder.mm @@ -42,7 +42,7 @@ // |ExternalViewEmbedder| void IOSExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::PrerollCompositeEmbeddedView"); FML_CHECK(platform_views_controller_); @@ -71,7 +71,7 @@ } // |ExternalViewEmbedder| -EmbedderPaintContext IOSExternalViewEmbedder::CompositeEmbeddedView(int view_id) { +EmbedderPaintContext IOSExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) { TRACE_EVENT0("flutter", "IOSExternalViewEmbedder::CompositeEmbeddedView"); FML_CHECK(platform_views_controller_); return platform_views_controller_->CompositeEmbeddedView(view_id); diff --git a/shell/platform/embedder/embedder_external_view_embedder.cc b/shell/platform/embedder/embedder_external_view_embedder.cc index 0e61db48ce8d8..ef98b0cd276e3 100644 --- a/shell/platform/embedder/embedder_external_view_embedder.cc +++ b/shell/platform/embedder/embedder_external_view_embedder.cc @@ -71,7 +71,7 @@ void EmbedderExternalViewEmbedder::BeginFrame( // |ExternalViewEmbedder| void EmbedderExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { auto vid = EmbedderExternalView::ViewIdentifier(view_id); FML_DCHECK(pending_views_.count(vid) == 0); @@ -119,7 +119,7 @@ EmbedderExternalViewEmbedder::GetCurrentBuilders() { // |ExternalViewEmbedder| EmbedderPaintContext EmbedderExternalViewEmbedder::CompositeEmbeddedView( - int view_id) { + int64_t view_id) { auto vid = EmbedderExternalView::ViewIdentifier(view_id); auto found = pending_views_.find(vid); if (found == pending_views_.end()) { diff --git a/shell/platform/embedder/embedder_external_view_embedder.h b/shell/platform/embedder/embedder_external_view_embedder.h index 906e5d6c59007..b6efa3321426c 100644 --- a/shell/platform/embedder/embedder_external_view_embedder.h +++ b/shell/platform/embedder/embedder_external_view_embedder.h @@ -87,7 +87,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| @@ -97,7 +97,7 @@ class EmbedderExternalViewEmbedder final : public ExternalViewEmbedder { std::vector GetCurrentBuilders() override; // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; // |ExternalViewEmbedder| void SubmitFrame(GrDirectContext* context, diff --git a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc b/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc index 13fb03838b2a2..03539878bb8cf 100644 --- a/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/flatland_external_view_embedder.cc @@ -96,7 +96,7 @@ FlatlandExternalViewEmbedder::GetCurrentBuilders() { } void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { zx_handle_t handle = static_cast(view_id); FML_CHECK(frame_layers_.count(handle) == 0); @@ -108,7 +108,7 @@ void FlatlandExternalViewEmbedder::PrerollCompositeEmbeddedView( } flutter::EmbedderPaintContext -FlatlandExternalViewEmbedder::CompositeEmbeddedView(int view_id) { +FlatlandExternalViewEmbedder::CompositeEmbeddedView(int64_t view_id) { zx_handle_t handle = static_cast(view_id); auto found = frame_layers_.find(handle); FML_CHECK(found != frame_layers_.end()); diff --git a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc index 48816a428f0af..86aa0b2211c1e 100644 --- a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc +++ b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.cc @@ -170,7 +170,7 @@ GfxExternalViewEmbedder::GetCurrentBuilders() { } void GfxExternalViewEmbedder::PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) { zx_handle_t handle = static_cast(view_id); FML_CHECK(frame_layers_.count(handle) == 0); @@ -182,7 +182,7 @@ void GfxExternalViewEmbedder::PrerollCompositeEmbeddedView( } flutter::EmbedderPaintContext GfxExternalViewEmbedder::CompositeEmbeddedView( - int view_id) { + int64_t view_id) { zx_handle_t handle = static_cast(view_id); auto found = frame_layers_.find(handle); FML_CHECK(found != frame_layers_.end()); diff --git a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h index c2e67e34a2845..5f840c3d929b1 100644 --- a/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h +++ b/shell/platform/fuchsia/flutter/gfx_external_view_embedder.h @@ -92,11 +92,11 @@ class GfxExternalViewEmbedder final : public flutter::ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override; // |ExternalViewEmbedder| - flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override; + flutter::EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override; // |ExternalViewEmbedder| flutter::PostPrerollResult PostPrerollAction( diff --git a/shell/platform/fuchsia/flutter/platform_view_unittest.cc b/shell/platform/fuchsia/flutter/platform_view_unittest.cc index 654455b4af4bd..b1fe0b5fcb176 100644 --- a/shell/platform/fuchsia/flutter/platform_view_unittest.cc +++ b/shell/platform/fuchsia/flutter/platform_view_unittest.cc @@ -64,9 +64,10 @@ class MockExternalViewEmbedder : public flutter::ExternalViewEmbedder { } void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override {} - flutter::EmbedderPaintContext CompositeEmbeddedView(int view_id) override { + flutter::EmbedderPaintContext CompositeEmbeddedView( + int64_t view_id) override { return {nullptr, nullptr}; } }; diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc index efe40884101cd..f946baab6ca19 100644 --- a/shell/testing/tester_main.cc +++ b/shell/testing/tester_main.cc @@ -55,7 +55,7 @@ class TesterExternalViewEmbedder : public ExternalViewEmbedder { // |ExternalViewEmbedder| void PrerollCompositeEmbeddedView( - int view_id, + int64_t view_id, std::unique_ptr params) override {} // |ExternalViewEmbedder| @@ -65,7 +65,7 @@ class TesterExternalViewEmbedder : public ExternalViewEmbedder { std::vector GetCurrentBuilders() override { return {}; } // |ExternalViewEmbedder| - EmbedderPaintContext CompositeEmbeddedView(int view_id) override { + EmbedderPaintContext CompositeEmbeddedView(int64_t view_id) override { return {&canvas_, nullptr}; }