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

Side by Side Diff: cc/threaded_unittest.cc

Issue 11191018: cc: Remove wtf Locker include from unittest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCThreadedTest.h" 7 #include "CCThreadedTest.h"
8 8
9 #include "CCActiveAnimation.h" 9 #include "CCActiveAnimation.h"
10 #include "CCInputHandler.h" 10 #include "CCInputHandler.h"
(...skipping 12 matching lines...) Expand all
23 #include "cc/test/fake_web_compositor_output_surface.h" 23 #include "cc/test/fake_web_compositor_output_surface.h"
24 #include "cc/test/fake_web_graphics_context_3d.h" 24 #include "cc/test/fake_web_graphics_context_3d.h"
25 #include "cc/test/occlusion_tracker_test_common.h" 25 #include "cc/test/occlusion_tracker_test_common.h"
26 #include "cc/test/tiled_layer_test_common.h" 26 #include "cc/test/tiled_layer_test_common.h"
27 #include "testing/gmock/include/gmock/gmock.h" 27 #include "testing/gmock/include/gmock/gmock.h"
28 #include <public/Platform.h> 28 #include <public/Platform.h>
29 #include <public/WebCompositorSupport.h> 29 #include <public/WebCompositorSupport.h>
30 #include <public/WebFilterOperation.h> 30 #include <public/WebFilterOperation.h>
31 #include <public/WebFilterOperations.h> 31 #include <public/WebFilterOperations.h>
32 #include <public/WebThread.h> 32 #include <public/WebThread.h>
33 #include <wtf/Locker.h>
34 33
35 using namespace cc; 34 using namespace cc;
36 using namespace WebKit; 35 using namespace WebKit;
37 36
38 namespace WebKitTests { 37 namespace WebKitTests {
39 38
40 PassOwnPtr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs) 39 PassOwnPtr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs)
41 { 40 {
42 return adoptPtr(new CompositorFakeWebGraphicsContext3DWithTextureTracking(at trs)); 41 return adoptPtr(new CompositorFakeWebGraphicsContext3DWithTextureTracking(at trs));
43 } 42 }
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 if (m_timedOut) { 557 if (m_timedOut) {
559 FAIL() << "Test timed out"; 558 FAIL() << "Test timed out";
560 Platform::current()->compositorSupport()->shutdown(); 559 Platform::current()->compositorSupport()->shutdown();
561 return; 560 return;
562 } 561 }
563 afterTest(); 562 afterTest();
564 Platform::current()->compositorSupport()->shutdown(); 563 Platform::current()->compositorSupport()->shutdown();
565 } 564 }
566 565
567 } // namespace WebKitTests 566 } // namespace WebKitTests
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698