Changeset 13247 in webkit
- Timestamp:
- Mar 10, 2006 10:58:31 AM (18 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r13245 r13247 1 2006-03-10 David Hyatt <hyatt@apple.com> 2 3 Rename FontRenderer to FontDataSet. 4 5 Reviewed by adele 6 7 * WebCore.xcodeproj/project.pbxproj: 8 * platform/Font.cpp: 9 (WebCore::Font::update): 10 * platform/Font.h: 11 * platform/FontDataSet.h: Added. 12 * platform/FontRenderer.h: Removed. 13 * platform/mac/FontMac.mm: 14 (WebCore::FontDataSet::~FontDataSet): 15 (WebCore::FontDataSet::getWebCoreFont): 16 (WebCore::FontDataSet::getRenderer): 17 (WebCore::FontDataSet::determinePitch): 18 (WebCore::FontDataSet::invalidate): 19 * platform/win/FontWin.cpp: 20 (WebCore::getCairoFont): 21 (WebCore::FontDataSet::~FontDataSet): 22 (WebCore::FontDataSet::determinePitch): 23 (WebCore::FontDataSet::invalidate): 24 (WebCore::FontDataSet::primaryCairoFont): 25 1 26 2006-03-09 Justin Garcia <justin.garcia@apple.com> 2 27 -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r13187 r13247 1014 1014 BCEA4948097F0F770094C9E4 /* BrowserExtensionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4946097F0F770094C9E4 /* BrowserExtensionMac.mm */; }; 1015 1015 BCEB377309B7BA3900CB38B1 /* FontMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEB377209B7BA3900CB38B1 /* FontMac.mm */; }; 1016 BCEB377609B7BB0D00CB38B1 /* Font Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEB377509B7BB0D00CB38B1 /* FontRenderer.h */; };1016 BCEB377609B7BB0D00CB38B1 /* FontDataSet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEB377509B7BB0D00CB38B1 /* FontDataSet.h */; }; 1017 1017 BCEF3434087B563E00BBF833 /* htmlfactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEF3432087B563E00BBF833 /* htmlfactory.cpp */; }; 1018 1018 BCEF3435087B563E00BBF833 /* htmlfactory.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEF3433087B563E00BBF833 /* htmlfactory.h */; }; … … 2101 2101 BCEACC8F0592E0AD009D6AEF /* xbl_docimpl.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = xbl_docimpl.h; path = xbl/xbl_docimpl.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 2102 2102 BCEB377209B7BA3900CB38B1 /* FontMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontMac.mm; sourceTree = "<group>"; }; 2103 BCEB377509B7BB0D00CB38B1 /* Font Renderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FontRenderer.h; path = platform/FontRenderer.h; sourceTree = "<group>"; };2103 BCEB377509B7BB0D00CB38B1 /* FontDataSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FontDataSet.h; path = platform/FontDataSet.h; sourceTree = "<group>"; }; 2104 2104 BCEF3432087B563E00BBF833 /* htmlfactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = htmlfactory.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 2105 2105 BCEF3433087B563E00BBF833 /* htmlfactory.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = htmlfactory.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; … … 3351 3351 BCC47E2409A3D6F100ADB771 /* FontFamily.cpp */, 3352 3352 BCC47E2509A3D6F100ADB771 /* FontFamily.h */, 3353 BCEB377509B7BB0D00CB38B1 /* Font Renderer.h */,3353 BCEB377509B7BB0D00CB38B1 /* FontDataSet.h */, 3354 3354 A823A75B09B6E53900B60641 /* GraphicsContext.cpp */, 3355 3355 935367E409AF77DD00D35CD6 /* GraphicsContext.h */, … … 4347 4347 A82398A609B3ACDB00B60641 /* PlugInInfoStore.h in Headers */, 4348 4348 A8239E0109B3CF8A00B60641 /* Logging.h in Headers */, 4349 BCEB377609B7BB0D00CB38B1 /* Font Renderer.h in Headers */,4349 BCEB377609B7BB0D00CB38B1 /* FontDataSet.h in Headers */, 4350 4350 C6D74AD509AA282E000B0A52 /* ModifySelectionListLevelCommand.h in Headers */, 4351 4351 6545F67109B82FED0013006F /* TransferJob.h in Headers */, -
trunk/WebCore/platform/Font.cpp
r13236 r13247 27 27 #include "Font.h" 28 28 29 #include "Font Renderer.h"29 #include "FontDataSet.h" 30 30 #include "GraphicsContext.h" 31 31 #include "khtml_settings.h" … … 73 73 // and could eventually be rectified by using RefPtrs for Fonts themselves. 74 74 if (!m_renderer) 75 m_renderer = new Font Renderer();75 m_renderer = new FontDataSet(); 76 76 m_renderer->invalidate(); 77 77 } -
trunk/WebCore/platform/Font.h
r13206 r13247 43 43 namespace WebCore { 44 44 45 class Font Renderer;45 class FontDataSet; 46 46 class GraphicsContext; 47 47 class IntRect; … … 121 121 #endif 122 122 123 // Metrics that we query the Font Rendererfor.123 // Metrics that we query the FontDataSet for. 124 124 int ascent() const; 125 125 int descent() const; … … 130 130 private: 131 131 FontDescription m_fontDescription; 132 mutable RefPtr<Font Renderer> m_renderer;132 mutable RefPtr<FontDataSet> m_renderer; 133 133 short m_letterSpacing; 134 134 short m_wordSpacing; -
trunk/WebCore/platform/FontDataSet.h
r13245 r13247 39 39 #endif 40 40 41 class Font Renderer : public Shared<FontRenderer>, Noncopyable {41 class FontDataSet : public Shared<FontDataSet>, Noncopyable { 42 42 public: 43 Font Renderer();44 ~Font Renderer();43 FontDataSet(); 44 ~FontDataSet(); 45 45 46 46 void invalidate(); -
trunk/WebCore/platform/mac/FontMac.mm
r13236 r13247 31 31 #import "FoundationExtras.h" 32 32 33 #import "Font Renderer.h"33 #import "FontDataSet.h" 34 34 #import "GraphicsContext.h" 35 35 #import "khtml_settings.h" … … 41 41 namespace WebCore { 42 42 43 Font Renderer::FontRenderer()43 FontDataSet::FontDataSet() 44 44 :m_pitch(UnknownPitch), m_renderer(nil) 45 45 { … … 47 47 } 48 48 49 Font Renderer::~FontRenderer()49 FontDataSet::~FontDataSet() 50 50 { 51 51 KWQRelease(m_renderer); … … 53 53 } 54 54 55 const WebCoreFont& Font Renderer::getWebCoreFont(const FontDescription& fontDescription) const55 const WebCoreFont& FontDataSet::getWebCoreFont(const FontDescription& fontDescription) const 56 56 { 57 57 if (!m_webCoreFont.font) { … … 72 72 } 73 73 74 id <WebCoreTextRenderer> Font Renderer::getRenderer(const FontDescription& fontDescription)74 id <WebCoreTextRenderer> FontDataSet::getRenderer(const FontDescription& fontDescription) 75 75 { 76 76 if (!m_renderer) … … 79 79 } 80 80 81 void Font Renderer::determinePitch(const FontDescription& fontDescription) const {81 void FontDataSet::determinePitch(const FontDescription& fontDescription) const { 82 82 KWQ_BLOCK_EXCEPTIONS; 83 83 if ([[WebCoreTextRendererFactory sharedFactory] isFontFixedPitch:getWebCoreFont(fontDescription)]) … … 88 88 } 89 89 90 void Font Renderer::invalidate()90 void FontDataSet::invalidate() 91 91 { 92 92 KWQRelease(m_renderer); -
trunk/WebCore/platform/win/FontWin.cpp
r13246 r13247 27 27 #include "Font.h" 28 28 29 #include "Font Renderer.h"29 #include "FontDataSet.h" 30 30 #include "GraphicsContext.h" 31 31 #include <cairo.h> … … 107 107 HFONT font = CreateFontIndirectW(&winfont); 108 108 109 // Windows will always give us valid pointer here, even if the face name is non-existent. We have to double-check109 // Windows will always give us a valid pointer here, even if the face name is non-existent. We have to double-check 110 110 // and see if the family name was really used. 111 111 HDC dc = GetDC((HWND)0); … … 148 148 } 149 149 150 Font Renderer::FontRenderer()150 FontDataSet::FontDataSet() 151 151 :m_pitch(UnknownPitch) 152 152 { … … 154 154 } 155 155 156 Font Renderer::~FontRenderer()156 FontDataSet::~FontDataSet() 157 157 { 158 158 deleteAllValues(m_fontSet); 159 159 } 160 160 161 void Font Renderer::determinePitch(const FontDescription& fontDescription) const161 void FontDataSet::determinePitch(const FontDescription& fontDescription) const 162 162 { 163 163 // FIXME: Implement this. … … 165 165 } 166 166 167 void Font Renderer::invalidate()167 void FontDataSet::invalidate() 168 168 { 169 169 // Delete the Cairo fonts. … … 172 172 } 173 173 174 CairoFont* Font Renderer::primaryCairoFont(const FontDescription& fontDescription) const174 CairoFont* FontDataSet::primaryCairoFont(const FontDescription& fontDescription) const 175 175 { 176 176 if (!m_fontSet.isEmpty())
Note: See TracChangeset
for help on using the changeset viewer.