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

Side by Side Diff: apps/moterm/moterm_view.h

Issue 2011713003: Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024 (Closed) Base URL: git@github.com:domokit/mojo.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 | « PRESUBMIT.py ('k') | apps/moterm/moterm_view.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 APPS_MOTERM_MOTERM_VIEW_H_ 5 #ifndef APPS_MOTERM_MOTERM_VIEW_H_
6 #define APPS_MOTERM_MOTERM_VIEW_H_ 6 #define APPS_MOTERM_MOTERM_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "apps/moterm/moterm_driver.h" 10 #include "apps/moterm/moterm_driver.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 base::WeakPtr<MotermDriver> driver_; 94 base::WeakPtr<MotermDriver> driver_;
95 // If set, called when we get |OnClosed()| or |OnDestroyed()| from the driver. 95 // If set, called when we get |OnClosed()| or |OnDestroyed()| from the driver.
96 mojo::Closure on_closed_callback_; 96 mojo::Closure on_closed_callback_;
97 97
98 mojo::ServiceProviderImpl service_provider_impl_; 98 mojo::ServiceProviderImpl service_provider_impl_;
99 mojo::BindingSet<mojo::terminal::Terminal> terminal_bindings_; 99 mojo::BindingSet<mojo::terminal::Terminal> terminal_bindings_;
100 100
101 // If we skip drawing despite being forced to, we should force the next draw. 101 // If we skip drawing despite being forced to, we should force the next draw.
102 bool force_next_draw_; 102 bool force_next_draw_;
103 103
104 skia::RefPtr<SkTypeface> regular_typeface_; 104 sk_sp<SkTypeface> regular_typeface_;
105 105
106 int ascent_; 106 int ascent_;
107 int line_height_; 107 int line_height_;
108 int advance_width_; 108 int advance_width_;
109 109
110 // Keyboard state. 110 // Keyboard state.
111 bool keypad_application_mode_; 111 bool keypad_application_mode_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(MotermView); 113 DISALLOW_COPY_AND_ASSIGN(MotermView);
114 }; 114 };
115 115
116 #endif // APPS_MOTERM_MOTERM_VIEW_H_ 116 #endif // APPS_MOTERM_MOTERM_VIEW_H_
OLDNEW
« no previous file with comments | « PRESUBMIT.py ('k') | apps/moterm/moterm_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698