Index: third_party/WebKit/Source/core/layout/ng/.clang-format |
diff --git a/third_party/WebKit/.clang-format b/third_party/WebKit/Source/core/layout/ng/.clang-format |
similarity index 67% |
copy from third_party/WebKit/.clang-format |
copy to third_party/WebKit/Source/core/layout/ng/.clang-format |
index 3f64e08e31c35b774aa4c062dc4216f7737b5b91..6fdf1dc888cb67d57d1a6bed866bbbff21e5eca7 100644 |
--- a/third_party/WebKit/.clang-format |
+++ b/third_party/WebKit/Source/core/layout/ng/.clang-format |
@@ -1,9 +1,8 @@ |
-BasedOnStyle: WebKit |
+# Defines the Chromium style for automatic reformatting. |
+# http://clang.llvm.org/docs/ClangFormatStyleOptions.html |
+BasedOnStyle: Chromium |
# This defaults to 'Auto'. Explicitly set it for a while, so that |
# 'vector<vector<int> >' in existing files gets formatted to |
# 'vector<vector<int>>'. ('Auto' means that clang-format will only use |
# 'int>>' if the file already contains at least one such instance.) |
Standard: Cpp11 |
- |
-# TODO(thakis): Consider enabling this. |
-SortIncludes: false |