Change image document zooming logic.

third_party/WebKit/Source/core/html/ImageDocument.h

Index: third_party/WebKit/Source/core/html/ImageDocument.h
diff --git a/third_party/WebKit/Source/core/html/ImageDocument.h b/third_party/WebKit/Source/core/html/ImageDocument.h
index 7602b27aa0aa303a57768f0ffcff90bb2315d6c0..47a15eb1466efbfb947a1402466c3b334c2b382d 100644
--- a/third_party/WebKit/Source/core/html/ImageDocument.h
+++ b/third_party/WebKit/Source/core/html/ImageDocument.h
@@ -40,15 +40,10 @@ public:
         return new ImageDocument(initializer);
     }
 
-    enum ScaleType {
-        ScaleZoomedDocument,
-        ScaleOnlyUnzoomedDocument
-    };
-
     ImageResource* cachedImage();
     HTMLImageElement* imageElement() const { return m_imageElement.get(); }
 
-    void windowSizeChanged(ScaleType);
+    void windowSizeChanged();
     void imageUpdated();
     void imageClicked(int x, int y);
 
@@ -62,10 +57,12 @@ private:
     void createDocumentStructure();
 
     // These methods are for m_shrinkToFitMode == Desktop.
-    void resizeImageToFit(ScaleType);
-    void restoreImageSize(ScaleType);
+    void resizeImageToFit();
+    void restoreImageSize();
     bool imageFitsInWindow() const;
     bool shouldShrinkToFit() const;
+    // Calculates the image size multiplier that's needed to fit the image to
+    // the window, taking into account page zoom and device scale.
     float scale() const;
 
     Member<HTMLImageElement> m_imageElement;