diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 08:56:05 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 08:56:05 +0000 |
| commit | ff9402a4feac0ae0b4d4cf975d6dc0a65abd5364 (patch) | |
| tree | 1bfe33f4c3d3e1d6af01aebe85811112d5c08f1d /cc/heads_up_display_layer_impl.cc | |
| parent | fd49cb768bd5461d28c7e22fe7ee017e3b5d1e01 (diff) | |
| download | chromium_src-ff9402a4feac0ae0b4d4cf975d6dc0a65abd5364.zip chromium_src-ff9402a4feac0ae0b4d4cf975d6dc0a65abd5364.tar.gz chromium_src-ff9402a4feac0ae0b4d4cf975d6dc0a65abd5364.tar.bz2 | |
Revert r173875 - "cc: Defer texture allocation (to allow async allocations)."
It broke cc_unittests on multiple bots:
http://build.chromium.org/p/chromium.win/buildstatus?builder=XP%20Tests%20%28dbg%29%281%29&number=30783
http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.7%20Tests%20%28dbg%29%281%29&number=5302
BUG=None
TEST=Tree becomes a little greener.
TBR=epenner@chromium.org
Review URL: https://codereview.chromium.org/11571053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/heads_up_display_layer_impl.cc')
| -rw-r--r-- | cc/heads_up_display_layer_impl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc index dd8f413..73f99d0 100644 --- a/cc/heads_up_display_layer_impl.cc +++ b/cc/heads_up_display_layer_impl.cc @@ -76,14 +76,8 @@ void HeadsUpDisplayLayerImpl::willDraw(ResourceProvider* resourceProvider) if (m_hudTexture->size() != bounds()) m_hudTexture->Free(); - if (!m_hudTexture->id()) { + if (!m_hudTexture->id()) m_hudTexture->Allocate(bounds(), GL_RGBA, ResourceProvider::TextureUsageAny); - // TODO(epenner): This texture was being used before setPixels was called, - // which is now not allowed (it's an uninitialized read). This should be fixed - // and this allocateForTesting() removed. - // http://crbug.com/166784 - resourceProvider->allocateForTesting(m_hudTexture->id()); - } } void HeadsUpDisplayLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData) |