Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: Source/WebKit/chromium/tests/CCThreadedTest.h

Issue 10836250: Merge 125577 - [chromium] race between CCLayerTreeHostImpl::releaseContentsTextures and CCThreadPro… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 static void dispatchSetNeedsAnimateAndCommit(void* self); 127 static void dispatchSetNeedsAnimateAndCommit(void* self);
128 static void dispatchSetNeedsCommit(void* self); 128 static void dispatchSetNeedsCommit(void* self);
129 static void dispatchAcquireLayerTextures(void* self); 129 static void dispatchAcquireLayerTextures(void* self);
130 static void dispatchSetNeedsRedraw(void* self); 130 static void dispatchSetNeedsRedraw(void* self);
131 static void dispatchSetVisible(void* self); 131 static void dispatchSetVisible(void* self);
132 static void dispatchSetInvisible(void* self); 132 static void dispatchSetInvisible(void* self);
133 static void dispatchComposite(void* self); 133 static void dispatchComposite(void* self);
134 static void dispatchDidAddAnimation(void* self); 134 static void dispatchDidAddAnimation(void* self);
135 135
136 virtual void runTest(bool threaded); 136 virtual void runTest(bool threaded);
137 WebKit::WebThread* webThread() const { return m_webThread.get(); }
137 138
138 WebCore::CCLayerTreeSettings m_settings; 139 WebCore::CCLayerTreeSettings m_settings;
139 OwnPtr<MockCCLayerTreeHostClient> m_client; 140 OwnPtr<MockCCLayerTreeHostClient> m_client;
140 OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost; 141 OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
141 142
142 private: 143 private:
143 bool m_beginning; 144 bool m_beginning;
144 bool m_endWhenBeginReturns; 145 bool m_endWhenBeginReturns;
145 bool m_timedOut; 146 bool m_timedOut;
146 bool m_finished; 147 bool m_finished;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \ 218 TEST_F(TEST_FIXTURE_NAME, runSingleThread) \
218 { \ 219 { \
219 runTest(false); \ 220 runTest(false); \
220 } \ 221 } \
221 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \ 222 TEST_F(TEST_FIXTURE_NAME, runMultiThread) \
222 { \ 223 { \
223 runTest(true); \ 224 runTest(true); \
224 } 225 }
225 226
226 #endif // CCThreadedTest_h 227 #endif // CCThreadedTest_h
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/tests/CCLayerTreeHostTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698