Skip to content

Instantly share code, notes, and snippets.

@qrwteyrutiyoup
Created June 24, 2013 14:08
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save qrwteyrutiyoup/5850304 to your computer and use it in GitHub Desktop.
Save qrwteyrutiyoup/5850304 to your computer and use it in GitHub Desktop.
commit e78ea05fe61a38a15212fbf4a4b13939676f93c0
Author: Sergio Correia <sergio.correia@openbossa.org>
Date: Mon Jun 24 09:51:06 2013 -0400
Return early if RenderObject is not a meter, in RenderThemeNix::paintMeter()
We return true if that's the case, like other ports do. This avoids a problem
with ASSERT_WITH_SECURITY_IMPLICATION FAILED: !object || object->isMeter() in
WebCore::toRenderMeter, as reported in Issue #15 on GitHub.
diff --git a/Source/WebCore/platform/nix/RenderThemeNix.cpp b/Source/WebCore/platform/nix/RenderThemeNix.cpp
index 2eea351..99107ac 100644
--- a/Source/WebCore/platform/nix/RenderThemeNix.cpp
+++ b/Source/WebCore/platform/nix/RenderThemeNix.cpp
@@ -419,6 +419,9 @@ bool RenderThemeNix::supportsMeter(ControlPart part) const
bool RenderThemeNix::paintMeter(RenderObject* o, const PaintInfo& i, const IntRect& rect)
{
+ if (!o->isMeter())
+ return true;
+
RenderMeter* renderMeter = toRenderMeter(o);
HTMLMeterElement* e = renderMeter->meterElement();
WebKit::WebThemeEngine::MeterExtraParams extraParams;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment