mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
libcef: Update due to underlying chromium changes.
- Modifications due to WebFrame moving from webkit/glue to webkit/api - Remove the ATL dependency from browser_drag_delegate.cc - Use scoped_refptr instead of scoped_ptr for BrowserWebViewDelegate pointers in CefBrowserImpl. - Allow cancellation of redirects before they're sent in browser_resource_loader_bridge.cc - Enable remote fonts, local storage and session storage in context.cc - Add vsprops files to the libcef project that used to exist in the webkit/build directory git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@34 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -58,19 +58,21 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl {
|
||||
}
|
||||
|
||||
WebKit::WebClipboard* clipboard() {
|
||||
if (!clipboard_.get()) {
|
||||
clipboard_.reset(new webkit_glue::WebClipboardImpl());
|
||||
}
|
||||
return clipboard_.get();
|
||||
return &clipboard_;
|
||||
}
|
||||
|
||||
virtual WebKit::WebSandboxSupport* sandboxSupport() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
virtual bool getFileSize(const WebKit::WebString& path, long long& result) {
|
||||
virtual bool sandboxEnabled() {
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual bool getFileSize(const WebKit::WebString& path, long long& result) {
|
||||
return file_util::GetFileSize(
|
||||
FilePath(webkit_glue::WebStringToFilePathString(path)), &result);
|
||||
FilePath(webkit_glue::WebStringToFilePathString(path)),
|
||||
reinterpret_cast<int64*>(&result));
|
||||
}
|
||||
|
||||
virtual unsigned long long visitedLinkHash(const char* canonicalURL, size_t length) {
|
||||
@@ -81,17 +83,21 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl {
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual WebKit::WebMessagePortChannel* createMessagePortChannel() {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
virtual void setCookies(const WebKit::WebURL& url,
|
||||
const WebKit::WebURL& first_party_for_cookies,
|
||||
const WebKit::WebString& value) {
|
||||
BrowserResourceLoaderBridge::SetCookie(
|
||||
url, first_party_for_cookies, UTF16ToUTF8(value));
|
||||
url, first_party_for_cookies, value.utf8());
|
||||
}
|
||||
|
||||
virtual WebKit::WebString cookies(
|
||||
const WebKit::WebURL& url,
|
||||
const WebKit::WebURL& first_party_for_cookies) {
|
||||
return UTF8ToUTF16(BrowserResourceLoaderBridge::GetCookies(
|
||||
return WebKit::WebString::fromUTF8(BrowserResourceLoaderBridge::GetCookies(
|
||||
url, first_party_for_cookies));
|
||||
}
|
||||
|
||||
@@ -134,7 +140,7 @@ class BrowserWebKitInit : public webkit_glue::WebKitClientImpl {
|
||||
|
||||
private:
|
||||
webkit_glue::SimpleWebMimeRegistryImpl mime_registry_;
|
||||
scoped_ptr<WebKit::WebClipboard> clipboard_;
|
||||
webkit_glue::WebClipboardImpl clipboard_;
|
||||
};
|
||||
|
||||
#endif // _BROWSER_WEBKIT_INIT_H
|
||||
|
Reference in New Issue
Block a user