summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp')
-rw-r--r--Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp
index ec22a9fd6..efecabd1d 100644
--- a/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCTiledLayerImpl.cpp
@@ -38,6 +38,7 @@
#include <wtf/text/WTFString.h>
using namespace std;
+using WebKit::WebTransformationMatrix;
namespace WebCore {
@@ -77,7 +78,7 @@ CCTiledLayerImpl::~CCTiledLayerImpl()
{
}
-void CCTiledLayerImpl::bindContentsTexture(LayerRendererChromium* layerRenderer)
+unsigned CCTiledLayerImpl::contentsTextureId() const
{
// This function is only valid for single texture layers, e.g. masks.
ASSERT(m_tiler);
@@ -88,7 +89,7 @@ void CCTiledLayerImpl::bindContentsTexture(LayerRendererChromium* layerRenderer)
Platform3DObject textureId = tile ? tile->textureId() : 0;
ASSERT(textureId);
- layerRenderer->context()->bindTexture(GraphicsContext3D::TEXTURE_2D, textureId);
+ return textureId;
}
void CCTiledLayerImpl::dumpLayerProperties(TextStream& ts, int indent) const
@@ -121,9 +122,9 @@ DrawableTile* CCTiledLayerImpl::createTile(int i, int j)
return addedTile;
}
-TransformationMatrix CCTiledLayerImpl::quadTransform() const
+WebTransformationMatrix CCTiledLayerImpl::quadTransform() const
{
- TransformationMatrix transform = drawTransform();
+ WebTransformationMatrix transform = drawTransform();
if (contentBounds().isEmpty())
return transform;