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

Side by Side Diff: cc/resource_update_controller_unittest.cc

Issue 11794019: Avoid exposing gl bindings through cc public API headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 11 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 | « cc/nine_patch_layer_unittest.cc ('k') | cc/scrollbar_layer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "cc/resource_update_controller.h" 5 #include "cc/resource_update_controller.h"
6 6
7 #include "cc/prioritized_resource_manager.h"
7 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread 8 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
8 #include "cc/test/fake_output_surface.h" 9 #include "cc/test/fake_output_surface.h"
9 #include "cc/test/fake_proxy.h" 10 #include "cc/test/fake_proxy.h"
10 #include "cc/test/fake_web_graphics_context_3d.h" 11 #include "cc/test/fake_web_graphics_context_3d.h"
11 #include "cc/test/scheduler_test_common.h" 12 #include "cc/test/scheduler_test_common.h"
12 #include "cc/test/tiled_layer_test_common.h" 13 #include "cc/test/tiled_layer_test_common.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/khronos/GLES2/gl2ext.h" 15 #include "third_party/khronos/GLES2/gl2ext.h"
15 16
16 using namespace WebKit; 17 using namespace WebKit;
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 runPendingTask(&thread, controller.get()); 497 runPendingTask(&thread, controller.get());
497 } 498 }
498 499
499 EXPECT_FALSE(thread.hasPendingTask()); 500 EXPECT_FALSE(thread.hasPendingTask());
500 EXPECT_TRUE(client.readyToFinalizeCalled()); 501 EXPECT_TRUE(client.readyToFinalizeCalled());
501 EXPECT_EQ(2, m_numTotalUploads); 502 EXPECT_EQ(2, m_numTotalUploads);
502 } 503 }
503 504
504 } // namespace 505 } // namespace
505 } // namespace cc 506 } // namespace cc
OLDNEW
« no previous file with comments | « cc/nine_patch_layer_unittest.cc ('k') | cc/scrollbar_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698