Changeset 65813 in webkit
- Timestamp:
- Aug 23, 2010 9:18:44 AM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r65810 r65813 1 2010-08-23 Ryuan Choi <ryuan.choi@samsung.com> 2 3 Reviewed by Antonio Gomes. 4 5 [EFL] rendering was broken when missing plugin. 6 https://bugs.webkit.org/show_bug.cgi?id=43395 7 8 Implement RenderThemeEfl::systemFont to render "Missing plugin" when we 9 don't have proper plugin. 10 In this case, RenderEmbeddedObject::paintReplaced call systemFont and 11 pass returned font to GraphicsContext. 12 13 * platform/efl/RenderThemeEfl.cpp: 14 (WebCore::RenderThemeEfl::setDefaultFontSize): 15 (WebCore::RenderThemeEfl::systemFont): 16 * platform/efl/RenderThemeEfl.h: 17 1 18 2010-08-23 Pavel Podivilov <podivilov@chromium.org> 2 19 -
trunk/WebCore/platform/efl/RenderThemeEfl.cpp
r64570 r65813 27 27 #include "RenderThemeEfl.h" 28 28 29 #include "CSSValueKeywords.h" 29 30 #include "FileSystem.h" 30 31 #include "Frame.h" … … 632 633 } 633 634 635 float RenderThemeEfl::defaultFontSize = 16.0f; 636 634 637 RenderThemeEfl::RenderThemeEfl(Page* page) 635 638 : RenderTheme() … … 986 989 } 987 990 988 void RenderThemeEfl::systemFont(int, FontDescription&) const 989 { 990 // If you remove this notImplemented(), replace it with an comment that explains why. 991 notImplemented(); 992 } 993 994 } 991 void RenderThemeEfl::setDefaultFontSize(int size) 992 { 993 defaultFontSize = size; 994 } 995 996 void RenderThemeEfl::systemFont(int propId, FontDescription& fontDescription) const 997 { 998 // It was called by RenderEmbeddedObject::paintReplaced to render alternative string. 999 // To avoid cairo_error while rendering, fontDescription should be passed. 1000 DEFINE_STATIC_LOCAL(String, fontFace, ("Sans")); 1001 float fontSize = defaultFontSize; 1002 1003 fontDescription.firstFamily().setFamily(fontFace); 1004 fontDescription.setSpecifiedSize(fontSize); 1005 fontDescription.setIsAbsoluteSize(true); 1006 fontDescription.setGenericFamily(FontDescription::NoFamily); 1007 fontDescription.setWeight(FontWeightNormal); 1008 fontDescription.setItalic(false); 1009 } 1010 1011 } -
trunk/WebCore/platform/efl/RenderThemeEfl.h
r64570 r65813 143 143 virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const; 144 144 virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); 145 146 static void setDefaultFontSize(int size); 147 148 protected: 149 static float defaultFontSize; 150 145 151 private: 146 152 void createCanvas();
Note: See TracChangeset
for help on using the changeset viewer.