Changeset 181849 in webkit

Timestamp:

Mar 23, 2015 2:14:19 AM (9 years ago)

Author:

yoav@yoav.ws

Message:

Refactor ImageLoader's setting of CachedImage
​https://bugs.webkit.org/show_bug.cgi?id=142825

Reviewed by Chris Dumez.

No new tests, since there's no functional change.

setImage and setImageWithoutConsideringPendingLoadEvent were not called with new
CachedImages and were not used as originally intended. That resulted in some dead code,
and confusion when going over the code.
This patch renames these methods into equivalent clearImage* methods, and deletes resulting dead code.

• html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::renderFallbackContent): Changed setImage call to clearImage.

• loader/ImageLoader.cpp:

(WebCore::ImageLoader::clearImage):
(WebCore::ImageLoader::clearImageWithoutConsideringPendingLoadEvent):
(WebCore::ImageLoader::notifyFinished):
(WebCore::ImageLoader::elementDidMoveToNewDocument):
(WebCore::ImageLoader::setImage): Deleted.
(WebCore::ImageLoader::setImageWithoutConsideringPendingLoadEvent): Deleted.

• loader/ImageLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (1 diff)
• loader/ImageLoader.cpp (modified) (5 diffs)
• loader/ImageLoader.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-23  Yoav Weiss  <yoav@yoav.ws>
+
+        Refactor ImageLoader's setting of CachedImage
+        https://bugs.webkit.org/show_bug.cgi?id=142825
+
+        Reviewed by Chris Dumez.
+
+        No new tests, since there's no functional change.
+
+        setImage and setImageWithoutConsideringPendingLoadEvent were not called with new
+        CachedImages and were not used as originally intended. That resulted in some dead code,
+        and confusion when going over the code.
+        This patch renames these methods into equivalent clearImage* methods, and deletes resulting dead code.
+
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::renderFallbackContent): Changed setImage call to clearImage.
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::clearImage):
+        (WebCore::ImageLoader::clearImageWithoutConsideringPendingLoadEvent):
+        (WebCore::ImageLoader::notifyFinished):
+        (WebCore::ImageLoader::elementDidMoveToNewDocument):
+        (WebCore::ImageLoader::setImage): Deleted.
+        (WebCore::ImageLoader::setImageWithoutConsideringPendingLoadEvent): Deleted.
+        * loader/ImageLoader.h:
+
 2015-03-22  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -383 +383 @@
         if (!isImageType()) {
             // If we don't think we have an image type anymore, then clear the image from the loader.
-            loader->setImage(nullptr);
+            loader->clearImage();
             return;
         }

trunk/Source/WebCore/loader/ImageLoader.cpp

@@ -124 +124 @@
 }
 
-void ImageLoader::setImage(CachedImage* newImage)
-{
-    setImageWithoutConsideringPendingLoadEvent(newImage);
+void ImageLoader::clearImage()
+{
+    clearImageWithoutConsideringPendingLoadEvent();
 
     // Only consider updating the protection ref-count of the Element immediately before returning
@@ -133 +133 @@
 }
 
-void ImageLoader::setImageWithoutConsideringPendingLoadEvent(CachedImage* newImage)
+void ImageLoader::clearImageWithoutConsideringPendingLoadEvent()
 {
     ASSERT(m_failedLoadURL.isEmpty());
     CachedImage* oldImage = m_image.get();
-    if (newImage != oldImage) {
-        m_image = newImage;
+    if (oldImage) {
+        m_image = nullptr;
         if (m_hasPendingBeforeLoadEvent) {
             beforeLoadEventSender().cancelEvent(*this);
@@ -152 +152 @@
         }
         m_imageComplete = true;
-        if (newImage)
-            newImage->addClient(this);
         if (oldImage)
             oldImage->removeClient(this);
@@ -289 +287 @@
         && !resource->passesAccessControlCheck(element().document().securityOrigin())) {
 
-        setImageWithoutConsideringPendingLoadEvent(0);
+        clearImageWithoutConsideringPendingLoadEvent();
 
         m_hasPendingErrorEvent = true;
@@ -467 +465 @@
 {
     clearFailedLoadURL();
-    setImage(0);
+    clearImage();
 }
 

trunk/Source/WebCore/loader/ImageLoader.h

@@ -59 +59 @@
 
     CachedImage* image() const { return m_image.get(); }
-    void setImage(CachedImage*); // Cancels pending beforeload and load events, and doesn't dispatch new ones.
+    void clearImage(); // Cancels pending beforeload and load events, and doesn't dispatch new ones.
 
     void setLoadManually(bool loadManually) { m_loadManually = loadManually; }
@@ -89 +89 @@
     void updateRenderer();
 
-    void setImageWithoutConsideringPendingLoadEvent(CachedImage*);
+    void clearImageWithoutConsideringPendingLoadEvent();
     void clearFailedLoadURL();