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

Side by Side Diff: Source/web/WebFontDescription.cpp

Issue 48113009: Move Font related classes to Source/platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mac export Created 7 years, 1 month 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 | « Source/web/PopupListBox.cpp ('k') | Source/web/WebFontImpl.cpp » ('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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 #include "config.h" 31 #include "config.h"
32 #include "WebFontDescription.h" 32 #include "WebFontDescription.h"
33 33
34 #include "core/platform/graphics/FontDescription.h" 34 #include "platform/fonts/FontDescription.h"
35 35
36 using namespace WebCore; 36 using namespace WebCore;
37 37
38 namespace WebKit { 38 namespace WebKit {
39 39
40 WebFontDescription::WebFontDescription(const FontDescription& desc, 40 WebFontDescription::WebFontDescription(const FontDescription& desc,
41 short fontLetterSpacing, short fontWordSp acing) 41 short fontLetterSpacing, short fontWordSp acing)
42 { 42 {
43 family = desc.family().family(); 43 family = desc.family().family();
44 genericFamily = static_cast<GenericFamily>(desc.genericFamily()); 44 genericFamily = static_cast<GenericFamily>(desc.genericFamily());
(...skipping 17 matching lines...) Expand all
62 desc.setSpecifiedSize(size); 62 desc.setSpecifiedSize(size);
63 desc.setComputedSize(size); 63 desc.setComputedSize(size);
64 desc.setItalic(italic); 64 desc.setItalic(italic);
65 desc.setSmallCaps(smallCaps); 65 desc.setSmallCaps(smallCaps);
66 desc.setWeight(static_cast<FontWeight>(weight)); 66 desc.setWeight(static_cast<FontWeight>(weight));
67 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing)); 67 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing));
68 return desc; 68 return desc;
69 } 69 }
70 70
71 } // namespace WebKit 71 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/PopupListBox.cpp ('k') | Source/web/WebFontImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698