DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where native image decoders aren't working in release mode (flutter/engine#29254)

Browse Source
This commit is contained in:
Brandon DeRosier 2021-10-20 14:46:25 -07:00 committed by GitHub
parent c09458a9ed
commit 546f244afe
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/lib/ui/painting/image_generator_registry.cc
View File

@ -4,7 +4,6 @@
#include <algorithm>
#include "flutter/fml/trace_event.h"
#include "flutter/lib/ui/painting/image_generator_registry.h"
#include "third_party/skia/include/codec/SkCodec.h"
#include "third_party/skia/include/core/SkImageGenerator.h"
@ -48,8 +47,7 @@ ImageGeneratorRegistry::~ImageGeneratorRegistry() = default;
void ImageGeneratorRegistry::AddFactory(ImageGeneratorFactory factory,
int32_t priority) {
image_generator_factories_.insert(
{factory, priority, fml::tracing::TraceNonce()});
image_generator_factories_.insert({factory, priority, ++nonce_});
}
std::shared_ptr<ImageGenerator>

1
engine/src/flutter/lib/ui/painting/image_generator_registry.h
View File

@ -84,6 +84,7 @@ class ImageGeneratorRegistry {
using FactorySet = std::set<PrioritizedFactory, Compare>;
FactorySet image_generator_factories_;
size_t nonce_;
fml::WeakPtrFactory<ImageGeneratorRegistry> weak_factory_;
};

37
engine/src/flutter/lib/ui/painting/image_generator_registry_unittests.cc
View File

@ -111,5 +111,42 @@ TEST_F(ShellTest, DefaultGeneratorsTakePrecedentOverNegativePriority) {
ASSERT_EQ(result->GetInfo().width(), 3024);
}
TEST_F(ShellTest, DefaultGeneratorsTakePrecedentOverZeroPriority) {
ImageGeneratorRegistry registry;
registry.AddFactory(
[](sk_sp<SkData> buffer) {
return std::make_unique<FakeImageGenerator>(1337);
},
0);
// Fetch the generator and query for basic info.
auto result = registry.CreateCompatibleGenerator(LoadValidImageFixture());
// If the real width of the image pops out, then the default generator was
// returned rather than the fake one.
ASSERT_EQ(result->GetInfo().width(), 3024);
}
TEST_F(ShellTest, ImageGeneratorsWithSamePriorityCascadeChronologically) {
ImageGeneratorRegistry registry;
// Add 2 factories with the same high priority.
registry.AddFactory(
[](sk_sp<SkData> buffer) {
return std::make_unique<FakeImageGenerator>(1337);
},
5);
registry.AddFactory(
[](sk_sp<SkData> buffer) {
return std::make_unique<FakeImageGenerator>(7777);
},
5);
// Feed empty data so that Skia's image generators will reject it, but ours
// won't.
auto result = registry.CreateCompatibleGenerator(SkData::MakeEmpty());
ASSERT_EQ(result->GetInfo().width(), 1337);
}
} // namespace testing
} // namespace flutter