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

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

Issue 1711483004: Replace use of SkTDArray with std::vector in font code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/font_service_app.cc » ('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 #ifndef COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_ 5 #ifndef COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
6 #define COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_ 6 #define COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <vector>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "components/font_service/public/interfaces/font_service.mojom.h" 12 #include "components/font_service/public/interfaces/font_service.mojom.h"
12 #include "mojo/public/cpp/bindings/weak_binding_set.h" 13 #include "mojo/public/cpp/bindings/weak_binding_set.h"
13 #include "mojo/services/tracing/public/cpp/tracing_impl.h" 14 #include "mojo/services/tracing/public/cpp/tracing_impl.h"
14 #include "mojo/shell/public/cpp/interface_factory.h" 15 #include "mojo/shell/public/cpp/interface_factory.h"
15 #include "mojo/shell/public/cpp/shell_client.h" 16 #include "mojo/shell/public/cpp/shell_client.h"
16 #include "skia/ext/skia_utils_base.h" 17 #include "skia/ext/skia_utils_base.h"
17 18
18 namespace font_service { 19 namespace font_service {
(...skipping 23 matching lines...) Expand all
42 const OpenStreamCallback& callback) override; 43 const OpenStreamCallback& callback) override;
43 44
44 int FindOrAddPath(const SkString& path); 45 int FindOrAddPath(const SkString& path);
45 46
46 mojo::WeakBindingSet<FontService> bindings_; 47 mojo::WeakBindingSet<FontService> bindings_;
47 48
48 mojo::TracingImpl tracing_; 49 mojo::TracingImpl tracing_;
49 50
50 // We don't want to leak paths to our callers; we thus enumerate the paths of 51 // We don't want to leak paths to our callers; we thus enumerate the paths of
51 // fonts. 52 // fonts.
52 SkTDArray<SkString*> paths_; 53 std::vector<SkString> paths_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(FontServiceApp); 55 DISALLOW_COPY_AND_ASSIGN(FontServiceApp);
55 }; 56 };
56 57
57 } // namespace font_service 58 } // namespace font_service
58 59
59 #endif // COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_ 60 #endif // COMPONENTS_FONT_SERVICE_FONT_SERVICE_APP_H_
OLDNEW
« no previous file with comments | « no previous file | components/font_service/font_service_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698