diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 05:26:08 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 05:26:08 +0000 |
| commit | 199e9257d7e6da23084e5ce1d971612bf8ad4c5a (patch) | |
| tree | ee93ee2ebb2cb3e5b4d329246c2a953183d30776 /cc/io_surface_layer_impl.cc | |
| parent | 1de414e56ef482f10f3e37ec39d0812960065614 (diff) | |
| download | chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.zip chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.tar.gz chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.tar.bz2 | |
Revert 171403
cc_unittests is failing. Looks like something conflicted with this.
> cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
>
> It is far too confusing to deal with OutputSurface code when half the time it is
> called a GraphicsContext in correctly. Cleaning this up so I can think about the
> code properly as I upstream the Ubercomp CL.
>
> NOTRY=true
> R=jamesr,piman
> BUG=146080
>
>
> Review URL: https://chromiumcodereview.appspot.com/11450019
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11439026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/io_surface_layer_impl.cc')
| -rw-r--r-- | cc/io_surface_layer_impl.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cc/io_surface_layer_impl.cc b/cc/io_surface_layer_impl.cc index 10d80f3..bcf0072 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; - OutputSurface* outputSurface = layerTreeHostImpl()->outputSurface(); + GraphicsContext* context = layerTreeHostImpl()->context(); // FIXME: Implement this path for software compositing. - WebKit::WebGraphicsContext3D* context3d = outputSurface->context3D(); + WebKit::WebGraphicsContext3D* context3d = context->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::didLoseOutputSurface() +void IOSurfaceLayerImpl::didLoseContext() { // We don't have a valid texture ID in the new context; however, // the IOSurface is still valid. |