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

Unified Diff: cc/test/pixel_test_output_surface.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forlanding6 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/test/pixel_test_output_surface.h ('k') | cc/tree_synchronizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/pixel_test_output_surface.cc
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc
index 46985b74208a68ed5ad67d976f4ac3ee25d0e4ea..a7e15423d522982b2f040e3bf194ebdfe05ea3f5 100644
--- a/cc/test/pixel_test_output_surface.cc
+++ b/cc/test/pixel_test_output_surface.cc
@@ -18,19 +18,22 @@ PixelTestOutputSurface::PixelTestOutputSurface() {
PixelTestOutputSurface::~PixelTestOutputSurface() {
}
-bool PixelTestOutputSurface::bindToClient(
- WebKit::WebCompositorOutputSurfaceClient*) {
+bool PixelTestOutputSurface::BindToClient(OutputSurfaceClient*) {
return context_->makeContextCurrent();
}
-const WebKit::WebCompositorOutputSurface::Capabilities&
- PixelTestOutputSurface::capabilities() const {
- static WebKit::WebCompositorOutputSurface::Capabilities capabilities;
+const struct OutputSurface::Capabilities& PixelTestOutputSurface::Capabilities()
+ const {
+ static struct OutputSurface::Capabilities capabilities;
return capabilities;
}
-WebKit::WebGraphicsContext3D* PixelTestOutputSurface::context3D() const {
+WebKit::WebGraphicsContext3D* PixelTestOutputSurface::Context3D() const {
return context_.get();
}
+SoftwareOutputDevice* PixelTestOutputSurface::SoftwareDevice() const {
+ return NULL;
+}
+
} // namespace cc
« no previous file with comments | « cc/test/pixel_test_output_surface.h ('k') | cc/tree_synchronizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698