Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -43017,8 +43017,6 @@ ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/range.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/raw_ptr.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/raw_ptr.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/resource_binder.cc + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/resource_binder.h + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/impeller/core/runtime_types.cc + ../../../flutter/LICENSE
Expand Down Expand Up @@ -45948,8 +45946,6 @@ FILE: ../../../flutter/impeller/core/platform.cc
FILE: ../../../flutter/impeller/core/platform.h
FILE: ../../../flutter/impeller/core/range.cc
FILE: ../../../flutter/impeller/core/range.h
FILE: ../../../flutter/impeller/core/raw_ptr.cc
FILE: ../../../flutter/impeller/core/raw_ptr.h
FILE: ../../../flutter/impeller/core/resource_binder.cc
FILE: ../../../flutter/impeller/core/resource_binder.h
FILE: ../../../flutter/impeller/core/runtime_types.cc
Expand Down
2 changes: 0 additions & 2 deletions impeller/core/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ impeller_component("core") {
"platform.h",
"range.cc",
"range.h",
"raw_ptr.cc",
"raw_ptr.h",
"resource_binder.cc",
"resource_binder.h",
"runtime_types.cc",
Expand Down
11 changes: 0 additions & 11 deletions impeller/core/raw_ptr.cc

This file was deleted.

84 changes: 0 additions & 84 deletions impeller/core/raw_ptr.h

This file was deleted.

3 changes: 2 additions & 1 deletion impeller/entity/contents/color_source_contents.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ class ColorSourceContents : public Contents {
using PipelineBuilderMethod = std::shared_ptr<Pipeline<PipelineDescriptor>> (
impeller::ContentContext::*)(ContentContextOptions) const;
using PipelineBuilderCallback =
std::function<PipelineRef(ContentContextOptions)>;
std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>(
ContentContextOptions)>;
using CreateGeometryCallback =
std::function<GeometryResult(const ContentContext& renderer,
const Entity& entity,
Expand Down
5 changes: 3 additions & 2 deletions impeller/entity/contents/content_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,8 @@ void ContentContext::SetWireframe(bool wireframe) {
wireframe_ = wireframe;
}

PipelineRef ContentContext::GetCachedRuntimeEffectPipeline(
std::shared_ptr<Pipeline<PipelineDescriptor>>
ContentContext::GetCachedRuntimeEffectPipeline(
const std::string& unique_entrypoint_name,
const ContentContextOptions& options,
const std::function<std::shared_ptr<Pipeline<PipelineDescriptor>>()>&
Expand All @@ -579,7 +580,7 @@ PipelineRef ContentContext::GetCachedRuntimeEffectPipeline(
if (it == runtime_effect_pipelines_.end()) {
it = runtime_effect_pipelines_.insert(it, {key, create_callback()});
}
return raw_ptr(it->second);
return it->second;
}

void ContentContext::ClearCachedRuntimeEffectPipeline(
Expand Down
Loading
Loading