OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "gpu/tools/compositor_model_bench/render_tree.h" | 5 #include "gpu/tools/compositor_model_bench/render_tree.h" |
6 | 6 |
7 #include <sstream> | 7 #include <sstream> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/file_util.h" | |
11 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| 11 #include "base/files/file_util.h" |
12 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
13 #include "base/json/json_writer.h" | 13 #include "base/json/json_writer.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 | 17 |
18 #include "gpu/tools/compositor_model_bench/shaders.h" | 18 #include "gpu/tools/compositor_model_bench/shaders.h" |
19 | 19 |
20 using base::JSONReader; | 20 using base::JSONReader; |
21 using base::JSONWriter; | 21 using base::JSONWriter; |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
475 base::DictionaryValue* v = static_cast<base::DictionaryValue*>(root.get()); | 475 base::DictionaryValue* v = static_cast<base::DictionaryValue*>(root.get()); |
476 RenderNode* tree = InterpretContentLayer(v); | 476 RenderNode* tree = InterpretContentLayer(v); |
477 return tree; | 477 return tree; |
478 } else { | 478 } else { |
479 LOG(ERROR) << path.LossyDisplayName() << | 479 LOG(ERROR) << path.LossyDisplayName() << |
480 " doesn not encode a JSON dictionary."; | 480 " doesn not encode a JSON dictionary."; |
481 return NULL; | 481 return NULL; |
482 } | 482 } |
483 } | 483 } |
484 | 484 |
OLD | NEW |