Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/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 244 matching lines @@
     FrameView* view = frame()->view();
     if (!view)
         return 1.0f;
 
     DCHECK(m_imageElement->cachedImage());
     const float zoom = pageZoomFactor(this);
     LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(LayoutObject::shouldRespectImageOrientation(m_imageElement->layoutObject()), zoom);
 
     // We want to pretend the viewport is larger when the user has zoomed the
     // page in (but not when the zoom is coming from device scale).
-    const float manualZoom = zoom / view->getHostWindow()->windowToViewportScalar(1.f);
+    const float manualZoom = zoom / view->getHostWindow()->windowToViewportScalar(*frame()->view(), 1.f);
     float widthScale = view->width() * manualZoom / imageSize.width().toFloat();
     float heightScale = view->height() * manualZoom / imageSize.height().toFloat();
 
     return min(widthScale, heightScale);
 }
 
 void ImageDocument::resizeImageToFit()
 {
     DCHECK_EQ(m_shrinkToFitMode, Desktop);
     if (!m_imageElement || m_imageElement->document() != this)
@@ skipping 160 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener) const
 {
     if (const ImageEventListener* imageEventListener = ImageEventListener::cast(&listener))
         return m_doc == imageEventListener->m_doc;
     return false;
 }
 
 } // namespace blink