Skip to content

Commit 3330623

Browse files
authored
Revert "[Impeller] switch Pipeline to use raw ptr instead of shared ptr for recorded references." (flutter/engine#57079)
Reverts flutter/engine#57015 fixes flutter#160004
1 parent b425a87 commit 3330623

File tree

21 files changed

+166
-235
lines changed

21 files changed

+166
-235
lines changed

engine/src/flutter/ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43017,8 +43017,6 @@ ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE
4301743017
ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE
4301843018
ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE
4301943019
ORIGIN: ../../../flutter/impeller/core/range.h + ../../../flutter/LICENSE
43020-
ORIGIN: ../../../flutter/impeller/core/raw_ptr.cc + ../../../flutter/LICENSE
43021-
ORIGIN: ../../../flutter/impeller/core/raw_ptr.h + ../../../flutter/LICENSE
4302243020
ORIGIN: ../../../flutter/impeller/core/resource_binder.cc + ../../../flutter/LICENSE
4302343021
ORIGIN: ../../../flutter/impeller/core/resource_binder.h + ../../../flutter/LICENSE
4302443022
ORIGIN: ../../../flutter/impeller/core/runtime_types.cc + ../../../flutter/LICENSE
@@ -45948,8 +45946,6 @@ FILE: ../../../flutter/impeller/core/platform.cc
4594845946
FILE: ../../../flutter/impeller/core/platform.h
4594945947
FILE: ../../../flutter/impeller/core/range.cc
4595045948
FILE: ../../../flutter/impeller/core/range.h
45951-
FILE: ../../../flutter/impeller/core/raw_ptr.cc
45952-
FILE: ../../../flutter/impeller/core/raw_ptr.h
4595345949
FILE: ../../../flutter/impeller/core/resource_binder.cc
4595445950
FILE: ../../../flutter/impeller/core/resource_binder.h
4595545951
FILE: ../../../flutter/impeller/core/runtime_types.cc

engine/src/flutter/impeller/core/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ impeller_component("core") {
2323
"platform.h",
2424
"range.cc",
2525
"range.h",
26-
"raw_ptr.cc",
27-
"raw_ptr.h",
2826
"resource_binder.cc",
2927
"resource_binder.h",
3028
"runtime_types.cc",

engine/src/flutter/impeller/core/raw_ptr.cc

Lines changed: 0 additions & 11 deletions
This file was deleted.

engine/src/flutter/impeller/core/raw_ptr.h

Lines changed: 0 additions & 84 deletions
This file was deleted.

engine/src/flutter/impeller/entity/contents/color_source_contents.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ class ColorSourceContents : public Contents {
104104
using PipelineBuilderMethod = std::shared_ptr<Pipeline<PipelineDescriptor>> (
105105
impeller::ContentContext::*)(ContentContextOptions) const;
106106
using PipelineBuilderCallback =
107-
std::function<PipelineRef(ContentContextOptions)>;
107+
std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>(
108+
ContentContextOptions)>;
108109
using CreateGeometryCallback =
109110
std::function<GeometryResult(const ContentContext& renderer,
110111
const Entity& entity,

engine/src/flutter/impeller/entity/contents/content_context.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,8 @@ void ContentContext::SetWireframe(bool wireframe) {
569569
wireframe_ = wireframe;
570570
}
571571

572-
PipelineRef ContentContext::GetCachedRuntimeEffectPipeline(
572+
std::shared_ptr<Pipeline<PipelineDescriptor>>
573+
ContentContext::GetCachedRuntimeEffectPipeline(
573574
const std::string& unique_entrypoint_name,
574575
const ContentContextOptions& options,
575576
const std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>()>&
@@ -579,7 +580,7 @@ PipelineRef ContentContext::GetCachedRuntimeEffectPipeline(
579580
if (it == runtime_effect_pipelines_.end()) {
580581
it = runtime_effect_pipelines_.insert(it, {key, create_callback()});
581582
}
582-
return raw_ptr(it->second);
583+
return it->second;
583584
}
584585

585586
void ContentContext::ClearCachedRuntimeEffectPipeline(

0 commit comments

Comments
 (0)