Source/web/WebFontDescription.cpp - Issue 468083003: Cleanup namespace usage in Source/web/Web[A-H]*.cpp

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

Issue 468083003: Cleanup namespace usage in Source/web/Web[A-H]*.cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebasing 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

OLD	NEW
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 Loading...
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 "public/web/WebFontDescription.h"	32 #include "public/web/WebFontDescription.h"

33	33

34 #include "platform/fonts/FontDescription.h"	34 #include "platform/fonts/FontDescription.h"

35	35

36 using namespace blink;

37

38 namespace blink {	36 namespace blink {

39	37

40 WebFontDescription::WebFontDescription(const FontDescription& desc)	38 WebFontDescription::WebFontDescription(const FontDescription& desc)

41 {	39 {

42 family = desc.family().family();	40 family = desc.family().family();

43 genericFamily = static_cast<GenericFamily>(desc.genericFamily());	41 genericFamily = static_cast<GenericFamily>(desc.genericFamily());

44 size = desc.specifiedSize();	42 size = desc.specifiedSize();

45 italic = desc.style() == FontStyleItalic;	43 italic = desc.style() == FontStyleItalic;

46 smallCaps = desc.variant() == FontVariantSmallCaps;	44 smallCaps = desc.variant() == FontVariantSmallCaps;

47 weight = static_cast<Weight>(desc.weight());	45 weight = static_cast<Weight>(desc.weight());

48 smoothing = static_cast<Smoothing>(desc.fontSmoothing());	46 smoothing = static_cast<Smoothing>(desc.fontSmoothing());

49 letterSpacing = desc.letterSpacing();	47 letterSpacing = desc.letterSpacing();

50 wordSpacing = desc.wordSpacing();	48 wordSpacing = desc.wordSpacing();

51 }	49 }

52	50

53 WebFontDescription::operator blink::FontDescription() const	51 WebFontDescription::operator FontDescription() const

54 {	52 {

55 FontFamily fontFamily;	53 FontFamily fontFamily;

56 fontFamily.setFamily(family);	54 fontFamily.setFamily(family);

57	55

58 FontDescription desc;	56 FontDescription desc;

59 desc.setFamily(fontFamily);	57 desc.setFamily(fontFamily);

60 desc.setGenericFamily(static_cast<FontDescription::GenericFamilyType>(generi cFamily));	58 desc.setGenericFamily(static_cast<FontDescription::GenericFamilyType>(generi cFamily));

61 desc.setSpecifiedSize(size);	59 desc.setSpecifiedSize(size);

62 desc.setComputedSize(size);	60 desc.setComputedSize(size);

63 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal);	61 desc.setStyle(italic ? FontStyleItalic : FontStyleNormal);

64 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal);	62 desc.setVariant(smallCaps ? FontVariantSmallCaps : FontVariantNormal);

65 desc.setWeight(static_cast<FontWeight>(weight));	63 desc.setWeight(static_cast<FontWeight>(weight));

66 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing));	64 desc.setFontSmoothing(static_cast<FontSmoothingMode>(smoothing));

67 desc.setLetterSpacing(letterSpacing);	65 desc.setLetterSpacing(letterSpacing);

68 desc.setWordSpacing(wordSpacing);	66 desc.setWordSpacing(wordSpacing);

69 return desc;	67 return desc;

70 }	68 }

71	69

72 } // namespace blink	70 } // namespace blink

OLD	NEW

« no previous file with comments | « Source/web/WebFileChooserCompletionImpl.cpp ('k') | Source/web/WebFontImpl.cpp » ('j') | no next file with comments »