CVS commit by ggarand: fix crashes BUG: 78205 CCBUG: 84173 M +7 -5 html_imageimpl.cpp 1.150 --- kdelibs/khtml/html/html_imageimpl.cpp #1.149:1.150 @@ -182,7 +182,6 @@ void HTMLImageElementImpl::attach() { m_render = new (getDocument()->renderArena()) RenderImage(this); - m_render->setStyle(getDocument()->styleSelector()->styleForElement(this)); + m_render->setStyle(_style); parentNode()->renderer()->addChild(m_render, nextRenderer()); - m_render->updateFromElement(); } _style->deref(); @@ -187,6 +186,7 @@ void HTMLImageElementImpl::attach() } _style->deref(); - NodeBaseImpl::attach(); + if (m_render) + m_render->updateFromElement(); } @@ -202,5 +202,6 @@ long HTMLImageElementImpl::width() const } - return m_render->contentWidth(); + return m_render ? m_render->contentWidth() : + getAttribute(ATTR_WIDTH).toInt(); } @@ -216,5 +217,6 @@ long HTMLImageElementImpl::height() cons } - return m_render->contentHeight(); + return m_render ? m_render->contentHeight() : + getAttribute(ATTR_HEIGHT).toInt(); }