Changeset 138211 in webkit

Timestamp:

Dec 19, 2012 5:43:15 PM (11 years ago)

Author:

kerz@chromium.org

Message:

Merge 138174

REGRESSION(r137607): PluginDocument loads consume huge amounts of memory
​https://bugs.webkit.org/show_bug.cgi?id=105359

Reviewed by Alexey Proskuryakov.

No new tests, verified manually that ​http://www.scb.se/statistik/_publikationer/NR0001_2012K02_TI_A28TI1203.pdf
no longer consumes several GB of memory.

• loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::setShouldBufferData): shouldBufferData is an enum, not a boolean, so this is reversed.

• loader/cache/CachedRawResource.cpp:

(WebCore::CachedRawResource::data): If the dataReceived() callback tells us to stop buffering data, be sure to

notify the ResourceLoader and clear the data buffer.

TBR=Nate Chapin
Review URL: ​https://codereview.chromium.org/11571073

Location:

branches/chromium/1364/Source/WebCore/loader

Files:

• ResourceLoader.cpp (modified) (1 diff)
• cache/CachedRawResource.cpp (modified) (3 diffs)

branches/chromium/1364/Source/WebCore/loader/ResourceLoader.cpp

@@ -195 +195 @@
 
     // Reset any already buffered data
-    if (!shouldBufferData)
+    if (shouldBufferData == DoNotBufferData)
         m_resourceData = 0;
 }

branches/chromium/1364/Source/WebCore/loader/cache/CachedRawResource.cpp

@@ -57 +57 @@
         incrementalDataLength = data->size() - previousDataLength;
     }
-    
+
     if (m_options.shouldBufferData == BufferData) {
         if (data)
@@ -63 +63 @@
         m_data = data;
     }
-    
+
+    DataBufferingPolicy dataBufferingPolicy = m_options.shouldBufferData;
     if (incrementalDataLength) {
         CachedResourceClientWalker<CachedRawResourceClient> w(m_clients);
@@ -70 +71 @@
     }
     CachedResource::data(m_data, allDataReceived);
+
+    if (dataBufferingPolicy == BufferData && m_options.shouldBufferData == DoNotBufferData) {
+        if (m_loader)
+            m_loader->setShouldBufferData(DoNotBufferData);
+        clear();
+    }
 }