Changeset 88294 in webkit

Timestamp:

Jun 7, 2011 5:26:11 PM (13 years ago)

Author:

tkent@chromium.org

Message:

2011-06-07 Kent Tamura <​tkent@chromium.org>

Reviewed by Andreas Kling.

[Qt] RenderThemeQt::adjustSliderThumbSize() should not refer to the parent style.
​https://bugs.webkit.org/show_bug.cgi?id=62207

• css/mediaControlsQt.css: Add comments. (audio::-webkit-media-controls-timeline): (video::-webkit-media-controls-timeline): (audio::-webkit-media-controls-volume-slider): (video::-webkit-media-controls-volume-slider):
• platform/qt/RenderThemeQt.cpp: Use fixed values to avoid referring to o->parent(). (WebCore::RenderThemeQt::adjustSliderThumbSize):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/mediaControlsQt.css (modified) (4 diffs)
• platform/qt/RenderThemeQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-07  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] RenderThemeQt::adjustSliderThumbSize() should not refer to the parent style.
+        https://bugs.webkit.org/show_bug.cgi?id=62207
+
+        * css/mediaControlsQt.css: Add comments.
+        (audio::-webkit-media-controls-timeline):
+        (video::-webkit-media-controls-timeline):
+        (audio::-webkit-media-controls-volume-slider):
+        (video::-webkit-media-controls-volume-slider):
+        * platform/qt/RenderThemeQt.cpp: Use fixed values to avoid referring to o->parent().
+        (WebCore::RenderThemeQt::adjustSliderThumbSize):
+
 2011-06-07  Sailesh Agrawal  <sail@chromium.org>
 

trunk/Source/WebCore/css/mediaControlsQt.css

@@ -150 +150 @@
 
 audio::-webkit-media-controls-timeline {
-    height: 12px;
+    height: 12px; /* See RenderThemeQt::adjustSliderThumbSize(). */
     padding: 6px 8px;
     margin: 5px 3px;
@@ -156 +156 @@
 
 video::-webkit-media-controls-timeline {
-    height: 12px;
+    height: 12px; /* See RenderThemeQt::adjustSliderThumbSize(). */
     padding: 6px 8px;
     margin: 5px 3px;
@@ -180 +180 @@
     position: absolute;
 
-    width: 12px;
+    width: 12px; /* See RenderThemeQt::adjustSliderThumbSize(). */
     padding: 6px;
     height: 88px;
@@ -191 +191 @@
     position: absolute;
 
-    width: 12px;
+    width: 12px; /* See RenderThemeQt::adjustSliderThumbSize(). */
     padding: 6px;
     height: 88px;

trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

@@ -1466 +1466 @@
 void RenderThemeQt::adjustSliderThumbSize(RenderObject* o) const
 {
+    // timelineThumbHeight should match the height property of -webkit-media-controls-timeline in mediaControlsQt.css.
+    const int timelineThumbHeight = 12;
+    const int timelineThumbWidth = timelineThumbHeight / 3;
+    // volumeThumbWidth should match the width property of -webkit-media-controls-volume-slider in mediaControlsQt.css.
+    const int volumeThumbWidth = 12;
+    const int volumeThumbHeight = volumeThumbWidth / 3;
     ControlPart part = o->style()->appearance();
 
     if (part == MediaSliderThumbPart) {
-        RenderStyle* parentStyle = o->parent()->style();
-        Q_ASSERT(parentStyle);
-
-        int parentHeight = parentStyle->height().value();
-        o->style()->setWidth(Length(parentHeight / 3, Fixed));
-        o->style()->setHeight(Length(parentHeight, Fixed));
+        o->style()->setWidth(Length(timelineThumbWidth, Fixed));
+        o->style()->setHeight(Length(timelineThumbHeight, Fixed));
     } else if (part == MediaVolumeSliderThumbPart) {
-        RenderStyle* parentStyle = o->parent()->style();
-        Q_ASSERT(parentStyle);
-
-        int parentWidth = parentStyle->width().value();
-        o->style()->setHeight(Length(parentWidth / 3, Fixed));
-        o->style()->setWidth(Length(parentWidth, Fixed));
+        o->style()->setHeight(Length(volumeThumbHeight, Fixed));
+        o->style()->setWidth(Length(volumeThumbWidth, Fixed));
     } else if (part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart) {
         QStyleOptionSlider option;