From 357d457f760380fa95fcc42712f65459cfa45b22 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Thu, 16 Jul 2015 17:07:49 -0700 Subject: [PATCH] Update Sky code to account for changes in Chromium - 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. --- engine/src/flutter/sky/tools/packager/loader.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/src/flutter/sky/tools/packager/loader.cc b/engine/src/flutter/sky/tools/packager/loader.cc index 9b5e0240c98..397eacb345d 100644 --- a/engine/src/flutter/sky/tools/packager/loader.cc +++ b/engine/src/flutter/sky/tools/packager/loader.cc @@ -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);