Changeset 88788 in webkit

Timestamp:

Jun 14, 2011 2:49:59 AM (13 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

2011-06-14 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

Replace RenderObject parameter with RenderStyle's in adjustSliderThumbSize.
Because, parameter of the function was changed. And, add constant variable to
paintMediaSliderThumb().

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-14  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
+
+        Replace RenderObject parameter with RenderStyle's in adjustSliderThumbSize.
+        Because, parameter of the function was changed. And, add constant variable to
+        paintMediaSliderThumb().
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::RenderThemeEfl):
+        (WebCore::RenderThemeEfl::adjustSliderThumbSize):
+        (WebCore::RenderThemeEfl::paintMediaSliderThumb):
+        * platform/efl/RenderThemeEfl.h:
+
 2011-06-14  Kent Tamura  <tkent@chromium.org>
 

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

@@ -698 +698 @@
     , m_searchTextBackgroundColor(0, 0, 0, 0)
     , m_searchTextForegroundColor(0, 0, 0)
-    , m_sliderThumbColor(255, 0, 0) // red color.
+    , m_sliderThumbColor(Color::darkGray)
 #if ENABLE(VIDEO)
     , m_mediaPanelColor(220, 220, 195) // light tannish color.
@@ -844 +844 @@
 }
 
-void RenderThemeEfl::adjustSliderThumbSize(RenderObject* o) const
-{
-    ControlPart part = o->style()->appearance();
+void RenderThemeEfl::adjustSliderThumbSize(RenderStyle* style) const
+{
+    ControlPart part = style->appearance();
     if (part == SliderThumbVerticalPart || part == SliderThumbHorizontalPart) {
-        o->style()->setWidth(Length(sliderThumbHeight, Fixed));
-        o->style()->setHeight(Length(sliderThumbWidth, Fixed));
+        style->setWidth(Length(sliderThumbHeight, Fixed));
+        style->setHeight(Length(sliderThumbWidth, Fixed));
     }
 #if ENABLE(VIDEO)
     else if (part == MediaSliderThumbPart) {
-        o->style()->setWidth(Length(mediaSliderThumbWidth, Fixed));
-        o->style()->setHeight(Length(mediaSliderThumbHeight, Fixed));
+        style->setWidth(Length(mediaSliderThumbWidth, Fixed));
+        style->setHeight(Length(mediaSliderThumbHeight, Fixed));
     }
 #endif
@@ -1251 +1251 @@
 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);
+    IntSize thumbRect(3, 3);
+    info.context->fillRoundedRect(rect, thumbRect, thumbRect, thumbRect, thumbRect, m_sliderThumbColor, ColorSpaceDeviceRGB);
     return true;
 }

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

@@ -158 +158 @@
     virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
 
-    virtual void adjustSliderThumbSize(RenderObject*) const;
+    virtual void adjustSliderThumbSize(RenderStyle*) const;
 
     virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);