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

Side by Side Diff: public/web/WebFontDescription.h

Issue 455883003: Cleanup namespace usage in public/web/Web[A-M]*.h. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « public/web/WebElementCollection.h ('k') | public/web/WebFormControlElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebFontDescription_h 31 #ifndef WebFontDescription_h
32 #define WebFontDescription_h 32 #define WebFontDescription_h
33 33
34 #include "../platform/WebString.h" 34 #include "../platform/WebString.h"
35 35
36 #if BLINK_IMPLEMENTATION 36 namespace blink {
37 namespace blink { class FontDescription; }
38 #endif
39 37
40 namespace blink { 38 class FontDescription;
41 39
42 struct WebFontDescription { 40 struct WebFontDescription {
43 enum GenericFamily { 41 enum GenericFamily {
44 GenericFamilyNone, 42 GenericFamilyNone,
45 GenericFamilyStandard, 43 GenericFamilyStandard,
46 GenericFamilySerif, 44 GenericFamilySerif,
47 GenericFamilySansSerif, 45 GenericFamilySansSerif,
48 GenericFamilyMonospace, 46 GenericFamilyMonospace,
49 GenericFamilyCursive, 47 GenericFamilyCursive,
50 GenericFamilyFantasy 48 GenericFamilyFantasy
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 float size; 86 float size;
89 bool italic; 87 bool italic;
90 bool smallCaps; 88 bool smallCaps;
91 Weight weight; 89 Weight weight;
92 Smoothing smoothing; 90 Smoothing smoothing;
93 91
94 short letterSpacing; 92 short letterSpacing;
95 short wordSpacing; 93 short wordSpacing;
96 94
97 #if BLINK_IMPLEMENTATION 95 #if BLINK_IMPLEMENTATION
98 WebFontDescription(const blink::FontDescription&); 96 WebFontDescription(const FontDescription&);
99 97 operator FontDescription() const;
100 operator blink::FontDescription() const;
101 #endif 98 #endif
102 }; 99 };
103 100
104 } // namespace blink 101 } // namespace blink
105 102
106 #endif 103 #endif
OLDNEW
« no previous file with comments | « public/web/WebElementCollection.h ('k') | public/web/WebFormControlElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698