Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Side by Side Diff: components/font_service/font_service_app.cc

Issue 1922153004: Update font_service to understand 'oblique'. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/font_service/public/interfaces/font_service.mojom » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/font_service/font_service_app.h" 5 #include "components/font_service/font_service_app.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/files/file.h" 9 #include "base/files/file.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "mojo/platform_handle/platform_handle_functions.h" 11 #include "mojo/platform_handle/platform_handle_functions.h"
12 #include "services/shell/public/cpp/connection.h" 12 #include "services/shell/public/cpp/connection.h"
13 13
14 static_assert(static_cast<uint32_t>(SkFontStyle::kUpright_Slant) == 14 static_assert(static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==
15 static_cast<uint32_t>(font_service::TypefaceSlant::ROMAN), 15 static_cast<uint32_t>(font_service::TypefaceSlant::ROMAN),
16 "Skia and font service flags must match"); 16 "Skia and font service flags must match");
17 static_assert(static_cast<uint32_t>(SkFontStyle::kItalic_Slant) == 17 static_assert(static_cast<uint32_t>(SkFontStyle::kItalic_Slant) ==
18 static_cast<uint32_t>(font_service::TypefaceSlant::ITALIC), 18 static_cast<uint32_t>(font_service::TypefaceSlant::ITALIC),
19 "Skia and font service flags must match"); 19 "Skia and font service flags must match");
20 static_assert(static_cast<uint32_t>(SkFontStyle::kOblique_Slant) ==
21 static_cast<uint32_t>(font_service::TypefaceSlant::OBLIQUE),
22 "Skia and font service flags must match");
20 23
21 namespace { 24 namespace {
22 25
23 mojo::ScopedHandle GetHandleForPath(const base::FilePath& path) { 26 mojo::ScopedHandle GetHandleForPath(const base::FilePath& path) {
24 if (path.empty()) 27 if (path.empty())
25 return mojo::ScopedHandle(); 28 return mojo::ScopedHandle();
26 29
27 mojo::ScopedHandle to_pass; 30 mojo::ScopedHandle to_pass;
28 base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ); 31 base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
29 if (!file.IsValid()) { 32 if (!file.IsValid()) {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 int count = paths_.size(); 125 int count = paths_.size();
123 for (int i = 0; i < count; ++i) { 126 for (int i = 0; i < count; ++i) {
124 if (path == paths_[i]) 127 if (path == paths_[i])
125 return i; 128 return i;
126 } 129 }
127 paths_.emplace_back(path); 130 paths_.emplace_back(path);
128 return count; 131 return count;
129 } 132 }
130 133
131 } // namespace font_service 134 } // namespace font_service
OLDNEW
« no previous file with comments | « no previous file | components/font_service/public/interfaces/font_service.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698