diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 00:34:29 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-21 00:34:29 +0000 |
| commit | a11e5c2a673d6447737c2f8282cff095e150a43a (patch) | |
| tree | 1a3898a53d6e22107c97d22b006ede45c102c4f2 /cc/test/layer_tree_pixel_test.cc | |
| parent | 48ed2610d757483f2e4ebddda617fd7e92855d5a (diff) | |
| download | chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.zip chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.tar.gz chromium_src-a11e5c2a673d6447737c2f8282cff095e150a43a.tar.bz2 | |
Revert "Add gpu::MailboxHolder to hold state for a gpu::Mailbox"
This reverts commit 9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.
This patch is the source of the top crash in canary. See the bug
for more details.
TBR=sheu
NOTREECHECKS=true
BUG=336040
Review URL: https://codereview.chromium.org/129873005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/layer_tree_pixel_test.cc')
| -rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 379808e..806b877 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -247,7 +247,7 @@ scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.name()); + gl->ConsumeTextureCHROMIUM(texture_mailbox.target(), texture_mailbox.data()); gl->BindTexture(GL_TEXTURE_2D, 0); GLuint fbo = 0; @@ -369,7 +369,7 @@ void LayerTreePixelTest::CopyBitmapToTextureMailboxAsTexture( gl->BindTexture(GL_TEXTURE_2D, 0); uint32 sync_point = gl->InsertSyncPointCHROMIUM(); - *texture_mailbox = TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point); + *texture_mailbox = TextureMailbox(mailbox, sync_point); *release_callback = SingleReleaseCallback::Create( base::Bind(&LayerTreePixelTest::ReleaseTextureMailbox, base::Unretained(this), |