Fix distorted image issue when open some images in a new browser window.

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 124 matching lines @@
 
 void ImageDocumentParser::finish()
 {
     if (!isStopped() && document()->imageElement()) {
         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->imageSizeForRenderer(document()->imageElement()->renderer(), 1.0f));
+        IntSize size = flooredIntSize(document()->cachedImageSize(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();
@@ skipping 58 matching lines @@
 
 float ImageDocument::scale() const
 {
     if (!m_imageElement || m_imageElement->document() != this)
         return 1.0f;
 
     FrameView* view = frame()->view();
     if (!view)
         return 1;
 
-    LayoutSize imageSize = m_imageElement->cachedImage()->imageSizeForRenderer(m_imageElement->renderer(), pageZoomFactor(this));
+    LayoutSize imageSize = cachedImageSize(pageZoomFactor(this));
     LayoutSize windowSize = LayoutSize(view->width(), view->height());
 
     float widthScale = (float)windowSize.width() / imageSize.width();
     float heightScale = (float)windowSize.height() / imageSize.height();
 
     return min(widthScale, heightScale);
 }
 
 void ImageDocument::resizeImageToFit()
 {
     if (!m_imageElement || m_imageElement->document() != this || pageZoomFactor(this) > 1)
         return;
 
-    LayoutSize imageSize = m_imageElement->cachedImage()->imageSizeForRenderer(m_imageElement->renderer(), pageZoomFactor(this));
+    LayoutSize imageSize = cachedImageSize(pageZoomFactor(this));
 
     float scale = this->scale();
     m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));
     m_imageElement->setHeight(static_cast<int>(imageSize.height() * scale));
 
     m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomIn);
 }
 
 void ImageDocument::imageClicked(int x, int y)
 {
@@ skipping 18 matching lines @@
     }
 }
 
 void ImageDocument::imageUpdated()
 {
     ASSERT(m_imageElement);
 
     if (m_imageSizeIsKnown)
         return;
 
-    if (m_imageElement->cachedImage()->imageSizeForRenderer(m_imageElement->renderer(), pageZoomFactor(this)).isEmpty())
+    if (cachedImageSize(pageZoomFactor(this)).isEmpty())
         return;
 
     m_imageSizeIsKnown = true;
 
     if (shouldShrinkToFit()) {
         // Force resizing of the image
         windowSizeChanged();
     }
 }
 
 void ImageDocument::restoreImageSize()
 {
     if (!m_imageElement || !m_imageSizeIsKnown || m_imageElement->document() != this || pageZoomFactor(this) < 1)
         return;
 
-    LayoutSize imageSize = m_imageElement->cachedImage()->imageSizeForRenderer(m_imageElement->renderer(), 1.0f);
+    LayoutSize imageSize = cachedImageSize(1.0f);
     m_imageElement->setWidth(imageSize.width());
     m_imageElement->setHeight(imageSize.height());
 
     if (imageFitsInWindow())
         m_imageElement->removeInlineStyleProperty(CSSPropertyCursor);
     else
         m_imageElement->setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomOut);
 
     m_didShrinkImage = false;
 }
 
 bool ImageDocument::imageFitsInWindow() const
 {
     if (!m_imageElement || m_imageElement->document() != this)
         return true;
 
     FrameView* view = frame()->view();
     if (!view)
         return true;
 
-    LayoutSize imageSize = m_imageElement->cachedImage()->imageSizeForRenderer(m_imageElement->renderer(), pageZoomFactor(this));
+    LayoutSize imageSize = cachedImageSize(pageZoomFactor(this));
     LayoutSize windowSize = LayoutSize(view->width(), view->height());
 
     return imageSize.width() <= windowSize.width() && imageSize.height() <= windowSize.height();
 }
 
 void ImageDocument::windowSizeChanged()
 {
     if (!m_imageElement || !m_imageSizeIsKnown || m_imageElement->document() != this)
         return;
 
@@ skipping 37 matching lines @@
 {
     return frame()->settings()->shrinksStandaloneImagesToFit() && frame()->isMainFrame();
 }
 
 void ImageDocument::dispose()
 {
     m_imageElement = 0;
     HTMLDocument::dispose();
 }
 
+LayoutSize ImageDocument::cachedImageSize(float zoomFactor) const
+{
+    if (!m_imageElement)
+        return LayoutSize();
+
+    ImageResource* imageResource = m_imageElement->cachedImage();
+    if (!m_imageElement->renderer() && imageResource->hasImage() && imageResource->image()->isBitmapImage())
+        return imageResource->bitmapImageSizeRespectingOrientation(zoomFactor);
+
+    return imageResource->imageSizeForRenderer(m_imageElement->renderer(), zoomFactor);

[abarth-chromium, 2014/02/15 18:58:33]

Won't this still be broken for non-bitmap images?  /me is confused.

+}
+
 // --------
 
 void ImageEventListener::handleEvent(ExecutionContext*, Event* event)
 {
     if (event->type() == EventTypeNames::resize)
         m_doc->windowSizeChanged();
     else if (event->type() == EventTypeNames::click && event->isMouseEvent()) {
         MouseEvent* mouseEvent = toMouseEvent(event);
         m_doc->imageClicked(mouseEvent->x(), mouseEvent->y());
     }
 }
 
 bool ImageEventListener::operator==(const EventListener& listener)
 {
     if (const ImageEventListener* imageEventListener = ImageEventListener::cast(&listener))
         return m_doc == imageEventListener->m_doc;
     return false;
 }
 
 }