Removing GraphicsContext from ImageBuffer

Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 61 matching lines @@
     OwnPtr<ImageBufferSurface> surface(adoptPtr(new UnacceleratedImageBufferSurface(size, opacityMode)));
     if (!surface->isValid())
         return nullptr;
     return adoptPtr(new ImageBuffer(surface.release()));
 }
 
 ImageBuffer::ImageBuffer(PassOwnPtr<ImageBufferSurface> surface)
     : m_surface(surface)
     , m_client(0)
 {
-    if (m_surface->canvas()) {
-        m_context = GraphicsContext::deprecatedCreateWithCanvas(m_surface->canvas());
-        m_context->setAccelerated(m_surface->isAccelerated());
-    }
     m_surface->setImageBuffer(this);
 }
 
 ImageBuffer::~ImageBuffer()
 {
 }
 
-GraphicsContext* ImageBuffer::context() const
-{
-    if (!isSurfaceValid())
-        return nullptr;
-    ASSERT(m_context.get());
-    return m_context.get();
-}
-
 SkCanvas* ImageBuffer::canvas() const
 {
     if (!isSurfaceValid())
         return nullptr;
     return m_surface->canvas();
 }
 
 const SkBitmap& ImageBuffer::bitmap() const
 {
     return m_surface->bitmap();
@@ skipping 27 matching lines @@
 }
 
 void ImageBuffer::notifySurfaceInvalid()
 {
     if (m_client)
         m_client->notifySurfaceInvalid();
 }
 
 void ImageBuffer::resetCanvas(SkCanvas* canvas)
 {
-    ASSERT(context()->canvas());
-    context()->resetCanvas(canvas);
     if (m_client)
         m_client->restoreCanvasMatrixClipStack();
 }
 
 PassRefPtr<SkImage> ImageBuffer::newImageSnapshot() const
 {
     return m_surface->newImageSnapshot();
 }
 
 static SkBitmap deepSkBitmapCopy(const SkBitmap& bitmap)
@@ skipping 65 matching lines @@
 
     context->flush();
     sharedContext->waitSyncPoint(context->insertSyncPoint());
 
     // Undo grContext texture binding changes introduced in this function
     provider->grContext()->resetContext(kTextureBinding_GrGLBackendState);
 
     return true;
 }
 
-static bool drawNeedsCopy(GraphicsContext* src, GraphicsContext* dst)
-{
-    ASSERT(dst);
-    return (src == dst);
-}
-
 Platform3DObject ImageBuffer::getBackingTexture()
 {
     return m_surface->getBackingTexture();
 }
 
 void ImageBuffer::didModifyBackingTexture()
 {
     m_surface->didModifyBackingTexture();
 }
 
@@ skipping 19 matching lines @@
 
     return result;
 }
 
 void ImageBuffer::draw(GraphicsContext* context, const FloatRect& destRect, const FloatRect* srcPtr, SkXfermode::Mode op)
 {
     if (!isSurfaceValid())
         return;
 
     FloatRect srcRect = srcPtr ? *srcPtr : FloatRect(FloatPoint(), size());
-    m_surface->draw(context, destRect, srcRect, op, drawNeedsCopy(m_context.get(), context));
+    m_surface->draw(context, destRect, srcRect, op);
 }
 
 void ImageBuffer::flush()
 {
     if (m_surface->canvas()) {
         m_surface->canvas()->flush();
     }
 }
 
 bool ImageBuffer::getImageData(Multiply multiplied, const IntRect& rect, WTF::ArrayBufferContents& contents) const
@@ skipping 53 matching lines @@
     ASSERT(originY >= 0);
     ASSERT(originY < sourceRect.maxY());
 
     const size_t srcBytesPerRow = 4 * sourceSize.width();
     const void* srcAddr = source + originY * srcBytesPerRow + originX * 4;
     SkAlphaType alphaType = (multiplied == Premultiplied) ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
     SkImageInfo info = SkImageInfo::Make(sourceRect.width(), sourceRect.height(), kRGBA_8888_SkColorType, alphaType);
 
     m_surface->willAccessPixels();
 
-    context()->writePixels(info, srcAddr, srcBytesPerRow, destX, destY);
+    canvas()->writePixels(info, srcAddr, srcBytesPerRow, destX, destY);
 }
 
 template <typename T>
 static bool encodeImage(T& source, const String& mimeType, const double* quality, Vector<char>* output)
 {
     Vector<unsigned char>* encodedImage = reinterpret_cast<Vector<unsigned char>*>(output);
 
     if (mimeType == "image/jpeg") {
         int compressionQuality = JPEGImageEncoder::DefaultCompressionQuality;
         if (quality && *quality >= 0.0 && *quality <= 1.0)
@@ skipping 31 matching lines @@
     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
     Vector<char> encodedImage;
     if (!encodeImage(*this, mimeType, quality, &encodedImage))
         return "data:,";
 
     return "data:" + mimeType + ";base64," + base64Encode(encodedImage);
 }
 
 } // namespace blink