Changeset 88753 in webkit

Timestamp:

Jun 13, 2011 7:19:43 PM (13 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

2011-06-13 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Kent Tamura.

[EFL] Support for painting thumb of media slider
​https://bugs.webkit.org/show_bug.cgi?id=62174

Implement paintMediaSliderThumb() function to show thumb of media slider.
adjustSliderThumbSize() should be implemented in order to call paintMediaSliderThumb().

• platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::RenderThemeEfl): (WebCore::RenderThemeEfl::adjustSliderThumbSize): (WebCore::RenderThemeEfl::paintMediaSliderTrack): (WebCore::RenderThemeEfl::paintMediaSliderThumb): (WebCore::RenderThemeEfl::paintMediaCurrentTime):
• platform/efl/RenderThemeEfl.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-13  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Reviewed by Kent Tamura.
+
+        [EFL] Support for painting thumb of media slider
+        https://bugs.webkit.org/show_bug.cgi?id=62174
+
+        Implement paintMediaSliderThumb() function to show thumb of media slider.
+        adjustSliderThumbSize() should be implemented in order to call paintMediaSliderThumb().
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::RenderThemeEfl):
+        (WebCore::RenderThemeEfl::adjustSliderThumbSize):
+        (WebCore::RenderThemeEfl::paintMediaSliderTrack):
+        (WebCore::RenderThemeEfl::paintMediaSliderThumb):
+        (WebCore::RenderThemeEfl::paintMediaCurrentTime):
+        * platform/efl/RenderThemeEfl.h:
+
 2011-06-13  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

@@ -61 +61 @@
 // TODO: as objects are webpage/user defined and they can be very large.
 #define RENDER_THEME_EFL_PART_CACHE_MAX 32
+    
+static const int sliderThumbWidth = 12;
+static const int sliderThumbHeight = 12;
+
+#if ENABLE(VIDEO)
+static const int mediaSliderHeight = 14;
+static const int mediaSliderThumbWidth = 12;
+static const int mediaSliderThumbHeight = 12;
+#endif
 
 void RenderThemeEfl::adjustSizeConstraints(RenderStyle* style, FormType type) const
@@ -693 +702 @@
     , m_searchTextBackgroundColor(0, 0, 0, 0)
     , m_searchTextForegroundColor(0, 0, 0)
+    , m_sliderThumbColor(255, 0, 0) // red color.
 #if ENABLE(VIDEO)
-    , m_panelColor(220, 220, 195) // light tannish color.
-    , m_sliderColor(Color::white)
-    , m_mediaSliderHeight(14)
+    , m_mediaPanelColor(220, 220, 195) // light tannish color.
+    , m_mediaSliderColor(Color::white)
 #endif
     , m_canvas(0)
@@ -839 +848 @@
 }
 
+void RenderThemeEfl::adjustSliderThumbSize(RenderObject* o) const
+{
+    ControlPart part = o->style()->appearance();
+    if (part == SliderThumbVerticalPart || part == SliderThumbHorizontalPart) {
+        o->style()->setWidth(Length(sliderThumbHeight, Fixed));
+        o->style()->setHeight(Length(sliderThumbWidth, Fixed));
+    }
+#if ENABLE(VIDEO)
+    else if (part == MediaSliderThumbPart) {
+        o->style()->setWidth(Length(mediaSliderThumbWidth, Fixed));
+        o->style()->setHeight(Length(mediaSliderThumbHeight, Fixed));
+    }
+#endif
+}
+
 bool RenderThemeEfl::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
@@ -1180 +1204 @@
     GraphicsContext* context = info.context;
 
-    context->fillRect(FloatRect(rect), m_panelColor, ColorSpaceDeviceRGB);
-    context->fillRect(FloatRect(IntRect(rect.x(), rect.y() + (rect.height() - m_mediaSliderHeight) / 2,
-                                        rect.width(), m_mediaSliderHeight)), m_sliderColor, ColorSpaceDeviceRGB);
+    context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
+    context->fillRect(FloatRect(IntRect(rect.x(), rect.y() + (rect.height() - mediaSliderHeight) / 2,
+                                        rect.width(), mediaSliderHeight)), m_mediaSliderColor, ColorSpaceDeviceRGB);
 
     RenderStyle* style = object->style();
@@ -1223 +1247 @@
         sliderTopRight.move(0, rangeRect.height());
 
-        context->fillRect(FloatRect(rect), m_panelColor, ColorSpaceDeviceRGB);
+        context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
     }
     context->restore();
@@ -1231 +1255 @@
 bool RenderThemeEfl::paintMediaSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
+    info.context->fillRoundedRect(rect, IntSize(3, 3), IntSize(3, 3), IntSize(3, 3), IntSize(3, 3), m_sliderThumbColor, ColorSpaceDeviceRGB);
+    return true;
+}
+
+bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
+{
     notImplemented();
     return false;
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1241 +1271 @@
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
     notImplemented();
@@ -1247 +1277 @@
 }
 
-bool RenderThemeEfl::paintMediaVolumeSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    notImplemented();
-    return false;
-}
-
 bool RenderThemeEfl::paintMediaCurrentTime(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    info.context->fillRect(FloatRect(rect), m_panelColor, ColorSpaceDeviceRGB);
+    info.context->fillRect(FloatRect(rect), m_mediaPanelColor, ColorSpaceDeviceRGB);
     return true;
 }

trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

@@ -157 +157 @@
 
     virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
+
+    virtual void adjustSliderThumbSize(RenderObject*) const;
+
     virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
 
@@ -213 +216 @@
     Color m_searchTextBackgroundColor;
     Color m_searchTextForegroundColor;
-#if ENABLE(VIDEO)
-    Color m_panelColor;
-    Color m_sliderColor;
-    const int m_mediaSliderHeight;
+    Color m_sliderThumbColor;
+
+#if ENABLE(VIDEO)
+    Color m_mediaPanelColor;
+    Color m_mediaSliderColor;
 #endif
     Ecore_Evas* m_canvas;