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

Unified Diff: cc/io_surface_layer_impl.cc

Issue 11450019: Finish the rename from cc::GraphicsContext to cc::OutputSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
Index: cc/io_surface_layer_impl.cc
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc
index bcf0072d56432303b4c1229397da1d0ae3a71b24..10d80f385e8566ee496cfc2212fd7257d237f901 100644
--- a/cc/io_surface_layer_impl.cc
+++ b/cc/io_surface_layer_impl.cc
@@ -6,13 +6,13 @@
#include "base/stringprintf.h"
#include "cc/gl_renderer.h" // For the GLC() macro.
-#include "cc/graphics_context.h"
#include "cc/io_surface_draw_quad.h"
#include "cc/layer_tree_host_impl.h"
+#include "cc/output_surface.h"
#include "cc/quad_sink.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
-#include <public/WebGraphicsContext3D.h>
namespace cc {
@@ -29,9 +29,9 @@ IOSurfaceLayerImpl::~IOSurfaceLayerImpl()
if (!m_ioSurfaceTextureId)
return;
- GraphicsContext* context = layerTreeHostImpl()->context();
+ OutputSurface* outputSurface = layerTreeHostImpl()->outputSurface();
// FIXME: Implement this path for software compositing.
- WebKit::WebGraphicsContext3D* context3d = context->context3D();
+ WebKit::WebGraphicsContext3D* context3d = outputSurface->context3D();
if (context3d)
context3d->deleteTexture(m_ioSurfaceTextureId);
}
@@ -91,7 +91,7 @@ void IOSurfaceLayerImpl::dumpLayerProperties(std::string* str, int indent) const
LayerImpl::dumpLayerProperties(str, indent);
}
-void IOSurfaceLayerImpl::didLoseContext()
+void IOSurfaceLayerImpl::didLoseOutputSurface()
{
// We don't have a valid texture ID in the new context; however,
// the IOSurface is still valid.
« no previous file with comments | « cc/io_surface_layer_impl.h ('k') | cc/layer_impl.h » ('j') | cc/layer_tree_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698