bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 129376.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@579 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-04-04 22:32:24 +00:00
parent f94336aade
commit 0930631a5f
39 changed files with 404 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cef1/libcef/browser_webview_delegate.cc
View File

@@ -32,7 +32,7 @@
#include "base/stringprintf.h"
#include "media/base/filter_collection.h"
#include "media/base/media_log.h"
#include "media/base/message_loop_factory_impl.h"
#include "media/base/message_loop_factory.h"
#include "media/filters/null_audio_renderer.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
@@ -168,7 +168,7 @@ void TranslatePopupFeatures(const WebWindowFeatures& webKitFeatures,
WebView* BrowserWebViewDelegate::createView(WebFrame* creator,
const WebURLRequest& request, const WebWindowFeatures& features,
const WebString& name) {
const WebString& name, WebKit::WebNavigationPolicy policy) {
CefString url;
if (!request.isNull())
url = request.url().spec().utf16();
@@ -187,17 +187,24 @@ WebWidget* BrowserWebViewDelegate::createPopupMenu(WebPopupType popup_type) {
WebStorageNamespace* BrowserWebViewDelegate::createSessionStorageNamespace(
unsigned quota) {
#ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
NOTREACHED();
#else
// Ignore the quota parameter from WebCore as in Chrome.
return new BrowserWebStorageNamespaceImpl(DOM_STORAGE_SESSION,
kLocalStorageNamespaceId + 1);
#endif
}
WebKit::WebGraphicsContext3D* BrowserWebViewDelegate::createGraphicsContext3D(
const WebKit::WebGraphicsContext3D::Attributes& attributes,
bool renderDirectlyToWebView) {
const WebKit::WebGraphicsContext3D::Attributes& attributes) {
WebKit::WebView* web_view = browser_->UIT_GetWebView();
if (!web_view)
return NULL;
const CefSettings& settings = _Context->settings();
return webkit_glue::CreateGraphicsContext3D(settings.graphics_implementation,
attributes, renderDirectlyToWebView);
attributes, web_view, true);
}
void BrowserWebViewDelegate::didAddMessageToConsole(
@@ -663,7 +670,7 @@ WebPlugin* BrowserWebViewDelegate::createPlugin(
WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
WebFrame* frame, WebMediaPlayerClient* client) {
scoped_ptr<media::MessageLoopFactory> message_loop_factory(
new media::MessageLoopFactoryImpl());
new media::MessageLoopFactory());
scoped_ptr<media::FilterCollection> collection(
new media::FilterCollection());
@@ -884,7 +891,8 @@ void BrowserWebViewDelegate::didCommitProvisionalLoad(
}
void BrowserWebViewDelegate::didCreateScriptContext(
WebFrame* frame, v8::Handle<v8::Context> context, int worldId) {
WebFrame* frame, v8::Handle<v8::Context> context, int extensionGroup,
int worldId) {
CefRefPtr<CefClient> client = browser_->GetClient();
if (!client.get())
return;