third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.mm - Issue 56198: Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of...

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.mm

Issue 56198: Roll out dominantScript, getGenericFontForScript patches to unfork a bunch of... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 8 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 | « third_party/WebKit/WebCore/rendering/RenderThemeChromiumMac.h ('k') | third_party/WebKit/WebCore/rendering/RenderThemeChromiumWin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.

3 * Copyright (C) 2008, 2009 Google, Inc.	3 * Copyright (C) 2008, 2009 Google, Inc.

4 *	4 *

5 * This library is free software; you can redistribute it and/or	5 * This library is free software; you can redistribute it and/or

6 * modify it under the terms of the GNU Library General Public	6 * modify it under the terms of the GNU Library General Public

7 * License as published by the Free Software Foundation; either	7 * License as published by the Free Software Foundation; either

8 * version 2 of the License, or (at your option) any later version.	8 * version 2 of the License, or (at your option) any later version.

9 *	9 *

10 * This library is distributed in the hope that it will be useful,	10 * This library is distributed in the hope that it will be useful,

(...skipping 15 matching lines...) Expand all Loading...
26 #import "config.h"	26 #import "config.h"

27 #import "RenderThemeChromiumMac.h"	27 #import "RenderThemeChromiumMac.h"

28	28

29 #import <Carbon/Carbon.h>	29 #import <Carbon/Carbon.h>

30 #import <Cocoa/Cocoa.h>	30 #import <Cocoa/Cocoa.h>

31 #import <math.h>	31 #import <math.h>

32	32

33 #import "BitmapImage.h"	33 #import "BitmapImage.h"

34 #import "CSSStyleSelector.h"	34 #import "CSSStyleSelector.h"

35 #import "CSSValueKeywords.h"	35 #import "CSSValueKeywords.h"

36 #import "Document.h"

37 #import "Element.h"	36 #import "Element.h"

38 #import "FoundationExtras.h"	37 #import "FoundationExtras.h"

39 #import "FrameView.h"	38 #import "FrameView.h"

40 #import "GraphicsContext.h"	39 #import "GraphicsContext.h"

41 #import "HTMLInputElement.h"	40 #import "HTMLInputElement.h"

42 #import "HTMLMediaElement.h"	41 #import "HTMLMediaElement.h"

43 #import "HTMLNames.h"	42 #import "HTMLNames.h"

44 #import "Image.h"	43 #import "Image.h"

45 #import "LocalCurrentGraphicsContext.h"	44 #import "LocalCurrentGraphicsContext.h"

46 #import "MediaControlElements.h"	45 #import "MediaControlElements.h"

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
185 FontWeight700,	184 FontWeight700,

186 FontWeight800,	185 FontWeight800,

187 FontWeight800,	186 FontWeight800,

188 FontWeight900,	187 FontWeight900,

189 FontWeight900,	188 FontWeight900,

190 FontWeight900	189 FontWeight900

191 };	190 };

192 return fontWeights[appKitFontWeight - 1];	191 return fontWeights[appKitFontWeight - 1];

193 }	192 }

194	193

195 void RenderThemeChromiumMac::systemFont(int cssValueId, Document* document, Font Description& fontDescription) const	194 void RenderThemeChromiumMac::systemFont(int cssValueId, FontDescription& fontDes cription) const

196 {	195 {

197 static FontDescription systemFont;	196 static FontDescription systemFont;

198 static FontDescription smallSystemFont;	197 static FontDescription smallSystemFont;

199 static FontDescription menuFont;	198 static FontDescription menuFont;

200 static FontDescription labelFont;	199 static FontDescription labelFont;

201 static FontDescription miniControlFont;	200 static FontDescription miniControlFont;

202 static FontDescription smallControlFont;	201 static FontDescription smallControlFont;

203 static FontDescription controlFont;	202 static FontDescription controlFont;

204	203

205 FontDescription* cachedDesc;	204 FontDescription* cachedDesc;

(...skipping 1767 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1973 [m_sliderThumbVertical.get() setTitle:nil];	1972 [m_sliderThumbVertical.get() setTitle:nil];

1974 [m_sliderThumbVertical.get() setSliderType:NSLinearSlider];	1973 [m_sliderThumbVertical.get() setSliderType:NSLinearSlider];

1975 [m_sliderThumbVertical.get() setControlSize:NSSmallControlSize];	1974 [m_sliderThumbVertical.get() setControlSize:NSSmallControlSize];

1976 [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];	1975 [m_sliderThumbVertical.get() setFocusRingType:NSFocusRingTypeExterior];

1977 }	1976 }

1978	1977

1979 return m_sliderThumbVertical.get();	1978 return m_sliderThumbVertical.get();

1980 }	1979 }

1981	1980

1982 } // namespace WebCore	1981 } // namespace WebCore

OLD	NEW