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

Side by Side Diff: Source/core/css/CSSFontFace.h

Issue 103273002: CSSSegmentedFontFaceCache should not know about Document. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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 | « no previous file | Source/core/css/CSSFontFace.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) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 18 matching lines...) Expand all
29 #include "core/css/CSSFontFaceSource.h" 29 #include "core/css/CSSFontFaceSource.h"
30 #include "core/css/FontFace.h" 30 #include "core/css/FontFace.h"
31 #include "wtf/Forward.h" 31 #include "wtf/Forward.h"
32 #include "wtf/PassRefPtr.h" 32 #include "wtf/PassRefPtr.h"
33 #include "wtf/RefCounted.h" 33 #include "wtf/RefCounted.h"
34 #include "wtf/Vector.h" 34 #include "wtf/Vector.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 37
38 class CSSSegmentedFontFace; 38 class CSSSegmentedFontFace;
39 class Document;
39 class FontDescription; 40 class FontDescription;
40 class SimpleFontData; 41 class SimpleFontData;
42 class StyleRuleFontFace;
41 43
42 // FIXME: Can this be a subclass of FontFace? 44 // FIXME: Can this be a subclass of FontFace?
43 class CSSFontFace : public RefCounted<CSSFontFace> { 45 class CSSFontFace : public RefCounted<CSSFontFace> {
44 public: 46 public:
45 static PassRefPtr<CSSFontFace> create(PassRefPtr<FontFace> fontFace) { retur n adoptRef(new CSSFontFace(fontFace)); } 47 static PassRefPtr<CSSFontFace> create(PassRefPtr<FontFace> fontFace) { retur n adoptRef(new CSSFontFace(fontFace)); }
48 static PassRefPtr<CSSFontFace> createFromStyleRule(Document*, const StyleRul eFontFace*);
46 49
47 class UnicodeRangeSet; 50 class UnicodeRangeSet;
48 51
49 FontFace* fontFace() const { return m_fontFace.get(); } 52 FontFace* fontFace() const { return m_fontFace.get(); }
50 53
51 UnicodeRangeSet& ranges() { return m_ranges; } 54 UnicodeRangeSet& ranges() { return m_ranges; }
52 55
53 void setSegmentedFontFace(CSSSegmentedFontFace*); 56 void setSegmentedFontFace(CSSSegmentedFontFace*);
54 void clearSegmentedFontFace() { m_segmentedFontFace = 0; } 57 void clearSegmentedFontFace() { m_segmentedFontFace = 0; }
55 58
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 UnicodeRangeSet m_ranges; 109 UnicodeRangeSet m_ranges;
107 CSSSegmentedFontFace* m_segmentedFontFace; 110 CSSSegmentedFontFace* m_segmentedFontFace;
108 Vector<OwnPtr<CSSFontFaceSource> > m_sources; 111 Vector<OwnPtr<CSSFontFaceSource> > m_sources;
109 CSSFontFaceSource* m_activeSource; 112 CSSFontFaceSource* m_activeSource;
110 RefPtr<FontFace> m_fontFace; 113 RefPtr<FontFace> m_fontFace;
111 }; 114 };
112 115
113 } 116 }
114 117
115 #endif 118 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/css/CSSFontFace.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698