diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 01:42:19 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-26 01:42:19 +0000 |
| commit | 55cd74b9b658266884b0e6f9101271e6199bc77e (patch) | |
| tree | 55ad766a790960f896d42e81cfb88fed4a1553e5 /content/renderer/render_thread_impl.h | |
| parent | 1966fd19b25fc8ec99356a789bf9e3b5b7bab720 (diff) | |
| download | chromium_src-55cd74b9b658266884b0e6f9101271e6199bc77e.zip chromium_src-55cd74b9b658266884b0e6f9101271e6199bc77e.tar.gz chromium_src-55cd74b9b658266884b0e6f9101271e6199bc77e.tar.bz2 | |
Revert 253259 "Move ContextProvider binding to inside GpuVideoAc..."
Broke 100+ WebKit layout tests.
> Move ContextProvider binding to inside GpuVideoAcceleratorFactory
>
> Bind the ContextProvider inside the GpuVideoAcceleratorFactory itself, so the
> Factory can decide appropriately what to do in casae of binding failure.
>
> Also: replace references to RendererGpuVideoAcceleratorFactory with references
> to its superclass, GpuVideoAcceleratorFactory.
>
> BUG=345424
> TEST=local build on desktop Linux
> R=avi@chromium.org, fischman@chromium.org
>
> Review URL: https://codereview.chromium.org/171773014
TBR=sheu@google.com
Review URL: https://codereview.chromium.org/176923018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.h')
| -rw-r--r-- | content/renderer/render_thread_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index a613484..08f1663 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -20,6 +20,7 @@ #include "content/common/content_export.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/public/renderer/render_thread.h" +#include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" #include "ipc/ipc_channel_proxy.h" #include "ui/gfx/native_widget_types.h" @@ -53,7 +54,6 @@ class ForwardingMessageFilter; namespace media { class AudioHardwareConfig; -class GpuVideoAcceleratorFactories; } namespace v8 { @@ -264,7 +264,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, // not sent for at least one notification delay. void PostponeIdleNotification(); - scoped_refptr<media::GpuVideoAcceleratorFactories> GetGpuFactories(); + scoped_refptr<RendererGpuVideoAcceleratorFactories> GetGpuFactories(); scoped_refptr<cc::ContextProvider> OffscreenCompositorContextProvider(); scoped_refptr<webkit::gpu::ContextProviderWebContext> |