Index: content/renderer/render_thread_impl.cc |
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
index 414b01a38ee11eec77724e74d5d7f59fa38e9a75..9eef7233d616b83e64f88b441139594e6b2c6505 100644 |
--- a/content/renderer/render_thread_impl.cc |
+++ b/content/renderer/render_thread_impl.cc |
@@ -73,6 +73,7 @@ |
#include "content/renderer/dom_storage/dom_storage_dispatcher.h" |
#include "content/renderer/dom_storage/webstoragearea_impl.h" |
#include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
+#include "content/renderer/gpu/compositor_external_begin_frame_source.h" |
#include "content/renderer/gpu/compositor_output_surface.h" |
#include "content/renderer/gpu/gpu_benchmarking_extension.h" |
#include "content/renderer/input/input_event_filter.h" |
@@ -645,6 +646,11 @@ void RenderThreadImpl::Shutdown() { |
compositor_output_surface_filter_ = NULL; |
} |
+ if (begin_frame_source_filter_.get()) { |
+ RemoveFilter(begin_frame_source_filter_.get()); |
+ begin_frame_source_filter_ = NULL; |
+ } |
+ |
media_thread_.reset(); |
// AudioMessageFilter may be accessed on |media_thread_|, so shutdown after. |
@@ -913,6 +919,10 @@ void RenderThreadImpl::EnsureWebKitInitialized() { |
CompositorOutputSurface::CreateFilter(output_surface_loop.get()); |
AddFilter(compositor_output_surface_filter_.get()); |
+ begin_frame_source_filter_ = CompositorExternalBeginFrameSource::CreateFilter( |
+ output_surface_loop.get()); |
+ AddFilter(begin_frame_source_filter_.get()); |
piman
2014/10/10 20:39:46
I would prefer if there was still a single filter.
simonhong
2014/10/15 01:04:22
Thanks for pointing out.
CreateCompositorMessageFi
|
+ |
RenderThreadImpl::RegisterSchemes(); |
EnableBlinkPlatformLogChannels( |