Changeset 194326 in webkit

Timestamp:

Dec 20, 2015, 8:23:09 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Don't allocate a NSImage and skip unneeded call to TIFFRepresentation when copying image to clipboard.
​https://bugs.webkit.org/show_bug.cgi?id=152374

Patch by Jeremy Zerfas <WebKit@JeremyZerfas.com> on 2015-12-20
Reviewed by Darin Adler.

Source/WebCore:

When copying an image to the clipboard, don't bother allocating a
NSImage and skip the unneeded call to TIFFRepresentation since the data
from the previous getTIFFRepresentation call can be used instead. This
considerably reduces the amount of memory and CPU time used for large
images/animations.

Test: fast/images/image-copy-memory-usage.html

• platform/mac/PasteboardMac.mm:

(WebCore::Pasteboard::write):

LayoutTests:

Added test to make sure that when copying a 50 frame 500x500 animation
(50 MB uncompressed) to the clipboard, the additional memory usage is
kept to less than 200 MB.

• fast/images/image-copy-memory-usage-expected.txt: Added.
• fast/images/image-copy-memory-usage.html: Added.
• fast/images/resources/dot-moving-in-a-circle-animation.gif: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/image-copy-memory-usage-expected.txt (added)
• LayoutTests/fast/images/image-copy-memory-usage.html (added)
• LayoutTests/fast/images/resources/dot-moving-in-a-circle-animation.gif (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mac/PasteboardMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-20  Jeremy Zerfas  <WebKit@JeremyZerfas.com>
+
+        Don't allocate a NSImage and skip unneeded call to TIFFRepresentation when copying image to clipboard.
+        https://bugs.webkit.org/show_bug.cgi?id=152374
+
+        Reviewed by Darin Adler.
+
+        Added test to make sure that when copying a 50 frame 500x500 animation
+        (50 MB uncompressed) to the clipboard, the additional memory usage is
+        kept to less than 200 MB.
+
+        * fast/images/image-copy-memory-usage-expected.txt: Added.
+        * fast/images/image-copy-memory-usage.html: Added.
+        * fast/images/resources/dot-moving-in-a-circle-animation.gif: Added.
+
 2015-12-20  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-20  Jeremy Zerfas  <WebKit@JeremyZerfas.com>
+
+        Don't allocate a NSImage and skip unneeded call to TIFFRepresentation when copying image to clipboard.
+        https://bugs.webkit.org/show_bug.cgi?id=152374
+
+        Reviewed by Darin Adler.
+
+        When copying an image to the clipboard, don't bother allocating a
+        NSImage and skip the unneeded call to TIFFRepresentation since the data
+        from the previous getTIFFRepresentation call can be used instead. This
+        considerably reduces the amount of memory and CPU time used for large
+        images/animations.
+
+        Test: fast/images/image-copy-memory-usage.html
+
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::write):
+
 2015-12-20  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
 

trunk/Source/WebCore/platform/mac/PasteboardMac.mm

@@ -256 +256 @@
 void Pasteboard::write(const PasteboardImage& pasteboardImage)
 {
-    NSData *imageData = [pasteboardImage.image->getNSImage() TIFFRepresentation];
+    CFDataRef imageData = pasteboardImage.image->getTIFFRepresentation();
     if (!imageData)
         return;
@@ -264 +264 @@
 
     m_changeCount = writeURLForTypes(writableTypesForImage(), m_pasteboardName, pasteboardImage.url);
-    m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapNSData(imageData), NSTIFFPboardType, m_pasteboardName);
+    m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(SharedBuffer::wrapCFData(imageData), NSTIFFPboardType, m_pasteboardName);
     writeFileWrapperAsRTFDAttachment(fileWrapper(pasteboardImage), m_pasteboardName, m_changeCount);
 }