cc/texture_uploader_unittest.cc - Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: cc/texture_uploader_unittest.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix content_browsertests Created 8 years, 1 month 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 | « cc/texture_uploader.cc ('k') | cc/thread_proxy.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 2012 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"

6

7 #include "cc/texture_uploader.h"	5 #include "cc/texture_uploader.h"

8	6

9 #include "cc/prioritized_resource.h"	7 #include "cc/prioritized_resource.h"

10 #include "cc/test/fake_web_graphics_context_3d.h"	8 #include "cc/test/fake_web_graphics_context_3d.h"

11 #include "testing/gmock/include/gmock/gmock.h"	9 #include "testing/gmock/include/gmock/gmock.h"

12 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

13 #include "third_party/khronos/GLES2/gl2.h"	11 #include "third_party/khronos/GLES2/gl2.h"

14 #include "third_party/khronos/GLES2/gl2ext.h"	12 #include "third_party/khronos/GLES2/gl2ext.h"

15	13

16 using namespace cc;	14 using namespace cc;

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
91 EXPECT_EQ(1, uploader->numBlockingUploads());	89 EXPECT_EQ(1, uploader->numBlockingUploads());

92	90

93 fakeContext->setResultAvailable(1);	91 fakeContext->setResultAvailable(1);

94 EXPECT_EQ(0, uploader->numBlockingUploads());	92 EXPECT_EQ(0, uploader->numBlockingUploads());

95 uploadTexture(uploader.get());	93 uploadTexture(uploader.get());

96 uploader->markPendingUploadsAsNonBlocking();	94 uploader->markPendingUploadsAsNonBlocking();

97 EXPECT_EQ(0, uploader->numBlockingUploads());	95 EXPECT_EQ(0, uploader->numBlockingUploads());

98 }	96 }

99	97

100 } // anonymous namespace	98 } // anonymous namespace

OLD	NEW