summaryrefslogtreecommitdiffstats
path: root/cc/test/test_web_graphics_context_3d.h
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 18:23:22 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-16 18:23:22 +0000
commit2ab0352e52c75ccb3c0cc1d5c56d0cc09f19ff6c (patch)
tree0a643aadd7b7c0ea5bb964ee122924f6ea3874b4 /cc/test/test_web_graphics_context_3d.h
parente9c7f0553447bb4127a5f3231b035ce8db6e7e08 (diff)
downloadchromium_src-2ab0352e52c75ccb3c0cc1d5c56d0cc09f19ff6c.zip
chromium_src-2ab0352e52c75ccb3c0cc1d5c56d0cc09f19ff6c.tar.gz
chromium_src-2ab0352e52c75ccb3c0cc1d5c56d0cc09f19ff6c.tar.bz2
cc: Don't DeleteResource while holding write lock.
When the context is lost and we can't generate a mailbox for a resource, we delete that resource. However currently we are already optimistically holding a write lock on the resource. Instead, only take the write lock once we have generated the mailbox so we don't hold it when we delete the resource. Tests: VideoResourceUpdaterTest.SoftwareFrame VideoResourceUpdaterTest.LostContextForSoftwareFrame R=piman@chromium.org BUG=260361 Review URL: https://codereview.chromium.org/19272005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d.h')
-rw-r--r--cc/test/test_web_graphics_context_3d.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 086ab0f..5952e36 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -158,6 +158,9 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
void set_times_end_query_succeeds(int times) {
times_end_query_succeeds_ = times;
}
+ void set_times_gen_mailbox_succeeds(int times) {
+ times_gen_mailbox_succeeds_ = times;
+ }
// When set, mapImageCHROMIUM and mapBufferCHROMIUM will return NULL after
// this many times.
@@ -222,6 +225,7 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
int times_make_current_succeeds_;
int times_bind_texture_succeeds_;
int times_end_query_succeeds_;
+ int times_gen_mailbox_succeeds_;
bool context_lost_;
int times_map_image_chromium_succeeds_;
int times_map_buffer_chromium_succeeds_;