Changeset 60767 in webkit

Timestamp:

Jun 6, 2010 8:07:54 PM (14 years ago)

Author:

morrita@google.com

Message:

2010-06-06 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

ASSERTION FAILED with -webkit-appearance:progress-bar for non-progress bar elements
​https://bugs.webkit.org/show_bug.cgi?id=40158

• fast/css/invalid-appearance-progress-bar-meter-expected.txt: Added.
• fast/css/invalid-appearance-progress-bar-meter.html: Added.
• fast/css/script-tests/invalid-appearance-progress-bar-meter.js: Added.

2010-06-06 MORITA Hajime <​morrita@google.com>

Reviewed by Kent Tamura.

ASSERTION FAILED with -webkit-appearance:progress-bar for non <progress> elements
​https://bugs.webkit.org/show_bug.cgi?id=40158

paintProgressBar() and paintMeter() assumed given RenderObject is
RenderProgress or RenderMeter respectively, but arbitrary elements
can have -webkit-appearance: progress-bar and such elements
violates that assumption. So this change added type check before
downcasting the RenderObject.

• platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::paintProgressBar):
• rendering/RenderTheme.cpp: (WebCore::RenderTheme::paintMeter):
• rendering/RenderThemeChromiumSkia.cpp: (WebCore::RenderThemeChromiumSkia::paintProgressBar):
• rendering/RenderThemeChromiumWin.cpp: (WebCore::RenderThemeChromiumWin::paintProgressBar):
• rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::paintProgressBar):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/invalid-appearance-progress-bar-meter-expected.txt (added)
• LayoutTests/fast/css/invalid-appearance-progress-bar-meter.html (added)
• LayoutTests/fast/css/script-tests/invalid-appearance-progress-bar-meter.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/RenderThemeQt.cpp (modified) (1 diff)
• WebCore/rendering/RenderTheme.cpp (modified) (1 diff)
• WebCore/rendering/RenderThemeChromiumSkia.cpp (modified) (2 diffs)
• WebCore/rendering/RenderThemeChromiumWin.cpp (modified) (1 diff)
• WebCore/rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-06  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        ASSERTION FAILED with -webkit-appearance:progress-bar for non-progress bar elements
+        https://bugs.webkit.org/show_bug.cgi?id=40158
+
+        * fast/css/invalid-appearance-progress-bar-meter-expected.txt: Added.
+        * fast/css/invalid-appearance-progress-bar-meter.html: Added.
+        * fast/css/script-tests/invalid-appearance-progress-bar-meter.js: Added.
+
 2010-06-06  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-06  MORITA Hajime  <morrita@google.com>
+
+        Reviewed by Kent Tamura.
+
+        ASSERTION FAILED with -webkit-appearance:progress-bar for non <progress> elements
+        https://bugs.webkit.org/show_bug.cgi?id=40158
+
+        paintProgressBar() and paintMeter() assumed given RenderObject is
+        RenderProgress or RenderMeter respectively, but arbitrary elements
+        can have -webkit-appearance: progress-bar and such elements
+        violates that assumption. So this change added type check before
+        downcasting the RenderObject.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::paintProgressBar):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::paintMeter):
+        * rendering/RenderThemeChromiumSkia.cpp:
+        (WebCore::RenderThemeChromiumSkia::paintProgressBar):
+        * rendering/RenderThemeChromiumWin.cpp:
+        (WebCore::RenderThemeChromiumWin::paintProgressBar):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintProgressBar):
+
 2010-06-06  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/platform/qt/RenderThemeQt.cpp

@@ -728 +728 @@
 bool RenderThemeQt::paintProgressBar(RenderObject* o, const RenderObject::PaintInfo& pi, const IntRect& r)
 {
+    if (!o->isProgress())
+        return true;
+
     StylePainter p(this, pi);
     if (!p.isValid())

trunk/WebCore/rendering/RenderTheme.cpp

@@ -896 +896 @@
 bool RenderTheme::paintMeter(RenderObject* renderObject, const RenderObject::PaintInfo& paintInfo, const IntRect& rect)
 {
+    if (!renderObject->isMeter())
+        return true;
+
     // Some platforms do not have a native gauge widget, so we draw here a default implementation.
     RenderMeter* renderMeter = toRenderMeter(renderObject);

trunk/WebCore/rendering/RenderThemeChromiumSkia.cpp

@@ -803 +803 @@
 }
 
-
 double RenderThemeChromiumSkia::animationRepeatIntervalForProgressBar(RenderProgress*) const
 {
@@ -821 +820 @@
     static Image* rightBorderImage = Image::loadPlatformResource("linuxProgressBorderRight").releaseRef();
     ASSERT(barImage->height() == valueImage->height());
+
+    if (!renderObject->isProgress())
+        return true;
 
     paintInfo.context->platformContext()->setImageResamplingHint(barImage->size(), rect.size());

trunk/WebCore/rendering/RenderThemeChromiumWin.cpp

@@ -680 +680 @@
 bool RenderThemeChromiumWin::paintProgressBar(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
 {
+    if (!renderObject->isProgress())
+        return true;
+
     RenderProgress* renderProgress = toRenderProgress(o);
     // For indeterminate bar, valueRect is ignored and it is computed by the theme engine

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -821 +821 @@
 bool RenderThemeMac::paintProgressBar(RenderObject* renderObject, const RenderObject::PaintInfo& paintInfo, const IntRect& rect)
 {
+    if (!renderObject->isProgress())
+        return true;
+
     RenderProgress* renderProgress = toRenderProgress(renderObject);
     HIThemeTrackDrawInfo trackInfo;