diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:59:25 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 23:59:25 +0000 |
| commit | bf676c19e2ce156563cd0599cde087a500e9aa46 (patch) | |
| tree | 333d40bd5c24da1352109f8b6f3f9e911ac7008f /content/renderer/render_thread_impl.h | |
| parent | 3bfd21c131fab47b678b04f6f7bf1e3e8277f4a0 (diff) | |
| download | chromium_src-bf676c19e2ce156563cd0599cde087a500e9aa46.zip chromium_src-bf676c19e2ce156563cd0599cde087a500e9aa46.tar.gz chromium_src-bf676c19e2ce156563cd0599cde087a500e9aa46.tar.bz2 | |
Revert r228777: "Allow asynchronous GPU context creation for browser clients"
To see if it is responsible for browser_tests failures on Vista:
GpuFeatureTest.MultisamplingBlocked
GpuFeatureTest.WebGLBlocked
GpuFeatureTest.Canvas2DBlocked
TBR=sievers
BUG=270179,125248,235300
Review URL: https://codereview.chromium.org/26571006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_thread_impl.h')
| -rw-r--r-- | content/renderer/render_thread_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 678d06f..aea1836 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -18,6 +18,7 @@ #include "content/child/child_thread.h" #include "content/common/content_export.h" #include "content/common/gpu/client/gpu_channel_host.h" +#include "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/renderer/render_thread.h" #include "content/renderer/media/renderer_gpu_video_accelerator_factories.h" #include "ipc/ipc_channel_proxy.h" @@ -164,7 +165,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, // established or if it has been lost (for example if the GPU plugin crashed). // If there is a pending asynchronous request, it will be completed by the // time this routine returns. - GpuChannelHost* EstablishGpuChannelSync(CauseForGpuLaunch); + virtual GpuChannelHost* EstablishGpuChannelSync(CauseForGpuLaunch) OVERRIDE; // These methods modify how the next message is sent. Normally, when sending |