diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-04 00:03:56 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-04 00:03:56 +0000 |
| commit | 9b9a6c37d7a4b19d64ce31e0d02213ec7770e068 (patch) | |
| tree | d39b81134e32adf24ed690bbf1f24ddcdbf202e4 /webkit/compositor_bindings | |
| parent | a4a150e732023e312a86cdff2cac92a457a08518 (diff) | |
| download | chromium_src-9b9a6c37d7a4b19d64ce31e0d02213ec7770e068.zip chromium_src-9b9a6c37d7a4b19d64ce31e0d02213ec7770e068.tar.gz chromium_src-9b9a6c37d7a4b19d64ce31e0d02213ec7770e068.tar.bz2 | |
Disable threaded compositing when texture sharing is blacklisted
When texture_sharing is blacklisted, we can't do readbacks from the
browser process and thus hit the render process to do readbacks for
the thumbnailer or the extensions getVisibleTab() API. This path is
a bit buggy in threaded compositing mode, so disable the thread.
BUG=158747
Review URL: https://chromiumcodereview.appspot.com/11361077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings')
| -rw-r--r-- | webkit/compositor_bindings/web_compositor_support_impl.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/web_compositor_support_impl.cc b/webkit/compositor_bindings/web_compositor_support_impl.cc index 32a1840..6d237be 100644 --- a/webkit/compositor_bindings/web_compositor_support_impl.cc +++ b/webkit/compositor_bindings/web_compositor_support_impl.cc @@ -5,6 +5,7 @@ #include "config.h" #include "webkit/compositor_bindings/web_compositor_support_impl.h" +#include "base/debug/trace_event.h" #include "base/memory/scoped_ptr.h" #include "cc/settings.h" #include "webkit/compositor_bindings/web_animation_impl.h" @@ -56,6 +57,9 @@ WebCompositorSupportImpl::~WebCompositorSupportImpl() { } void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) { + if (thread) { + TRACE_EVENT_INSTANT0("test_gpu", "ThreadedCompositingInitialization"); + } WebCompositorImpl::initialize(thread); } |