Changeset 88486 in webkit

Timestamp:

Jun 9, 2011 2:45:18 PM (13 years ago)

Author:

jcivelli@chromium.org

Message:

2011-06-09 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Page serializer APIs now use WebData instead of fetching the entire
resource contents.
​https://bugs.webkit.org/show_bug.cgi?id=61908

• public/WebData.h:
• public/WebPageSerializer.h:
• src/WebData.cpp: (WebKit::WebData::getSomeData):
• src/WebPageSerializer.cpp: (WebKit::WebPageSerializer::serialize): (WebKit::WebPageSerializer::serializeToMHTML):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebData.h (modified) (1 diff)
• public/WebPageSerializer.h (modified) (3 diffs)
• src/WebData.cpp (modified) (1 diff)
• src/WebPageSerializer.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-09  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Page serializer APIs now use WebData instead of fetching the entire
+        resource contents.
+        https://bugs.webkit.org/show_bug.cgi?id=61908
+
+        * public/WebData.h:
+        * public/WebPageSerializer.h:
+        * src/WebData.cpp:
+        (WebKit::WebData::getSomeData):
+        * src/WebPageSerializer.cpp:
+        (WebKit::WebPageSerializer::serialize):
+        (WebKit::WebPageSerializer::serializeToMHTML):
+
 2011-06-09  Bill Budge  <bbudge@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebData.h

@@ -77 +77 @@
 
     WEBKIT_API size_t size() const;
+
+    // Sets |data| to point to the content of the WebData at index |position|
+    // and returns the number of bytes available to be read in |data|.
+    // Return 0 when no more data is left.
+    // Usage:
+    //      const char* segment;
+    //      size_t position = 0;
+    //      while (size_t length = webData.getSomeData(segment, position)) {
+    //          // Use the data. for example: decoder->decode(segment, length);
+    //          position += length;
+    //      }
+    WEBKIT_API size_t getSomeData(const char*& data, size_t position) const;
+
+    // Returns all the data from the SharedBuffer.
+    // Consider using getSomeData() as data() could require flattening the internal buffer
+    // which might be expensive.
     WEBKIT_API const char* data() const;
 

trunk/Source/WebKit/chromium/public/WebPageSerializer.h

@@ -34 +34 @@
 #include "WebCString.h"
 #include "WebCommon.h"
+#include "WebData.h"
 #include "WebURL.h"
 
@@ -50 +51 @@
         WebURL url;
         WebCString mimeType;
-        WebCString data;
+        WebData data;
     };
 
@@ -60 +61 @@
 
     // Serializes the WebView contents to a MHTML representation.
-    WEBKIT_API static WebCString serializeToMHTML(WebView*);
+    WEBKIT_API static WebData serializeToMHTML(WebView*);
 
     // IMPORTANT:

trunk/Source/WebKit/chromium/src/WebData.cpp

@@ -70 +70 @@
 }
 
+size_t WebData::getSomeData(const char*& data, size_t position) const
+{
+    return m_private->getSomeData(data, position);
+}
+
 const char* WebData::data() const
 {

trunk/Source/WebKit/chromium/src/WebPageSerializer.cpp

@@ -194 +194 @@
         resource.url = iter->url;
         resource.mimeType = iter->mimeType.ascii();
-        // FIXME: we are copying all the resource data here. Idealy we would have a WebSharedData().
-        resource.data = WebCString(iter->data->data(), iter->data->size());
+        resource.data = iter->data;
         result.append(resource);
     }
-
     *resourcesParam = result;         
 }
 
-WebCString WebPageSerializer::serializeToMHTML(WebView* view)
-{
-    RefPtr<SharedBuffer> mhtml = MHTMLArchive::generateMHTMLData(static_cast<WebViewImpl*>(view)->page());
-    // FIXME: we are copying all the data here. Idealy we would have a WebSharedData().
-    return WebCString(mhtml->data(), mhtml->size());
+WebData WebPageSerializer::serializeToMHTML(WebView* view)
+{
+    return MHTMLArchive::generateMHTMLData(static_cast<WebViewImpl*>(view)->page());
 }