Changeset 28200 in webkit

Timestamp:

Nov 29, 2007, 1:53:38 PM (17 years ago)

Author:

andersca@apple.com

Message:

Reviewed by Sam.

Don't install event handlers or set the zoom cursor if auto-shrink has been disabled.

• loader/ImageDocument.cpp: (WebCore::ImageDocument::createDocumentStructure): (WebCore::ImageDocument::imageChanged):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ImageDocument.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam.
+
+        Don't install event handlers or set the zoom cursor if auto-shrink has been disabled.
+
+        * loader/ImageDocument.cpp:
+        (WebCore::ImageDocument::createDocumentStructure):
+        (WebCore::ImageDocument::imageChanged):
+
 2007-11-29  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/loader/ImageDocument.cpp

@@ -160 +160 @@
     body->appendChild(imageElement, ec);
     
-    // Add event listeners
-    RefPtr<EventListener> listener = new ImageEventListener(this);
-    addWindowEventListener("resize", listener, false);
-    m_imageElement->addEventListener("click", listener.release(), false);
+    if (shouldShrinkToFit()) {
+        // Add event listeners
+        RefPtr<EventListener> listener = new ImageEventListener(this);
+        addWindowEventListener("resize", listener, false);
+        m_imageElement->addEventListener("click", listener.release(), false);
+    }
 }
 
@@ -224 +226 @@
     m_imageSizeIsKnown = true;
     
-    // Force resizing of the image
-    windowSizeChanged();
+    if (shouldShrinkToFit()) {
+        // Force resizing of the image
+        windowSizeChanged();
+    }
 }