Revert of Make 2D canvas smarter about chosing whether or not to use GPU acceleration

third_party/WebKit/Source/platform/graphics/ImageBuffer.h

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 64 matching lines @@
 
     ~ImageBuffer();
 
     void setClient(ImageBufferClient* client) { m_client = client; }
 
     const IntSize& size() const { return m_surface->size(); }
     bool isAccelerated() const { return m_surface->isAccelerated(); }
     bool isRecording() const { return m_surface->isRecording(); }
     void setHasExpensiveOp() { m_surface->setHasExpensiveOp(); }
     bool isExpensiveToPaint() const { return m_surface->isExpensiveToPaint(); }
-    void prepareSurfaceForPaintingIfNeeded() { m_surface->prepareSurfaceForPaintingIfNeeded(); }
     bool isSurfaceValid() const;
     bool restoreSurface() const;
     void didDraw(const FloatRect&) const;
     bool wasDrawnToAfterSnapshot() const { return m_snapshotState == DrawnToAfterSnapshot; }
 
     void setFilterQuality(SkFilterQuality filterQuality) { m_surface->setFilterQuality(filterQuality); }
     void setIsHidden(bool hidden) { m_surface->setIsHidden(hidden); }
 
     // Called by subclasses of ImageBufferSurface to install a new canvas object
     void resetCanvas(SkCanvas*) const;
@@ skipping 28 matching lines @@
     // Destroys the TEXTURE_2D binding for the active texture unit of the passed context
     bool copyToPlatformTexture(WebGraphicsContext3D*, Platform3DObject, GLenum, GLenum, GLint, bool, bool);
 
     bool copyRenderingResultsFromDrawingBuffer(DrawingBuffer*, SourceDrawingBuffer);
 
     void flush(); // process deferred draw commands immediately
     void flushGpu(); // Like flush(), but flushes all the way down to the Gpu context if the surface is accelerated
 
     void notifySurfaceInvalid();
 
-    PassRefPtr<SkImage> newSkImageSnapshot(AccelerationHint) const;
-    PassRefPtr<Image> newImageSnapshot(AccelerationHint = PreferNoAcceleration) const;
+    PassRefPtr<SkImage> newSkImageSnapshot() const;
+    PassRefPtr<Image> newImageSnapshot() const;
 
     DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); }
     String debugName() const { return "ImageBuffer"; }
 
     void draw(GraphicsContext*, const FloatRect&, const FloatRect*, SkXfermode::Mode);
 
 private:
     ImageBuffer(PassOwnPtr<ImageBufferSurface>);
 
     enum SnapshotState {
@@ skipping 14 matching lines @@
     int height() const { return m_size.height(); }
     int width() const { return m_size.width(); }
 
     const unsigned char* m_data;
     const IntSize m_size;
 };
 
 } // namespace blink
 
 #endif // ImageBuffer_h