Changeset 284772 in webkit

Timestamp:

Oct 24, 2021, 11:47:50 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

ImageBitmap should report its memory cost
​https://bugs.webkit.org/show_bug.cgi?id=187964

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2021-10-24
Reviewed by Simon Fraser.

Add memory cost reporting for ImageBitmap. In order to avoid storing a lock, computing the
memory cost many times and querying the thread-unsafe image buffer, compute it only when the
image buffer updates and cache the value.

It is unclear how to test this with current infrastructure.

• html/ImageBitmap.cpp:

(WebCore::ImageBitmap::ImageBitmap):
(WebCore::ImageBitmap::takeImageBitmapBacking):
(WebCore::ImageBitmap::updateMemoryCost):
(WebCore::ImageBitmap::memoryCost const):

• html/ImageBitmap.h:
• html/ImageBitmap.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/ImageBitmap.cpp (modified) (3 diffs)
• html/ImageBitmap.h (modified) (3 diffs)
• html/ImageBitmap.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-24  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        ImageBitmap should report its memory cost
+        https://bugs.webkit.org/show_bug.cgi?id=187964
+
+        Reviewed by Simon Fraser.
+
+        Add memory cost reporting for ImageBitmap. In order to avoid storing a lock, computing the
+        memory cost many times and querying the thread-unsafe image buffer, compute it only when the
+        image buffer updates and cache the value.
+
+        It is unclear how to test this with current infrastructure.
+
+        * html/ImageBitmap.cpp:
+        (WebCore::ImageBitmap::ImageBitmap):
+        (WebCore::ImageBitmap::takeImageBitmapBacking):
+        (WebCore::ImageBitmap::updateMemoryCost):
+        (WebCore::ImageBitmap::memoryCost const):
+        * html/ImageBitmap.h:
+        * html/ImageBitmap.idl:
+
 2021-10-24  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebCore/html/ImageBitmap.cpp

@@ -847 +847 @@
 {
     ASSERT_IMPLIES(m_backingStore, m_backingStore->buffer());
+    updateMemoryCost();
 }
 
@@ -859 +860 @@
 std::optional<ImageBitmapBacking> ImageBitmap::takeImageBitmapBacking()
 {
-    return std::exchange(m_backingStore, std::nullopt);
+    auto result = std::exchange(m_backingStore, std::nullopt);
+    if (result)
+        updateMemoryCost();
+    return result;
 }
 
@@ -870 +874 @@
 }
 
+void ImageBitmap::updateMemoryCost()
+{
+    if (m_backingStore) {
+        if (auto imageBuffer = m_backingStore->buffer()) {
+            m_memoryCost = imageBuffer->memoryCost();
+            return;
+        }
+    }
+    m_memoryCost = 0;
+}
+
+size_t ImageBitmap::memoryCost() const
+{
+    return m_memoryCost;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/ImageBitmap.h

@@ -29 +29 @@
 #include "ImageBitmapBacking.h"
 #include "ScriptWrappable.h"
+#include <atomic>
 #include <wtf/RefCounted.h>
 
@@ -109 +110 @@
     static Vector<std::optional<ImageBitmapBacking>> detachBitmaps(Vector<RefPtr<ImageBitmap>>&&);
 
+    size_t memoryCost() const;
 private:
     friend class ImageBitmapImageObserver;
@@ -131 +133 @@
     static void createPromise(ScriptExecutionContext&, RefPtr<CSSStyleImageValue>&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
     static void createFromBuffer(ScriptExecutionContext&, Ref<ArrayBuffer>&&, String mimeType, long long expectedContentLength, const URL&, ImageBitmapOptions&&, std::optional<IntRect>, Promise&&);
+    void updateMemoryCost();
 
     std::optional<ImageBitmapBacking> m_backingStore;
+    std::atomic<size_t> m_memoryCost { 0 };
 };
 

trunk/Source/WebCore/html/ImageBitmap.idl

@@ -27 +27 @@
     EnabledAtRuntime=ImageBitmapEnabled,
     Exposed=(Window,Worker),
-    ImplementationLacksVTable
+    ImplementationLacksVTable,
+    ReportExtraMemoryCost
 ] interface ImageBitmap {
     readonly attribute unsigned long width;