Changeset 242391 in webkit

Timestamp:

Mar 4, 2019, 2:00:28 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

gPictureOwnerMap is unnecessary
​https://bugs.webkit.org/show_bug.cgi?id=195228

Reviewed by Zalan Bujtas.

Just store in HTMLImageElement. An extra pointer isn't going to affect the memory use here.
If anything, we should worry about m_editableImage and m_pendingClonedAttachmentID instead.

• html/HTMLImageElement.cpp:

(WebCore::HTMLImageElement::pictureElement const):
(WebCore::HTMLImageElement::setPictureElement):

• html/HTMLImageElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLImageElement.cpp (modified) (2 diffs)
• html/HTMLImageElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-01  Ryosuke Niwa  <rniwa@webkit.org>
+
+        gPictureOwnerMap is unnecessary
+        https://bugs.webkit.org/show_bug.cgi?id=195228
+
+        Reviewed by Zalan Bujtas.
+
+        Just store in HTMLImageElement. An extra pointer isn't going to affect the memory use here.
+        If anything, we should worry about m_editableImage and m_pendingClonedAttachmentID instead.
+
+        * html/HTMLImageElement.cpp:
+        (WebCore::HTMLImageElement::pictureElement const):
+        (WebCore::HTMLImageElement::setPictureElement):
+        * html/HTMLImageElement.h:
+
 2019-03-04  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/html/HTMLImageElement.cpp

@@ -68 +68 @@
 using namespace HTMLNames;
 
-typedef HashMap<const HTMLImageElement*, WeakPtr<HTMLPictureElement>> PictureOwnerMap;
-static PictureOwnerMap* gPictureOwnerMap = nullptr;
-
 HTMLImageElement::HTMLImageElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
     : HTMLElement(tagName, document)
@@ -455 +452 @@
 HTMLPictureElement* HTMLImageElement::pictureElement() const
 {
-    if (!gPictureOwnerMap || !gPictureOwnerMap->contains(this))
-        return nullptr;
-    auto result = gPictureOwnerMap->get(this);
-    if (!result)
-        gPictureOwnerMap->remove(this);
-    return result.get();
+    return m_pictureElement.get();
 }
     
 void HTMLImageElement::setPictureElement(HTMLPictureElement* pictureElement)
 {
-    if (!pictureElement) {
-        if (gPictureOwnerMap)
-            gPictureOwnerMap->remove(this);
-        return;
-    }
-    
-    if (!gPictureOwnerMap)
-        gPictureOwnerMap = new PictureOwnerMap();
-    gPictureOwnerMap->add(this, makeWeakPtr(*pictureElement));
+    m_pictureElement = makeWeakPtr(pictureElement);
 }
     

trunk/Source/WebCore/html/HTMLImageElement.h

@@ -186 +186 @@
 
     RefPtr<EditableImageReference> m_editableImage;
+    WeakPtr<HTMLPictureElement> m_pictureElement;
+
 #if ENABLE(ATTACHMENT_ELEMENT)
     String m_pendingClonedAttachmentID;