mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Database and AppCache changes. - New cookie policy class. - Add StdStringToWebString and WebStringToStdString to browser_webkit_glue.{h,cc} because webkit/glue/glue_util.{h,cc} have been deleted. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@71 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -20,10 +20,11 @@ MSVC_POP_WARNING();
|
||||
#include "base/resource_util.h"
|
||||
#include "base/scoped_ptr.h"
|
||||
#include "base/string16.h"
|
||||
#include "base/string_util.h"
|
||||
#include "base/win_util.h"
|
||||
#include "net/base/mime_util.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
|
||||
#include "webkit/glue/glue_util.h"
|
||||
#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
|
||||
#include "webkit/glue/webkit_glue.h"
|
||||
|
||||
// Generated by GRIT
|
||||
@@ -204,4 +205,15 @@ void ClearCache()
|
||||
WebCore::cache()->setDisabled(false);
|
||||
}
|
||||
|
||||
WebKit::WebString StdStringToWebString(const std::string& str) {
|
||||
return WebKit::WebString::fromUTF8(str.data(), str.size());
|
||||
}
|
||||
|
||||
std::string WebStringToStdString(const WebKit::WebString& str) {
|
||||
std::string ret;
|
||||
if (!str.isNull())
|
||||
UTF16ToUTF8(str.data(), str.length(), &ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
} // namespace webkit_glue
|
||||
|
Reference in New Issue
Block a user