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

Unified Diff: cc/prioritized_resource_unittest.cc

Issue 11439026: Revert 171403 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output_surface.h ('k') | cc/proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/prioritized_resource_unittest.cc
===================================================================
--- cc/prioritized_resource_unittest.cc (revision 171405)
+++ cc/prioritized_resource_unittest.cc (working copy)
@@ -7,7 +7,7 @@
#include "cc/prioritized_resource_manager.h"
#include "cc/resource.h"
#include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_graphics_context.h"
#include "cc/test/fake_proxy.h"
#include "cc/test/tiled_layer_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,10 +22,10 @@
: m_proxy(scoped_ptr<Thread>(NULL))
, m_textureSize(256, 256)
, m_textureFormat(GL_RGBA)
- , m_outputSurface(createFakeOutputSurface())
+ , m_context(WebKit::createFakeGraphicsContext())
{
DebugScopedSetImplThread implThread(&m_proxy);
- m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
+ m_resourceProvider = ResourceProvider::create(m_context.get());
}
virtual ~PrioritizedResourceTest()
@@ -98,7 +98,7 @@
FakeProxy m_proxy;
const gfx::Size m_textureSize;
const GLenum m_textureFormat;
- scoped_ptr<OutputSurface> m_outputSurface;
+ scoped_ptr<GraphicsContext> m_context;
scoped_ptr<ResourceProvider> m_resourceProvider;
};
« no previous file with comments | « cc/output_surface.h ('k') | cc/proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698