File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -74,8 +74,9 @@ App::App() {
7474 if (settings.using_blink ) {
7575 blink::SetFontProvider (std::move (font_provider));
7676 } else {
77- blink::FontCollection::ForProcess ().GetFontCollection ()->PushFront (
78- sk_make_sp<txt::FuchsiaFontManager>(std::move (font_provider)));
77+ blink::FontCollection::ForProcess ().GetFontCollection ()->
78+ SetAssetFontManager (
79+ sk_make_sp<txt::FuchsiaFontManager>(std::move (font_provider)));
7980 }
8081
8182 context_->outgoing_services ()->AddService <app::ApplicationRunner>(
Original file line number Diff line number Diff line change @@ -411,8 +411,8 @@ void RuntimeHolder::HandlePlatformMessage(
411411}
412412
413413void RuntimeHolder::DidCreateMainIsolate (Dart_Isolate isolate) {
414- if (directory_asset_bundle_ ) {
415- blink::AssetFontSelector::Install (directory_asset_bundle_ );
414+ if (asset_provider_ ) {
415+ blink::AssetFontSelector::Install (asset_provider_ );
416416 } else if (asset_store_) {
417417 blink::AssetFontSelector::Install (asset_store_);
418418 }
@@ -504,7 +504,7 @@ void RuntimeHolder::InitRootBundle(std::vector<char> bundle) {
504504 FXL_LOG (ERROR ) << " Unable to load data dir" ;
505505 return ;
506506 }
507- directory_asset_bundle_ =
507+ asset_provider_ =
508508 fxl::MakeRefCounted<blink::DirectoryAssetBundle>(std::move (data_dir));
509509 }
510510}
@@ -532,8 +532,8 @@ bool RuntimeHolder::HandleAssetPlatformMessage(
532532
533533bool RuntimeHolder::GetAssetAsBuffer (const std::string& name,
534534 std::vector<uint8_t >* data) {
535- return (directory_asset_bundle_ &&
536- directory_asset_bundle_ ->GetAsBuffer (name, data)) ||
535+ return (asset_provider_ &&
536+ asset_provider_ ->GetAsBuffer (name, data)) ||
537537 (asset_store_ && asset_store_->GetAsBuffer (name, data));
538538}
539539
Original file line number Diff line number Diff line change 1111#include < unordered_set>
1212
1313#include " dart-pkg/fuchsia/sdk_ext/fuchsia.h"
14+ #include " flutter/assets/asset_provider.h"
1415#include " flutter/assets/directory_asset_bundle.h"
1516#include " flutter/assets/unzipper_provider.h"
1617#include " flutter/assets/zip_asset_store.h"
@@ -115,7 +116,7 @@ class RuntimeHolder : public blink::RuntimeDelegate,
115116 std::vector<char > root_bundle_data_;
116117 // TODO(zarah): Remove asset_store_ when flx is completely removed
117118 fxl::RefPtr<blink::ZipAssetStore> asset_store_;
118- fxl::RefPtr<blink::DirectoryAssetBundle> directory_asset_bundle_ ;
119+ fxl::RefPtr<blink::AssetProvider> asset_provider_ ;
119120 void * dylib_handle_ = nullptr ;
120121 std::unique_ptr<Rasterizer> rasterizer_;
121122 std::unique_ptr<blink::RuntimeController> runtime_;
You can’t perform that action at this time.
0 commit comments