| Index: Source/platform/graphics/ImageBuffer.cpp
|
| diff --git a/Source/platform/graphics/ImageBuffer.cpp b/Source/platform/graphics/ImageBuffer.cpp
|
| index 6d997d37b09ffc368e0cffcc4e47efa54a01b52b..0defbb08d07d60222c6ee2c08ae57350c93dfe0e 100644
|
| --- a/Source/platform/graphics/ImageBuffer.cpp
|
| +++ b/Source/platform/graphics/ImageBuffer.cpp
|
| @@ -163,12 +163,12 @@ BackingStoreCopy ImageBuffer::fastCopyImageMode()
|
| return DontCopyBackingStore;
|
| }
|
|
|
| -blink::WebLayer* ImageBuffer::platformLayer() const
|
| +WebLayer* ImageBuffer::platformLayer() const
|
| {
|
| return m_surface->layer();
|
| }
|
|
|
| -bool ImageBuffer::copyToPlatformTexture(blink::WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)
|
| +bool ImageBuffer::copyToPlatformTexture(WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum destType, GLint level, bool premultiplyAlpha, bool flipY)
|
| {
|
| if (!m_surface->isAccelerated() || !platformLayer() || !isSurfaceValid())
|
| return false;
|
| @@ -176,14 +176,14 @@ bool ImageBuffer::copyToPlatformTexture(blink::WebGraphicsContext3D* context, Pl
|
| if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(internalFormat, destType, level))
|
| return false;
|
|
|
| - OwnPtr<blink::WebGraphicsContext3DProvider> provider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
|
| + OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
|
| if (!provider)
|
| return false;
|
| - blink::WebGraphicsContext3D* sharedContext = provider->context3d();
|
| + WebGraphicsContext3D* sharedContext = provider->context3d();
|
| if (!sharedContext || !sharedContext->makeContextCurrent())
|
| return false;
|
|
|
| - OwnPtr<blink::WebExternalTextureMailbox> mailbox = adoptPtr(new blink::WebExternalTextureMailbox);
|
| + OwnPtr<WebExternalTextureMailbox> mailbox = adoptPtr(new WebExternalTextureMailbox);
|
|
|
| // Contexts may be in a different share group. We must transfer the texture through a mailbox first
|
| sharedContext->genMailboxCHROMIUM(mailbox->name);
|
| @@ -234,10 +234,10 @@ bool ImageBuffer::copyRenderingResultsFromDrawingBuffer(DrawingBuffer* drawingBu
|
| {
|
| if (!drawingBuffer)
|
| return false;
|
| - OwnPtr<blink::WebGraphicsContext3DProvider> provider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
|
| + OwnPtr<WebGraphicsContext3DProvider> provider = adoptPtr(Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
|
| if (!provider)
|
| return false;
|
| - blink::WebGraphicsContext3D* context3D = provider->context3d();
|
| + WebGraphicsContext3D* context3D = provider->context3d();
|
| Platform3DObject tex = m_surface->getBackingTexture();
|
| if (!context3D || !tex)
|
| return false;
|
| @@ -280,7 +280,7 @@ void ImageBuffer::flush()
|
| }
|
|
|
| void ImageBuffer::drawPattern(GraphicsContext* context, const FloatRect& srcRect, const FloatSize& scale,
|
| - const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect, blink::WebBlendMode blendMode, const IntSize& repeatSpacing)
|
| + const FloatPoint& phase, CompositeOperator op, const FloatRect& destRect, WebBlendMode blendMode, const IntSize& repeatSpacing)
|
| {
|
| if (!isSurfaceValid())
|
| return;
|
|
|