From 4d6084feccab99c0a7b3ecef26bb49c41dd50201 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 18 Jul 2012 13:59:13 +0200 Subject: Imported WebKit commit ff52235a78888e5cb8e286a828a8698042200e67 (http://svn.webkit.org/repository/webkit/trunk@122948) New snapshot that should fix the rendering issues recently introduced --- Source/WebCore/rendering/RenderObject.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/rendering/RenderObject.cpp') diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp index 04f27e652..6cdb4b2f9 100755 --- a/Source/WebCore/rendering/RenderObject.cpp +++ b/Source/WebCore/rendering/RenderObject.cpp @@ -2180,7 +2180,7 @@ RespectImageOrientationEnum RenderObject::shouldRespectImageOrientation() const { // Respect the image's orientation if it's being used as a full-page image or it's // an and the setting to respect it everywhere is set. - return document()->isImageDocument() || (document()->settings() && document()->settings()->shouldRespectImageOrientation() && node() && node()->hasTagName(HTMLNames::imgTag)) ? RespectImageOrientation : DoNotRespectImageOrientation; + return document()->isImageDocument() || (document()->settings() && document()->settings()->shouldRespectImageOrientation() && node() && (node()->hasTagName(HTMLNames::imgTag) || node()->hasTagName(HTMLNames::webkitInnerImageTag))) ? RespectImageOrientation : DoNotRespectImageOrientation; } bool RenderObject::hasOutlineAnnotation() const @@ -2692,6 +2692,11 @@ bool RenderObject::willRenderImage(CachedImage*) if (document()->inPageCache() || document()->view()->isOffscreen()) return false; + // If the document is being destroyed or has not been attached, then this + // RenderObject will not be rendered. + if (!view()) + return false; + // If a renderer is outside the viewport, we won't render. return viewRect().intersects(absoluteClippedOverflowRect()); } -- cgit v1.2.1