bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 131752. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@587 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-04-11 19:37:06 +00:00
parent 9d200c109a
commit b061ea934e
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cef1/libcef/browser_webview_delegate.cc
View File

@ -30,10 +30,11 @@
#include "base/process_util.h" #include "base/process_util.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "media/audio/null_audio_sink.h"
#include "media/base/filter_collection.h" #include "media/base/filter_collection.h"
#include "media/base/media_log.h" #include "media/base/media_log.h"
#include "media/base/message_loop_factory.h" #include "media/base/message_loop_factory.h"
#include "media/filters/null_audio_renderer.h" #include "media/filters/audio_renderer_impl.h"
#include "net/base/net_errors.h" #include "net/base/net_errors.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h"
@ -677,7 +678,8 @@ WebMediaPlayer* BrowserWebViewDelegate::createMediaPlayer(
// Add the audio renderer. // Add the audio renderer.
// TODO(vrk): Re-enable audio. (crbug.com/112159) // TODO(vrk): Re-enable audio. (crbug.com/112159)
collection->AddAudioRenderer(new media::NullAudioRenderer()); collection->AddAudioRenderer(
new media::AudioRendererImpl(new media::NullAudioSink()));
return new webkit_media::WebMediaPlayerImpl( return new webkit_media::WebMediaPlayerImpl(
frame, frame,

2
cef1/libcef/browser_webview_delegate.h
View File

@ -33,7 +33,7 @@
#include "webkit/glue/webcursor.h" #include "webkit/glue/webcursor.h"
#include "webkit/plugins/npapi/webplugin_page_delegate.h" #include "webkit/plugins/npapi/webplugin_page_delegate.h"
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
#include <gdk/gdk.h> // NOLINT(build/include_order) #include <gdk/gdk.h> // NOLINT(build/include_order)
#endif #endif

6
cef1/libcef/webview_host.h
View File

@ -10,7 +10,7 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "ui/gfx/native_widget_types.h" #include "ui/gfx/native_widget_types.h"
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
#include "webkit/plugins/npapi/gtk_plugin_container_manager.h" #include "webkit/plugins/npapi/gtk_plugin_container_manager.h"
#endif #endif
@ -39,7 +39,7 @@ class WebViewHost : public WebWidgetHost {
WebKit::WebView* webview() const; WebKit::WebView* webview() const;
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
// Create a new plugin parent container for a given plugin XID. // Create a new plugin parent container for a given plugin XID.
void CreatePluginContainer(gfx::PluginWindowHandle id); void CreatePluginContainer(gfx::PluginWindowHandle id);
@ -67,7 +67,7 @@ class WebViewHost : public WebWidgetHost {
virtual void KeyEvent(UINT message, WPARAM wparam, LPARAM lparam); virtual void KeyEvent(UINT message, WPARAM wparam, LPARAM lparam);
#endif #endif
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
// Helper class that creates and moves plugin containers. // Helper class that creates and moves plugin containers.
webkit::npapi::GtkPluginContainerManager plugin_container_manager_; webkit::npapi::GtkPluginContainerManager plugin_container_manager_;
#endif #endif

6
cef1/libcef/webwidget_host.h
View File

@ -30,7 +30,7 @@
#include "ui/base/win/ime_input.h" #include "ui/base/win/ime_input.h"
#endif #endif
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
#include <gtk/gtk.h> // NOLINT(build/include_order) #include <gtk/gtk.h> // NOLINT(build/include_order)
#endif #endif
@ -186,7 +186,7 @@ class WebWidgetHost {
virtual void SetFocus(bool enable); virtual void SetFocus(bool enable);
protected: protected:
#elif defined(TOOLKIT_USES_GTK) #elif defined(TOOLKIT_GTK)
public: public:
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -284,7 +284,7 @@ class WebWidgetHost {
WebKit::WebRect caret_bounds_; WebKit::WebRect caret_bounds_;
#endif #endif
#if defined(TOOLKIT_USES_GTK) #if defined(TOOLKIT_GTK)
// Since GtkWindow resize is asynchronous, we have to stash the dimensions, // Since GtkWindow resize is asynchronous, we have to stash the dimensions,
// so that the backing store doesn't have to wait for sizing to take place. // so that the backing store doesn't have to wait for sizing to take place.
gfx::Size logical_size_; gfx::Size logical_size_;

8
cef1/patch/patches/base.patch
View File

@ -1,8 +1,8 @@
Index: message_loop.cc Index: message_loop.cc
=================================================================== ===================================================================
--- message_loop.cc (revision 130586) --- message_loop.cc (revision 131752)
+++ message_loop.cc (working copy) +++ message_loop.cc (working copy)
@@ -361,9 +361,13 @@ @@ -362,9 +362,13 @@
} }
void MessageLoop::AssertIdle() const { void MessageLoop::AssertIdle() const {
@ -19,9 +19,9 @@ Index: message_loop.cc
bool MessageLoop::is_running() const { bool MessageLoop::is_running() const {
Index: message_loop.h Index: message_loop.h
=================================================================== ===================================================================
--- message_loop.h (revision 130586) --- message_loop.h (revision 131752)
+++ message_loop.h (working copy) +++ message_loop.h (working copy)
@@ -350,6 +350,9 @@ @@ -346,6 +346,9 @@
// Asserts that the MessageLoop is "idle". // Asserts that the MessageLoop is "idle".
void AssertIdle() const; void AssertIdle() const;