[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [75241] trunk/WebCore
From: carlosgc () webkit ! org
Date: 2011-01-07 13:58:58
Message-ID: 20110107135859.D6F1762618D3 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[75241] trunk/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/75241">75241</a></dd> \
<dt>Author</dt> <dd>carlosgc@webkit.org</dd> <dt>Date</dt> <dd>2011-01-07 05:58:53 \
-0800 (Fri, 07 Jan 2011)</dd> </dl>
<h3>Log Message</h3>
<pre>2011-01-07 Carlos Garcia Campos <cgarcia@igalia.com> and Martin Robinson \
<mrobinson@igalia.com>
Reviewed by Xan Lopez.
[GTK] Port slider painting to GtkStyleContext
https://bugs.webkit.org/show_bug.cgi?id=51874
Use GtkStyleContext API to paint sliders when building with GTK+
3.x. Also move the code to adjust media slider to its own method
in RenderThemeGtk.cpp since it's common to both gtk 2 and 3.
No new tests. This should not change functionality.
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::adjustMediaSliderThumbSize):
* platform/gtk/RenderThemeGtk.h:
* platform/gtk/RenderThemeGtk2.cpp:
(WebCore::RenderThemeGtk::adjustSliderThumbSize):
* platform/gtk/RenderThemeGtk3.cpp:
(WebCore::RenderThemeGtk::paintSliderTrack):
(WebCore::RenderThemeGtk::paintSliderThumb):
(WebCore::RenderThemeGtk::adjustSliderThumbSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgtkRenderThemeGtkcpp">trunk/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkRenderThemeGtkh">trunk/WebCore/platform/gtk/RenderThemeGtk.h</a></li>
<li><a href="#trunkWebCoreplatformgtkRenderThemeGtk2cpp">trunk/WebCore/platform/gtk/RenderThemeGtk2.cpp</a></li>
<li><a href="#trunkWebCoreplatformgtkRenderThemeGtk3cpp">trunk/WebCore/platform/gtk/RenderThemeGtk3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (75240 => 75241)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2011-01-07 13:07:21 UTC (rev 75240)
+++ trunk/WebCore/ChangeLog 2011-01-07 13:58:53 UTC (rev 75241)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2011-01-07 Carlos Garcia Campos <cgarcia@igalia.com> and Martin \
Robinson <mrobinson@igalia.com> +
+ Reviewed by Xan Lopez.
+
+ [GTK] Port slider painting to GtkStyleContext
+ https://bugs.webkit.org/show_bug.cgi?id=51874
+
+ Use GtkStyleContext API to paint sliders when building with GTK+
+ 3.x. Also move the code to adjust media slider to its own method
+ in RenderThemeGtk.cpp since it's common to both gtk 2 and 3.
+
+ No new tests. This should not change functionality.
+
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::adjustMediaSliderThumbSize):
+ * platform/gtk/RenderThemeGtk.h:
+ * platform/gtk/RenderThemeGtk2.cpp:
+ (WebCore::RenderThemeGtk::adjustSliderThumbSize):
+ * platform/gtk/RenderThemeGtk3.cpp:
+ (WebCore::RenderThemeGtk::paintSliderTrack):
+ (WebCore::RenderThemeGtk::paintSliderThumb):
+ (WebCore::RenderThemeGtk::adjustSliderThumbSize):
+
</ins><span class="cx"> 2011-01-07 Benjamin Poulain \
<benjamin.poulain@nokia.com> </span><span class="cx">
</span><span class="cx"> Reviewed by Andreas Kling.
</span></span></pre></div>
<a id="trunkWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/RenderThemeGtk.cpp \
(75240 => 75241)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/RenderThemeGtk.cpp 2011-01-07 \
13:07:21 UTC (rev 75240)
+++ trunk/WebCore/platform/gtk/RenderThemeGtk.cpp 2011-01-07 13:58:53 UTC (rev 75241)
</span><span class="lines">@@ -436,6 +436,16 @@
</span><span class="cx"> return String(mediaControlsGtkUserAgentStyleSheet, \
sizeof(mediaControlsGtkUserAgentStyleSheet)); </span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderThemeGtk::adjustMediaSliderThumbSize(RenderObject* \
renderObject) const +{
+ ControlPart part = renderObject->style()->appearance();
+
+ if (part == MediaSliderThumbPart) {
+ renderObject->style()->setWidth(Length(m_mediaSliderThumbWidth, \
Fixed)); + renderObject->style()->setHeight(Length(m_mediaSliderThumbHeight, \
Fixed)); + }
+}
+
</ins><span class="cx"> bool RenderThemeGtk::paintMediaButton(RenderObject* \
renderObject, GraphicsContext* context, const IntRect& rect, const char* \
iconName) </span><span class="cx"> {
</span><span class="cx"> GRefPtr<GdkPixbuf> icon = \
getStockIcon(GTK_TYPE_CONTAINER, iconName, </span></span></pre></div>
<a id="trunkWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/RenderThemeGtk.h (75240 \
=> 75241)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/RenderThemeGtk.h 2011-01-07 \
13:07:21 UTC (rev 75240)
+++ trunk/WebCore/platform/gtk/RenderThemeGtk.h 2011-01-07 13:58:53 UTC (rev 75241)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> // A general method asking if any control tinting is \
supported at all. </span><span class="cx"> virtual bool supportsControlTints() \
const { return true; } </span><span class="cx">
</span><ins>+ virtual void adjustRepaintRect(const RenderObject*, IntRect&);
+
</ins><span class="cx"> // A method to obtain the baseline position for a \
"leaf" control. This will only be used if a baseline </span><span \
class="cx"> // position cannot be determined by examining child content. \
Checkboxes and radio buttons are examples of </span><span class="cx"> // controls \
that need to do this. </span><span class="lines">@@ -138,6 +140,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> void initMediaColors();
</span><span class="cx"> void initMediaButtons();
</span><ins>+ void adjustMediaSliderThumbSize(RenderObject*) const;
</ins><span class="cx"> virtual bool paintMediaFullscreenButton(RenderObject*, \
const PaintInfo&, const IntRect&); </span><span class="cx"> virtual bool \
paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&); \
</span><span class="cx"> virtual bool paintMediaMuteButton(RenderObject*, const \
PaintInfo&, const IntRect&); </span></span></pre></div>
<a id="trunkWebCoreplatformgtkRenderThemeGtk2cpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/RenderThemeGtk2.cpp \
(75240 => 75241)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/RenderThemeGtk2.cpp 2011-01-07 \
13:07:21 UTC (rev 75240)
+++ trunk/WebCore/platform/gtk/RenderThemeGtk2.cpp 2011-01-07 13:58:53 UTC (rev \
75241) </span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void RenderThemeGtk::adjustRepaintRect(const RenderObject*, \
IntRect&) +{
+}
+
</ins><span class="cx"> GtkStateType RenderThemeGtk::getGtkStateType(RenderObject* \
object) </span><span class="cx"> {
</span><span class="cx"> if (!isEnabled(object) || isReadOnlyControl(object))
</span><span class="lines">@@ -302,13 +306,10 @@
</span><span class="cx"> {
</span><span class="cx"> ControlPart part = o->style()->appearance();
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- if (part == MediaSliderThumbPart) {
- o->style()->setWidth(Length(m_mediaSliderThumbWidth, Fixed));
- o->style()->setHeight(Length(m_mediaSliderThumbHeight, Fixed));
</del><ins>+ if (part == MediaSliderThumbPart || part == \
MediaVolumeSliderThumbPart) { + adjustMediaSliderThumbSize(o);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (part == MediaVolumeSliderThumbPart)
- return;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> GtkWidget* widget = part == SliderThumbHorizontalPart ? \
gtkHScale() : gtkVScale(); </span></span></pre></div>
<a id="trunkWebCoreplatformgtkRenderThemeGtk3cpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gtk/RenderThemeGtk3.cpp \
(75240 => 75241)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gtk/RenderThemeGtk3.cpp 2011-01-07 \
13:07:21 UTC (rev 75240)
+++ trunk/WebCore/platform/gtk/RenderThemeGtk3.cpp 2011-01-07 13:58:53 UTC (rev \
75241) </span><span class="lines">@@ -101,6 +101,24 @@
</span><span class="cx"> m_sliderThumbColor = style->bg[GTK_STATE_SELECTED];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderThemeGtk::adjustRepaintRect(const RenderObject* renderObject, \
IntRect& rect) +{
+ ControlPart part = renderObject->style()->appearance();
+ switch (part) {
+ case SliderVerticalPart:
+ case SliderHorizontalPart: {
+ GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart \
? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); + gint focusWidth, focusPad;
+ gtk_style_context_get_style(context,
+ "focus-line-width", &focusWidth,
+ "focus-padding", &focusPad, NULL);
+ rect.inflate(focusWidth + focusPad);
+ }
+ default:
+ break;
+ }
+}
+
</ins><span class="cx"> GtkStateType RenderThemeGtk::getGtkStateType(RenderObject* \
object) </span><span class="cx"> {
</span><span class="cx"> if (!isEnabled(object) || isReadOnlyControl(object))
</span><span class="lines">@@ -273,94 +291,99 @@
</span><span class="cx"> return paintRenderObject(MOZ_GTK_ENTRY, object, \
info.context, rect); </span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderTrack(RenderObject* object, const \
PaintInfo& info, const IntRect& rect) </del><ins>+bool \
RenderThemeGtk::paintSliderTrack(RenderObject* renderObject, const PaintInfo& \
paintInfo, const IntRect& rect) </ins><span class="cx"> {
</span><del>- if (info.context->paintingDisabled())
- return false;
-
- ControlPart part = object->style()->appearance();
</del><ins>+ ControlPart part = renderObject->style()->appearance();
</ins><span class="cx"> ASSERT(part == SliderHorizontalPart || part == \
SliderVerticalPart); </span><span class="cx">
</span><del>- // We shrink the trough rect slightly to make room for the focus \
indicator.
- IntRect troughRect(IntPoint(), rect.size()); // This is relative to rect.
- GtkWidget* widget = 0;
- if (part == SliderVerticalPart) {
- widget = gtkVScale();
- troughRect.inflateY(-gtk_widget_get_style(widget)->ythickness);
- } else {
- widget = gtkHScale();
- troughRect.inflateX(-gtk_widget_get_style(widget)->xthickness);
</del><ins>+ GtkStyleContext* context = getStyleContext(part == \
SliderThumbHorizontalPart ? GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); + \
gtk_style_context_save(context); +
+ gtk_style_context_set_direction(context, \
gtkTextDirection(renderObject->style()->direction())); + \
gtk_style_context_add_class(context, GTK_STYLE_CLASS_SCALE); + \
gtk_style_context_add_class(context, GTK_STYLE_CLASS_TROUGH); +
+ if (!isEnabled(renderObject) || isReadOnlyControl(renderObject))
+ gtk_style_context_set_state(context, GTK_STATE_FLAG_INSENSITIVE);
+
+ gtk_render_background(context, paintInfo.context->platformContext(),
+ rect.x(), rect.y(), rect.width(), rect.height());
+ gtk_render_frame(context, paintInfo.context->platformContext(),
+ rect.x(), rect.y(), rect.width(), rect.height());
+
+ if (isFocused(renderObject)) {
+ gint focusWidth, focusPad;
+ gtk_style_context_get_style(context,
+ "focus-line-width", &focusWidth,
+ "focus-padding", &focusPad, NULL);
+ IntRect focusRect(rect);
+ focusRect.inflate(focusWidth + focusPad);
+ gtk_render_focus(context, paintInfo.context->platformContext(),
+ focusRect.x(), focusRect.y(), focusRect.width(), \
focusRect.height()); </ins><span class="cx"> }
</span><del>- gtk_widget_set_direction(widget, \
gtkTextDirection(object->style()->direction())); </del><span class="cx">
</span><del>- WidgetRenderingContext widgetContext(info.context, rect);
- widgetContext.gtkPaintBox(troughRect, widget, GTK_STATE_ACTIVE, GTK_SHADOW_OUT, \
"trough");
- if (isFocused(object))
- widgetContext.gtkPaintFocus(IntRect(IntPoint(), rect.size()), widget, \
getGtkStateType(object), "trough");
-
</del><ins>+ gtk_style_context_restore(context);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSliderThumb(RenderObject* object, const \
PaintInfo& info, const IntRect& rect) </del><ins>+bool \
RenderThemeGtk::paintSliderThumb(RenderObject* renderObject, const PaintInfo& \
paintInfo, const IntRect& rect) </ins><span class="cx"> {
</span><del>- if (info.context->paintingDisabled())
- return false;
-
- ControlPart part = object->style()->appearance();
</del><ins>+ ControlPart part = renderObject->style()->appearance();
</ins><span class="cx"> ASSERT(part == SliderThumbHorizontalPart || part == \
SliderThumbVerticalPart); </span><span class="cx">
</span><del>- GtkWidget* widget = 0;
- const char* detail = 0;
- GtkOrientation orientation;
- if (part == SliderThumbVerticalPart) {
- widget = gtkVScale();
- detail = "vscale";
- orientation = GTK_ORIENTATION_VERTICAL;
- } else {
- widget = gtkHScale();
- detail = "hscale";
- orientation = GTK_ORIENTATION_HORIZONTAL;
- }
- gtk_widget_set_direction(widget, \
gtkTextDirection(object->style()->direction())); </del><ins>+ \
GtkStyleContext* context = getStyleContext(part == SliderThumbHorizontalPart ? \
GTK_TYPE_HSCALE : GTK_TYPE_VSCALE); + gtk_style_context_save(context);
</ins><span class="cx">
</span><del>- // Only some themes have slider thumbs respond to clicks and some \
don't. This information is
- // gathered via the 'activate-slider' property, but it's deprecated in GTK+ 2.22 \
and removed in
- // GTK+ 3.x. The drawback of not honoring it is that slider thumbs change color \
when you click
- // on them.
- IntRect thumbRect(IntPoint(), rect.size());
- WidgetRenderingContext widgetContext(info.context, rect);
- widgetContext.gtkPaintSlider(thumbRect, widget, getGtkStateType(object), \
GTK_SHADOW_OUT, detail, orientation); </del><ins>+ \
gtk_style_context_set_direction(context, \
gtkTextDirection(renderObject->style()->direction())); + \
gtk_style_context_add_class(context, GTK_STYLE_CLASS_SCALE); + \
gtk_style_context_add_class(context, GTK_STYLE_CLASS_SLIDER); +
+ gint troughBorder;
+ gtk_style_context_get_style(context, "trough-border", \
&troughBorder, NULL); +
+ IntRect sliderRect(rect);
+ sliderRect.inflate(-troughBorder);
+
+ guint flags = 0;
+ if (!isEnabled(renderObject) || isReadOnlyControl(renderObject))
+ flags |= GTK_STATE_FLAG_INSENSITIVE;
+ else if (isHovered(renderObject))
+ flags |= GTK_STATE_FLAG_PRELIGHT;
+ if (isPressed(renderObject))
+ flags |= GTK_STATE_FLAG_ACTIVE;
+ gtk_style_context_set_state(context, static_cast<GtkStateFlags>(flags));
+
+ gtk_render_slider(context, paintInfo.context->platformContext(), \
sliderRect.x(), sliderRect.y(), sliderRect.width(), sliderRect.height(), + \
part == SliderThumbHorizontalPart ? GTK_ORIENTATION_HORIZONTAL : \
GTK_ORIENTATION_VERTICAL); +
+ gtk_style_context_restore(context);
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeGtk::adjustSliderThumbSize(RenderObject* o) const
</del><ins>+void RenderThemeGtk::adjustSliderThumbSize(RenderObject* renderObject) \
const </ins><span class="cx"> {
</span><del>- ControlPart part = o->style()->appearance();
</del><ins>+ ControlPart part = renderObject->style()->appearance();
</ins><span class="cx"> #if ENABLE(VIDEO)
</span><del>- if (part == MediaSliderThumbPart) {
- o->style()->setWidth(Length(m_mediaSliderThumbWidth, Fixed));
- o->style()->setHeight(Length(m_mediaSliderThumbHeight, Fixed));
</del><ins>+ if (part == MediaSliderThumbPart || part == \
MediaVolumeSliderThumbPart) { + adjustMediaSliderThumbSize(renderObject);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (part == MediaVolumeSliderThumbPart)
- return;
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>- GtkWidget* widget = part == SliderThumbHorizontalPart ? gtkHScale() \
: gtkVScale();
- int length = 0, width = 0;
- gtk_widget_style_get(widget,
- "slider_length", &length,
- "slider_width", &width,
- NULL);
-
</del><ins>+ gint sliderWidth, sliderLength;
+ gtk_style_context_get_style(getStyleContext(part == SliderThumbHorizontalPart ? \
GTK_TYPE_HSCALE : GTK_TYPE_VSCALE), + \
"slider-width", &sliderWidth, + \
"slider-length", &sliderLength, + NULL);
</ins><span class="cx"> if (part == SliderThumbHorizontalPart) {
</span><del>- o->style()->setWidth(Length(length, Fixed));
- o->style()->setHeight(Length(width, Fixed));
</del><ins>+ renderObject->style()->setWidth(Length(sliderLength, \
Fixed)); + renderObject->style()->setHeight(Length(sliderWidth, Fixed));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(part == SliderThumbVerticalPart);
</span><del>- o->style()->setWidth(Length(width, Fixed));
- o->style()->setHeight(Length(length, Fixed));
</del><ins>+ renderObject->style()->setWidth(Length(sliderWidth, Fixed));
+ renderObject->style()->setHeight(Length(sliderLength, Fixed));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_TAG)
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic