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

Update Sky code to account for changes in Chromium

Browse Source 
- Add missing dependencies caught by gn's new stricter checker
- Update opentype code to use new OTS API. This code is updated from HEAD
  Blink.
- Add base dependency to wtf to avoid redefining marcos from base/macros.h
- Update callers of various base string utility functions to use base
  namespace.
This commit is contained in:
Adam Barth 2015-07-16 17:07:49 -07:00
parent 800da851f4
commit 357d457f76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/flutter/sky/tools/packager/loader.cc
View File

@ -57,16 +57,16 @@ Loader::Loader(const base::FilePath& package_root)
}
std::string Loader::CanonicalizePackageURL(std::string url) {
DCHECK(StartsWithASCII(url, "package:", true));
ReplaceFirstSubstringAfterOffset(&url, 0, "package:", "");
DCHECK(base::StartsWithASCII(url, "package:", true));
base::ReplaceFirstSubstringAfterOffset(&url, 0, "package:", "");
return package_root_.Append(url).AsUTF8Unsafe();
}
Dart_Handle Loader::CanonicalizeURL(Dart_Handle library, Dart_Handle url) {
std::string string = StringFromDart(url);
if (StartsWithASCII(string, "dart:", true))
if (base::StartsWithASCII(string, "dart:", true))
return url;
if (StartsWithASCII(string, "package:", true))
if (base::StartsWithASCII(string, "package:", true))
return StringToDart(CanonicalizePackageURL(string));
base::FilePath base_path(StringFromDart(Dart_LibraryUrl(library)));
base::FilePath resolved_path = base_path.DirName().Append(string);