Title: [91769] trunk/Source/WebCore
Revision
91769
Author
commit-qu...@webkit.org
Date
2011-07-26 12:03:18 -0700 (Tue, 26 Jul 2011)

Log Message

[EFL] Do not crash on the isSlider() assert.
https://bugs.webkit.org/show_bug.cgi?id=65191

Patch by Raphael Kubo da Costa <k...@profusion.mobi> on 2011-07-26
Reviewed by Antonio Gomes.

RenderThemeEfl's paintSliderThumb() just forwarded the call to
paintSliderTrack(), which, on its turn, called code that assumed that
object->isSlider() was true. That does not seem to be the case for
slidethumbs, so any page with an <input type="range"> tag would crash
WebKit.

We now do what RenderThemeQt does, and assume everything was properly
done in the call to paintSliderTrack().

No new tests, as this has been uncovered by an existing test.

* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::paintSliderThumb):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (91768 => 91769)


--- trunk/Source/WebCore/ChangeLog	2011-07-26 18:53:55 UTC (rev 91768)
+++ trunk/Source/WebCore/ChangeLog	2011-07-26 19:03:18 UTC (rev 91769)
@@ -1,3 +1,24 @@
+2011-07-26  Raphael Kubo da Costa  <k...@profusion.mobi>
+
+        [EFL] Do not crash on the isSlider() assert.
+        https://bugs.webkit.org/show_bug.cgi?id=65191
+
+        Reviewed by Antonio Gomes.
+
+        RenderThemeEfl's paintSliderThumb() just forwarded the call to
+        paintSliderTrack(), which, on its turn, called code that assumed that
+        object->isSlider() was true. That does not seem to be the case for
+        slidethumbs, so any page with an <input type="range"> tag would crash
+        WebKit.
+
+        We now do what RenderThemeQt does, and assume everything was properly
+        done in the call to paintSliderTrack().
+
+        No new tests, as this has been uncovered by an existing test.
+
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::paintSliderThumb):
+
 2011-07-26  Brian Salomon  <bsalo...@google.com>
 
         [SKIA] Make the skia GL context current when drawing text to gpu backed platform context.

Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (91768 => 91769)


--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2011-07-26 18:53:55 UTC (rev 91768)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp	2011-07-26 19:03:18 UTC (rev 91769)
@@ -865,7 +865,8 @@
 
 bool RenderThemeEfl::paintSliderThumb(RenderObject* object, const PaintInfo& info, const IntRect& rect)
 {
-    return paintSliderTrack(object, info, rect);
+    // We've already painted it in paintSliderTrack(), no need to do anything here.
+    return false;
 }
 
 void RenderThemeEfl::adjustCheckboxStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to