Changeset 181537 in webkit

Timestamp:

Mar 16, 2015, 3:41:58 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Users of Heap::deprecatedReportExtraMemory should switch to reportExtraMemoryAllocated+reportExtraMemoryVisited
​https://bugs.webkit.org/show_bug.cgi?id=142595

Reviewed by Andreas Kling.

Fixed this bug for canvas.

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::memoryCost): Factored out the helper function
required by our IDL generator.

(WebCore::HTMLCanvasElement::createImageBuffer): Use
reportExtraMemoryAllocated.

• html/HTMLCanvasElement.h:

• html/HTMLCanvasElement.idl: Adopt the IDL for reporting cost in the

right way during GC. This will match our reportExtraMemoryAllocated
with a reportExtraMemoryVisited during GC.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebCore

Files:

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

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-11  Geoffrey Garen  <ggaren@apple.com>
+
+        Users of Heap::deprecatedReportExtraMemory should switch to reportExtraMemoryAllocated+reportExtraMemoryVisited
+        https://bugs.webkit.org/show_bug.cgi?id=142595
+
+        Reviewed by Andreas Kling.
+
+        Fixed this bug for canvas.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::memoryCost): Factored out the helper function
+        required by our IDL generator.
+
+        (WebCore::HTMLCanvasElement::createImageBuffer): Use
+        reportExtraMemoryAllocated.
+
+        * html/HTMLCanvasElement.h:
+
+        * html/HTMLCanvasElement.idl: Adopt the IDL for reporting cost in the
+        right way during GC. This will match our reportExtraMemoryAllocated
+        with a reportExtraMemoryVisited during GC.
+
 2015-03-11  Commit Queue  <commit-queue@webkit.org>
 

releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -543 +543 @@
 }
 
+size_t HTMLCanvasElement::memoryCost() const
+{
+    if (!m_imageBuffer)
+        return 0;
+    return 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
+}
+
 void HTMLCanvasElement::createImageBuffer() const
 {
@@ -580 +587 @@
 
     JSC::JSLockHolder lock(scriptExecutionContext()->vm());
-    size_t numBytes = 4 * m_imageBuffer->internalSize().width() * m_imageBuffer->internalSize().height();
-    // FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
-    // https://bugs.webkit.org/show_bug.cgi?id=142595
-    scriptExecutionContext()->vm().heap.deprecatedReportExtraMemory(numBytes);
+    scriptExecutionContext()->vm().heap.reportExtraMemoryAllocated(memoryCost());
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)

releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.h

@@ -136 +136 @@
     bool shouldAccelerate(const IntSize&) const;
 
+    size_t memoryCost() const;
+
 private:
     HTMLCanvasElement(const QualifiedName&, Document&);

releases/WebKitGTK/webkit-2.8/Source/WebCore/html/HTMLCanvasElement.idl

@@ -27 +27 @@
 [
     JSGenerateToNativeObject,
+    ReportExtraMemoryCost
 ] interface HTMLCanvasElement : HTMLElement {