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 66269.

Browse Source 
- Fixes a crash with Flash-related JavaScript (issue #115).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@138 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2010-11-16 16:01:14 +00:00
parent 8c47cd961a
commit 239a283e02
10 changed files with 45 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libcef/browser_webview_delegate.cc
View File

@ -535,7 +535,8 @@ WebWorker* BrowserWebViewDelegate::createWorker(
WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
WebFrame* frame, WebMediaPlayerClient* client) {
media::MediaFilterCollection collection;
scoped_ptr<media::MediaFilterCollection> collection(
new media::MediaFilterCollection());
appcache::WebApplicationCacheHostImpl* appcache_host =
appcache::WebApplicationCacheHostImpl::FromFrame(frame);
@ -559,16 +560,16 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
0);
scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer =
new webkit_glue::VideoRendererImpl(false);
collection.push_back(video_renderer);
scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer(
new webkit_glue::VideoRendererImpl(false));
collection->AddVideoRenderer(video_renderer);
// Add the audio renderer.
collection.push_back(new media::AudioRendererImpl());
collection->AddAudioRenderer(new media::AudioRendererImpl());
return new webkit_glue::WebMediaPlayerImpl(
client, collection, bridge_factory_simple, bridge_factory_buffered,
false, video_renderer);
client, collection.release(), bridge_factory_simple,
bridge_factory_buffered, false, video_renderer);
}
WebApplicationCacheHost* BrowserWebViewDelegate::createApplicationCacheHost(
@ -806,7 +807,7 @@ void BrowserWebViewDelegate::reportFindInPageSelection(
}
void BrowserWebViewDelegate::openFileSystem(
WebFrame* frame, WebFileSystem::Type type, long long size,
WebFrame* frame, WebFileSystem::Type type, long long size, bool create,
WebFileSystemCallbacks* callbacks) {
if (browser_->file_system_root().empty()) {
// The FileSystem temp directory was not initialized successfully.