Changeset 65813 in webkit

Timestamp:

Aug 23, 2010 9:18:44 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Ryuan Choi <​ryuan.choi@samsung.com>

Reviewed by Antonio Gomes.

[EFL] rendering was broken when missing plugin.
​https://bugs.webkit.org/show_bug.cgi?id=43395

Implement RenderThemeEfl::systemFont to render "Missing plugin" when we
don't have proper plugin.
In this case, RenderEmbeddedObject::paintReplaced call systemFont and
pass returned font to GraphicsContext.

• platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::setDefaultFontSize): (WebCore::RenderThemeEfl::systemFont):
• platform/efl/RenderThemeEfl.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/efl/RenderThemeEfl.cpp (modified) (3 diffs)
• platform/efl/RenderThemeEfl.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] rendering was broken when missing plugin.
+        https://bugs.webkit.org/show_bug.cgi?id=43395
+
+        Implement RenderThemeEfl::systemFont to render "Missing plugin" when we
+        don't have proper plugin.
+        In this case, RenderEmbeddedObject::paintReplaced call systemFont and
+        pass returned font to GraphicsContext.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::setDefaultFontSize):
+        (WebCore::RenderThemeEfl::systemFont):
+        * platform/efl/RenderThemeEfl.h:
+
 2010-08-23  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -27 +27 @@
 #include "RenderThemeEfl.h"
 
+#include "CSSValueKeywords.h"
 #include "FileSystem.h"
 #include "Frame.h"
@@ -632 +633 @@
 }
 
+float RenderThemeEfl::defaultFontSize = 16.0f;
+
 RenderThemeEfl::RenderThemeEfl(Page* page)
     : RenderTheme()
@@ -986 +989 @@
 }
 
-void RenderThemeEfl::systemFont(int, FontDescription&) const
-{
-    // If you remove this notImplemented(), replace it with an comment that explains why.
-    notImplemented();
-}
-
-}
+void RenderThemeEfl::setDefaultFontSize(int size)
+{
+    defaultFontSize = size;
+}
+
+void RenderThemeEfl::systemFont(int propId, FontDescription& fontDescription) const
+{
+    // It was called by RenderEmbeddedObject::paintReplaced to render alternative string.
+    // To avoid cairo_error while rendering, fontDescription should be passed.
+    DEFINE_STATIC_LOCAL(String, fontFace, ("Sans"));
+    float fontSize = defaultFontSize;
+
+    fontDescription.firstFamily().setFamily(fontFace);
+    fontDescription.setSpecifiedSize(fontSize);
+    fontDescription.setIsAbsoluteSize(true);
+    fontDescription.setGenericFamily(FontDescription::NoFamily);
+    fontDescription.setWeight(FontWeightNormal);
+    fontDescription.setItalic(false);
+}
+
+}

trunk/WebCore/platform/efl/RenderThemeEfl.h

@@ -143 +143 @@
     virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
     virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
+
+    static void setDefaultFontSize(int size);
+
+protected:
+    static float defaultFontSize;
+
 private:
     void createCanvas();