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. |