Fix progressive rendering of image documents

Source/core/html/ImageDocument.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 128 matching lines @@
     LocalFrame* frame = document()->frame();
     Settings* settings = frame->settings();
     if (!frame->loader().client()->allowImage(!settings || settings->imagesEnabled(), document()->url()))
         return;
 
     if (document()->cachedImage()) {
         RELEASE_ASSERT(length <= std::numeric_limits<unsigned>::max());
         document()->cachedImage()->appendData(data, length);
     }
 
-    if (!document())
-        return;
-
-    // Make sure the image layoutObject gets created because we need the layoutObject
-    // to read the aspect ratio. See crbug.com/320244
-    document()->updateLayoutTreeIfNeeded();
-    document()->imageUpdated();
+    // TODO(esprehn): These null checks on Document don't make sense, document()
+    // will ASSERT if it was null. Do these want to check isDetached() ?
+    if (document())
+        document()->imageUpdated();
 }
 
 void ImageDocumentParser::finish()
 {
     if (!isStopped() && document()->imageElement() && document()->cachedImage()) {
         ImageResource* cachedImage = document()->cachedImage();
         cachedImage->finish();
         cachedImage->setResponse(document()->frame()->loader().documentLoader()->response());
 
         // Report the natural image size in the page title, regardless of zoom level.
         // At a zoom level of 1 the image is guaranteed to have an integer size.
         IntSize size = flooredIntSize(cachedImage->imageSizeForLayoutObject(document()->imageElement()->layoutObject(), 1.0f));
         if (size.width()) {
             // Compute the title, we use the decoded filename of the resource, falling
             // back on the (decoded) hostname if there is no path.
             String fileName = decodeURLEscapeSequences(document()->url().lastPathComponent());
             if (fileName.isEmpty())
                 fileName = document()->url().host();
             document()->setTitle(imageTitle(fileName, size));
         }
 
         document()->imageUpdated();
     }
 
+    // TODO(esprehn): These null checks on Document don't make sense, document()
+    // will ASSERT if it was null. Do these want to check isDetached() ?
     if (document())
         document()->finishedParsing();
 }
 
 // --------
 
 ImageDocument::ImageDocument(const DocumentInit& initializer)
     : HTMLDocument(initializer, ImageDocumentClass)
     , m_imageElement(nullptr)
     , m_imageSizeIsKnown(false)
@@ skipping 28 matching lines @@
 
     RefPtrWillBeRawPtr<HTMLHeadElement> head = HTMLHeadElement::create(*this);
     RefPtrWillBeRawPtr<HTMLMetaElement> meta = HTMLMetaElement::create(*this);
     meta->setAttribute(nameAttr, "viewport");
     meta->setAttribute(contentAttr, "width=device-width, minimum-scale=0.1");
     head->appendChild(meta);
 
     RefPtrWillBeRawPtr<HTMLBodyElement> body = HTMLBodyElement::create(*this);
     body->setAttribute(styleAttr, "margin: 0px;");
 
+    if (frame())
+        frame()->loader().client()->dispatchWillInsertBody();
+
     m_imageElement = HTMLImageElement::create(*this);
     m_imageElement->setAttribute(styleAttr, "-webkit-user-select: none");
     // If the image is multipart, we neglect to mention to the HTMLImageElement that it's in an
     // ImageDocument, so that it requests the image normally.
     if (!loadingMultipartContent)
         m_imageElement->setLoadingImageDocument();
     m_imageElement->setSrc(url().string());
     body->appendChild(m_imageElement.get());
 
     if (shouldShrinkToFit()) {
@@ skipping 70 matching lines @@
     }
 }
 
 void ImageDocument::imageUpdated()
 {
     ASSERT(m_imageElement);
 
     if (m_imageSizeIsKnown)
         return;
 
+    updateLayoutTreeIfNeeded();
     if (!m_imageElement->cachedImage() || m_imageElement->cachedImage()->imageSizeForLayoutObject(m_imageElement->layoutObject(), pageZoomFactor(this)).isEmpty())
         return;
 
     m_imageSizeIsKnown = true;
 
     if (shouldShrinkToFit()) {
         // Force resizing of the image
         windowSizeChanged(ScaleOnlyUnzoomedDocument);
     }
-
-    // Update layout as soon as image size is known. This enables large image files to render progressively or to animate.
-    updateLayout();
 }
 
 void ImageDocument::restoreImageSize(ScaleType type)
 {
     ASSERT(m_shrinkToFitMode == Desktop);
 
     if (!m_imageElement || !m_imageSizeIsKnown || m_imageElement->document() != this || (pageZoomFactor(this) < 1 && type == ScaleOnlyUnzoomedDocument))
         return;
 
     ASSERT(m_imageElement->cachedImage());
@@ skipping 112 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener)
 {
     if (const ImageEventListener* imageEventListener = ImageEventListener::cast(&listener))
         return m_doc == imageEventListener->m_doc;
     return false;
 }
 
 }