firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make EmbeddedViewParams a unique ptr (flutter/engine#9640)

Browse Source
This commit is contained in:
Chris Yang
2019-07-02 13:27:12 -07:00
committed by GitHub
parent 106c4f7450
commit 92ae45a714
8 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/src/flutter/flow/embedded_views.h
View File

@@ -190,8 +190,9 @@ class ExternalViewEmbedder {
virtual std::vector<SkCanvas*> GetCurrentCanvases() = 0;
// Must be called on the UI thread.
virtual SkCanvas* CompositeEmbeddedView(int view_id,
const EmbeddedViewParams& params) = 0;
virtual SkCanvas* CompositeEmbeddedView(
int view_id,
std::unique_ptr<flutter::EmbeddedViewParams> params) = 0;
virtual bool SubmitFrame(GrContext* context);

11
engine/src/flutter/flow/layers/platform_view_layer.cc
View File

@@ -32,15 +32,16 @@ void PlatformViewLayer::Paint(PaintContext& context) const {
"does not support embedding";
return;
}
EmbeddedViewParams params;
std::unique_ptr<EmbeddedViewParams> params =
std::make_unique<EmbeddedViewParams>();
SkMatrix transform = context.leaf_nodes_canvas->getTotalMatrix();
params.offsetPixels =
params->offsetPixels =
SkPoint::Make(transform.getTranslateX(), transform.getTranslateY());
params.sizePoints = size_;
params.mutatorsStack = context.mutators_stack;
params->sizePoints = size_;
params->mutatorsStack = context.mutators_stack;
SkCanvas* canvas =
context.view_embedder->CompositeEmbeddedView(view_id_, params);
context.view_embedder->CompositeEmbeddedView(view_id_, std::move(params));
context.leaf_nodes_canvas = canvas;
}
} // namespace flutter

17
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
View File

@@ -231,7 +231,6 @@ UIView* FlutterPlatformViewsController::ReconstructClipViewsChain(int number_of_
void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators_stack,
UIView* embedded_view) {
FML_DCHECK(CATransform3DEqualToTransform(embedded_view.layer.transform, CATransform3DIdentity));
UIView* head = embedded_view;
head.clipsToBounds = YES;
ResetAnchor(head.layer);
@@ -275,13 +274,13 @@ void FlutterPlatformViewsController::ApplyMutators(const MutatorsStack& mutators
void FlutterPlatformViewsController::CompositeWithParams(
int view_id,
const flutter::EmbeddedViewParams& params) {
CGRect frame = CGRectMake(0, 0, params.sizePoints.width(), params.sizePoints.height());
std::unique_ptr<flutter::EmbeddedViewParams> params) {
CGRect frame = CGRectMake(0, 0, params->sizePoints.width(), params->sizePoints.height());
UIView* touchInterceptor = touch_interceptors_[view_id].get();
touchInterceptor.layer.transform = CATransform3DIdentity;
touchInterceptor.frame = frame;
int currentClippingCount = CountClips(params.mutatorsStack);
int currentClippingCount = CountClips(params->mutatorsStack);
int previousClippingCount = clip_count_[view_id];
if (currentClippingCount != previousClippingCount) {
clip_count_[view_id] = currentClippingCount;
@@ -292,22 +291,22 @@ void FlutterPlatformViewsController::CompositeWithParams(
ReconstructClipViewsChain(currentClippingCount, touchInterceptor, oldPlatformViewRoot);
root_views_[view_id] = fml::scoped_nsobject<UIView>([newPlatformViewRoot retain]);
}
ApplyMutators(params.mutatorsStack, touchInterceptor);
ApplyMutators(params->mutatorsStack, touchInterceptor);
}
SkCanvas* FlutterPlatformViewsController::CompositeEmbeddedView(
int view_id,
const flutter::EmbeddedViewParams& params) {
std::unique_ptr<flutter::EmbeddedViewParams> params) {
// TODO(amirh): assert that this is running on the platform thread once we support the iOS
// embedded views thread configuration.
// Do nothing if the params didn't change.
if (current_composition_params_.count(view_id) == 1 &&
current_composition_params_[view_id] == params) {
current_composition_params_[view_id] == *params.get()) {
return picture_recorders_[view_id]->getRecordingCanvas();
}
current_composition_params_[view_id] = EmbeddedViewParams(params);
CompositeWithParams(view_id, params);
current_composition_params_[view_id] = EmbeddedViewParams(*params.get());
CompositeWithParams(view_id, std::move(params));
return picture_recorders_[view_id]->getRecordingCanvas();
}

4
engine/src/flutter/shell/platform/darwin/ios/framework/Source/FlutterPlatformViews_Internal.h
View File

@@ -90,7 +90,7 @@ class FlutterPlatformViewsController {
std::vector<SkCanvas*> GetCurrentCanvases();
SkCanvas* CompositeEmbeddedView(int view_id, const flutter::EmbeddedViewParams& params);
SkCanvas* CompositeEmbeddedView(int view_id, std::unique_ptr<flutter::EmbeddedViewParams> params);
// Discards all platform views instances and auxiliary resources.
void Reset();
@@ -184,7 +184,7 @@ class FlutterPlatformViewsController {
//
// After each clip operation, we update the head to the super view of the current head.
void ApplyMutators(const MutatorsStack& mutators_stack, UIView* embedded_view);
void CompositeWithParams(int view_id, const flutter::EmbeddedViewParams& params);
void CompositeWithParams(int view_id, std::unique_ptr<flutter::EmbeddedViewParams> params);
FML_DISALLOW_COPY_AND_ASSIGN(FlutterPlatformViewsController);
};

3
engine/src/flutter/shell/platform/darwin/ios/ios_surface_gl.h
View File

@@ -61,7 +61,8 @@ class IOSSurfaceGL final : public IOSSurface,
std::vector<SkCanvas*> GetCurrentCanvases() override;
// |flutter::ExternalViewEmbedder|
SkCanvas* CompositeEmbeddedView(int view_id, const flutter::EmbeddedViewParams& params) override;
SkCanvas* CompositeEmbeddedView(int view_id,
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
// |flutter::ExternalViewEmbedder|
bool SubmitFrame(GrContext* context) override;

4
engine/src/flutter/shell/platform/darwin/ios/ios_surface_gl.mm
View File

@@ -102,10 +102,10 @@ std::vector<SkCanvas*> IOSSurfaceGL::GetCurrentCanvases() {
}
SkCanvas* IOSSurfaceGL::CompositeEmbeddedView(int view_id,
const flutter::EmbeddedViewParams& params) {
std::unique_ptr<flutter::EmbeddedViewParams> params) {
FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
FML_CHECK(platform_views_controller != nullptr);
return platform_views_controller->CompositeEmbeddedView(view_id, params);
return platform_views_controller->CompositeEmbeddedView(view_id, std::move(params));
}
bool IOSSurfaceGL::SubmitFrame(GrContext* context) {

3
engine/src/flutter/shell/platform/darwin/ios/ios_surface_software.h
View File

@@ -55,7 +55,8 @@ class IOSSurfaceSoftware final : public IOSSurface,
std::vector<SkCanvas*> GetCurrentCanvases() override;
// |flutter::ExternalViewEmbedder|
SkCanvas* CompositeEmbeddedView(int view_id, const flutter::EmbeddedViewParams& params) override;
SkCanvas* CompositeEmbeddedView(int view_id,
std::unique_ptr<flutter::EmbeddedViewParams> params) override;
// |flutter::ExternalViewEmbedder|
bool SubmitFrame(GrContext* context) override;

7
engine/src/flutter/shell/platform/darwin/ios/ios_surface_software.mm
View File

@@ -153,11 +153,12 @@ std::vector<SkCanvas*> IOSSurfaceSoftware::GetCurrentCanvases() {
return platform_views_controller->GetCurrentCanvases();
}
SkCanvas* IOSSurfaceSoftware::CompositeEmbeddedView(int view_id,
const flutter::EmbeddedViewParams& params) {
SkCanvas* IOSSurfaceSoftware::CompositeEmbeddedView(
int view_id,
std::unique_ptr<flutter::EmbeddedViewParams> params) {
FlutterPlatformViewsController* platform_views_controller = GetPlatformViewsController();
FML_CHECK(platform_views_controller != nullptr);
return platform_views_controller->CompositeEmbeddedView(view_id, params);
return platform_views_controller->CompositeEmbeddedView(view_id, std::move(params));
}
bool IOSSurfaceSoftware::SubmitFrame(GrContext* context) {