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

Update to Chromium revision 63876.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@127 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2010-10-26 16:37:30 +00:00
parent 17208765df
commit 615fac4b62
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -56,3 +56,4 @@ Date | CEF Revision | Chromium Revision
2010-10-03 | /trunk@108 | /trunk@61327 2010-10-03 | /trunk@108 | /trunk@61327
2010-10-15 | /trunk@116 | /trunk@62731 2010-10-15 | /trunk@116 | /trunk@62731
2010-10-21 | /trunk@122 | /trunk@63396 2010-10-21 | /trunk@122 | /trunk@63396
2010-10-26 | /trunk@127 | /trunk@63876

39
libcef/browser_webview_delegate.cc
View File

@ -15,11 +15,11 @@
#include "request_impl.h" #include "request_impl.h"
#include "v8_impl.h" #include "v8_impl.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h" #include "base/file_util.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/process_util.h" #include "base/process_util.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/trace_event.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "gfx/point.h" #include "gfx/point.h"
#include "media/filters/audio_renderer_impl.h" #include "media/filters/audio_renderer_impl.h"
@ -529,18 +529,14 @@ WebPlugin* BrowserWebViewDelegate::createPlugin(
WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer( WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
WebFrame* frame, WebMediaPlayerClient* client) { WebFrame* frame, WebMediaPlayerClient* client) {
scoped_refptr<media::FilterFactoryCollection> factory = media::MediaFilterCollection collection;
new media::FilterFactoryCollection();
// Add the audio renderer factory.
factory->AddFactory(media::AudioRendererImpl::CreateFilterFactory());
appcache::WebApplicationCacheHostImpl* appcache_host = appcache::WebApplicationCacheHostImpl* appcache_host =
appcache::WebApplicationCacheHostImpl::FromFrame(frame); appcache::WebApplicationCacheHostImpl::FromFrame(frame);
// TODO(hclam): this is the same piece of code as in RenderView, maybe they // TODO(hclam): this is the same piece of code as in RenderView, maybe they
// should be grouped together. // should be grouped together.
webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory = webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_simple =
new webkit_glue::MediaResourceLoaderBridgeFactory( new webkit_glue::MediaResourceLoaderBridgeFactory(
GURL(frame->url()), // referrer GURL(frame->url()), // referrer
"null", // frame origin "null", // frame origin
@ -548,18 +544,25 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
base::GetCurrentProcId(), base::GetCurrentProcId(),
appcache_host ? appcache_host->host_id() : appcache::kNoHostId, appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
0); 0);
// A simple data source that keeps all data in memory. webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered =
media::FilterFactory* simple_data_source_factory = new webkit_glue::MediaResourceLoaderBridgeFactory(
webkit_glue::SimpleDataSource::CreateFactory(MessageLoop::current(), GURL(frame->url()), // referrer
bridge_factory); "null", // frame origin
// A sophisticated data source that does memory caching. "null", // main_frame_origin
media::FilterFactory* buffered_data_source_factory = base::GetCurrentProcId(),
webkit_glue::BufferedDataSource::CreateFactory(MessageLoop::current(), appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
bridge_factory); 0);
factory->AddFactory(buffered_data_source_factory);
factory->AddFactory(simple_data_source_factory); scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer =
new webkit_glue::VideoRendererImpl(false);
collection.push_back(video_renderer);
// Add the audio renderer.
collection.push_back(new media::AudioRendererImpl());
return new webkit_glue::WebMediaPlayerImpl( return new webkit_glue::WebMediaPlayerImpl(
client, factory, new webkit_glue::VideoRendererImpl::FactoryFactory(false)); client, collection, bridge_factory_simple, bridge_factory_buffered,
false, video_renderer);
} }
WebApplicationCacheHost* BrowserWebViewDelegate::createApplicationCacheHost( WebApplicationCacheHost* BrowserWebViewDelegate::createApplicationCacheHost(

3
libcef/browser_webview_delegate_win.cc
View File

@ -18,13 +18,12 @@
#include <shlobj.h> #include <shlobj.h>
#include <shlwapi.h> #include <shlwapi.h>
#include "gfx/point.h"
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/trace_event.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "gfx/gdi_util.h" #include "gfx/gdi_util.h"
#include "gfx/native_widget_types.h" #include "gfx/native_widget_types.h"
#include "gfx/point.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
#include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"