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/layers/delegated_frame_provider_unittest.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/layers/delegated_frame_provider_unittest.cc')
| -rw-r--r-- | cc/layers/delegated_frame_provider_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layers/delegated_frame_provider_unittest.cc b/cc/layers/delegated_frame_provider_unittest.cc index f29488d..2a4f564 100644 --- a/cc/layers/delegated_frame_provider_unittest.cc +++ b/cc/layers/delegated_frame_provider_unittest.cc @@ -38,7 +38,7 @@ class DelegatedFrameProviderTest ResourceProvider::ResourceId resource_id) { TransferableResource resource; resource.id = resource_id; - resource.mailbox_holder.texture_target = GL_TEXTURE_2D; + resource.target = GL_TEXTURE_2D; frame->resource_list.push_back(resource); } |