Changeset 109171 in webkit

Timestamp:

Feb 28, 2012 5:12:57 PM (12 years ago)

Author:

enne@google.com

Message:

[chromium] Inform v8 about extra memory used for PatternSkia clamp mode
​https://bugs.webkit.org/show_bug.cgi?id=79846

Reviewed by James Robinson.

For large images, creating a non-repeating Pattern in Skia can
allocate a lot of memory. Inform v8 about this so that it can
potentially garbage collect any Pattern objects that aren't being used
and that are holding onto large image copies.

• platform/graphics/Pattern.cpp:

(WebCore::Pattern::Pattern):

• platform/graphics/Pattern.h:

(Pattern):

• platform/graphics/skia/PatternSkia.cpp:

(WebCore::Pattern::platformDestroy):
(WebCore::Pattern::platformPattern):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/Pattern.cpp (modified) (1 diff)
• platform/graphics/Pattern.h (modified) (1 diff)
• platform/graphics/skia/PatternSkia.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-28  Adrienne Walker  <enne@google.com>
+
+        [chromium] Inform v8 about extra memory used for PatternSkia clamp mode
+        https://bugs.webkit.org/show_bug.cgi?id=79846
+
+        Reviewed by James Robinson.
+
+        For large images, creating a non-repeating Pattern in Skia can
+        allocate a lot of memory. Inform v8 about this so that it can
+        potentially garbage collect any Pattern objects that aren't being used
+        and that are holding onto large image copies.
+
+        * platform/graphics/Pattern.cpp:
+        (WebCore::Pattern::Pattern):
+        * platform/graphics/Pattern.h:
+        (Pattern):
+        * platform/graphics/skia/PatternSkia.cpp:
+        (WebCore::Pattern::platformDestroy):
+        (WebCore::Pattern::platformPattern):
+
 2012-02-28  Jonathan Backer  <backer@chromium.org>
 

trunk/Source/WebCore/platform/graphics/Pattern.cpp

@@ -38 +38 @@
 #if USE(SKIA)
     , m_pattern(0)
+    , m_externalMemoryAllocated(0)
 #endif
 {

trunk/Source/WebCore/platform/graphics/Pattern.h

@@ -96 +96 @@
     AffineTransform m_patternSpaceTransformation;
     PlatformPatternPtr m_pattern;
+#if USE(SKIA)
+    size_t m_externalMemoryAllocated;
+#endif
 };
 

trunk/Source/WebCore/platform/graphics/skia/PatternSkia.cpp

@@ -39 +39 @@
 #include "SkShader.h"
 
+#include <v8.h>
+
 namespace WebCore {
 
@@ -45 +47 @@
     SkSafeUnref(m_pattern);
     m_pattern = 0;
+    if (m_externalMemoryAllocated) {
+        v8::V8::AdjustAmountOfExternalAllocatedMemory(-m_externalMemoryAllocated);
+        m_externalMemoryAllocated = 0;
+    }
 }
 
@@ -90 +96 @@
         canvas.drawBitmap(image->bitmap(), 0, 0);
         m_pattern = SkShader::CreateBitmapShader(bm2, tileModeX, tileModeY);
+
+        m_externalMemoryAllocated = bm2.getSafeSize();
+        v8::V8::AdjustAmountOfExternalAllocatedMemory(m_externalMemoryAllocated);
     }
     m_pattern->setLocalMatrix(m_patternSpaceTransformation);