Add Reload and LoadData methods to WebFrame. LoadData replaces

LoadAlternateHTMLString, changing types to WebKit API types and
allowing for more flexibility (supports loading non-HTML data).

LoadHTMLString is modified to support some optional parameters.

Note: Since WebFrame is going to soon be part of the WebKit API,
it is OK style-wise for it to use optional parameters.

This patch also includes a change to remove the securityInfo
property from WebURLRequest.  I did this so that I could eliminate
the need to pass a WebURLRequest to LoadData / LoadHTMLString.
This also fixes a TODO of mine to eliminate this field on
WebCore::ResourceRequest since securityInfo (SSL cert info) is
really more of a response property.  It was only part of the
request as a hack to support certain error pages.  I work around
that by leveraging NavigationState in chrome/renderer.

I added some templatized, implicit constructors to WebData for
convenience.  I plan to make similar changes to WebCString and
WebString in a future CL.

This CL is a incremental step toward moving ResourceFetcher out
of WebFrame.

BUG=15648
TEST=none
R=dglazkov

Review URL: http://codereview.chromium.org/150146

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19742 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/webkit/glue/glue_util.h b/webkit/glue/glue_util.h
index b22a610..bb98461 100644
--- a/webkit/glue/glue_util.h
+++ b/webkit/glue/glue_util.h
@@ -21,12 +21,14 @@ class IntSize;
 class KURL;
 class ResourceError;
 class ResourceResponse;
+class SharedBuffer;
 class String;
 struct ResourceRequest;
 }
 
 namespace WebKit {
 class WebCString;
+class WebData;
 class WebDragData;
 class WebForm;
 class WebHistoryItem;
@@ -82,6 +84,12 @@ WebCore::CString WebCStringToCString(const WebKit::WebCString& str);
 WebKit::WebString StdStringToWebString(const std::string& str);
 std::string WebStringToStdString(const WebKit::WebString& str);
 
+// WebCore::SharedBuffer <-> WebData.  No charset conversion.
+WebKit::WebData SharedBufferToWebData(
+    const WTF::PassRefPtr<WebCore::SharedBuffer>& buf);
+WTF::PassRefPtr<WebCore::SharedBuffer> WebDataToSharedBuffer(
+    const WebKit::WebData& data);
+
 FilePath::StringType StringToFilePathString(const WebCore::String& str);
 WebCore::String FilePathStringToString(const FilePath::StringType& str);