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

third_party/WebKit/Source/core/html/HTMLCanvasElement.h

 /*
  * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * 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 114 matching lines @@
 
     SkCanvas* drawingCanvas() const;
     void disableDeferral() const;
     SkCanvas* existingDrawingCanvas() const;
 
     void setRenderingContext(PassOwnPtrWillBeRawPtr<CanvasRenderingContext>);
     CanvasRenderingContext* renderingContext() const { return m_context.get(); }
 
     void ensureUnacceleratedImageBuffer();
     ImageBuffer* buffer() const;
-    PassRefPtr<Image> copiedImage(SourceDrawingBuffer, AccelerationHint) const;
+    PassRefPtr<Image> copiedImage(SourceDrawingBuffer) const;
     void clearCopiedImage();
 
     SecurityOrigin* securityOrigin() const;
     bool originClean() const;
     void setOriginTainted() { m_originClean = false; }
 
     AffineTransform baseTransform() const;
 
     bool is3D() const;
     bool isAnimated2D() const;
 
     bool hasImageBuffer() const { return m_imageBuffer; }
     void discardImageBuffer();
 
     bool shouldAccelerate(const IntSize&) const;
 
     bool shouldBeDirectComposited() const;
 
-    void prepareSurfaceForPaintingIfNeeded() const;
-
     const AtomicString imageSourceURL() const override;
 
     InsertionNotificationRequest insertedInto(ContainerNode*) override;
 
     // DocumentVisibilityObserver implementation
     void didChangeVisibilityState(PageVisibilityState) override;
 
     // CanvasImageSource implementation
-    PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*, AccelerationHint) const override;
+    PassRefPtr<Image> getSourceImageForCanvas(SourceImageStatus*) const override;
     bool wouldTaintOrigin(SecurityOrigin*) const override;
     FloatSize elementSize() const override;
     bool isCanvasElement() const override { return true; }
     bool isOpaque() const override;
 
     // ImageBufferClient implementation
     void notifySurfaceInvalid() override;
     bool isDirty() override { return !m_dirtyRect.isEmpty(); }
     void didFinalizeFrame() override;
     void restoreCanvasMatrixClipStack(SkCanvas*) const override;
@@ skipping 57 matching lines @@
     mutable bool m_didFailToCreateImageBuffer;
     bool m_imageBufferIsClear;
     OwnPtr<ImageBuffer> m_imageBuffer;
 
     mutable RefPtr<Image> m_copiedImage; // FIXME: This is temporary for platforms that have to copy the image buffer to render (and for CSSCanvasValue).
 };
 
 } // namespace blink
 
 #endif // HTMLCanvasElement_h