Chromium Code Reviews| Index: pkg/polymer/lib/src/css_analyzer.dart |
| diff --git a/pkg/polymer/lib/src/css_analyzer.dart b/pkg/polymer/lib/src/css_analyzer.dart |
| index a6c197b558794755d3e31cc477f0c1ce9da756e3..7097d77c7cc271b1c422c64cf9c1bb126e60d8d1 100644 |
| --- a/pkg/polymer/lib/src/css_analyzer.dart |
| +++ b/pkg/polymer/lib/src/css_analyzer.dart |
| @@ -47,7 +47,7 @@ class _AnalyzerCss { |
| void process(SourceFile file) { |
| var fileInfo = info[file.path]; |
| if (file.isStyleSheet || fileInfo.styleSheets.length > 0) { |
| - var styleSheets = processVars(fileInfo); |
| + var styleSheets = processVars(fileInfo.inputUrl, fileInfo); |
| // Add to list of all style sheets analyzed. |
| allStyleSheets.addAll(styleSheets); |
| @@ -55,7 +55,7 @@ class _AnalyzerCss { |
| // Process any components. |
| for (var component in fileInfo.declaredComponents) { |
| - var all = processVars(component); |
| + var all = processVars(fileInfo.inputUrl, component); |
| // Add to list of all style sheets analyzed. |
| allStyleSheets.addAll(all); |
| @@ -69,9 +69,9 @@ class _AnalyzerCss { |
| for (var tree in allStyleSheets) new _RemoveVarDefinitions().visitTree(tree); |
| } |
| - List<StyleSheet> processVars(var libraryInfo) { |
| + List<StyleSheet> processVars(var inputUrl, var libraryInfo) { |
| // Get list of all stylesheet(s) dependencies referenced from this file. |
| - var styleSheets = _dependencies(libraryInfo).toList(); |
| + var styleSheets = _dependencies(inputUrl, libraryInfo).toList(); |
| var errors = []; |
| css.analyze(styleSheets, errors: errors, options: |
| @@ -117,14 +117,9 @@ class _AnalyzerCss { |
| * return a list of all referenced stylesheet dependencies (@imports or <link |
| * rel="stylesheet" ..>). |
| */ |
| - Set<StyleSheet> _dependencies(var libraryInfo, {Set<StyleSheet> seen}) { |
| + Set<StyleSheet> _dependencies(var inputUrl, var libraryInfo, {Set<StyleSheet> seen}) { |
|
terry
2013/08/28 21:41:52
line length > 80?
Jennifer Messerly
2013/08/28 22:10:25
also no need for "var" on these parameters.
Signe
Siggi Cherem (dart-lang)
2013/08/29 00:34:15
funny, I was just copying the old code structure a
|
| if (seen == null) seen = new Set(); |
| - // Used to resolve all pathing information. |
| - var inputUrl = libraryInfo is FileInfo |
| - ? libraryInfo.inputUrl |
| - : (libraryInfo as ComponentInfo).declaringFile.inputUrl; |
| - |
| for (var styleSheet in libraryInfo.styleSheets) { |
| if (!seen.contains(styleSheet)) { |
| // TODO(terry): VM uses expandos to implement hashes. Currently, it's a |
| @@ -149,7 +144,8 @@ class _AnalyzerCss { |
| for (var ss in importInfo.styleSheets) { |
| var urls = findImportsInStyleSheet(ss, inputUrl, _messages); |
| for (var url in urls) { |
| - _dependencies(info[url.resolvedPath], seen: seen); |
| + var fileInfo = info[url.resolvedPath]; |
| + _dependencies(fileInfo.inputUrl, fileInfo, seen: seen); |
| } |
| } |
| } |