Revert of Make cc/paint have concrete types

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

 /*
  * Copyright (C) 2012 Google Inc. 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 160 matching lines @@
   class PLATFORM_EXPORT Logger {
    public:
     virtual void reportHibernationEvent(HibernationEvent);
     virtual void didStartHibernating() {}
     virtual ~Logger() {}
   };
 
   void setLoggerForTesting(std::unique_ptr<Logger>);
 
  private:
-  void ResetSurface();
-
 #if USE_IOSURFACE_FOR_2D_CANVAS
   // All information associated with a CHROMIUM image.
   struct ImageInfo;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 
   struct MailboxInfo {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     gpu::Mailbox m_mailbox;
     sk_sp<SkImage> m_image;
     RefPtr<Canvas2DLayerBridge> m_parentLayerBridge;
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
     // If this mailbox wraps an IOSurface-backed texture, the ids of the
     // CHROMIUM image and the texture.
     RefPtr<ImageInfo> m_imageInfo;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 
     MailboxInfo(const MailboxInfo&);
     MailboxInfo();
   };
 
   gpu::gles2::GLES2Interface* contextGL();
   void startRecording();
   void skipQueuedDrawCommands();
   void flushRecordingOnly();
   void reportSurfaceCreationFailure();
 
-  SkSurface* getOrCreateSurface(AccelerationHint = PreferAcceleration);
+  PaintSurface* getOrCreateSurface(AccelerationHint = PreferAcceleration);
   bool shouldAccelerate(AccelerationHint) const;
 
   // Returns the GL filter associated with |m_filterQuality|.
   GLenum getGLFilter();
 
 #if USE_IOSURFACE_FOR_2D_CANVAS
   // Creates an IOSurface-backed texture. Copies |image| into the texture.
   // Prepares a mailbox from the texture. The caller must have created a new
   // MailboxInfo, and prepended it to |m_mailboxs|. Returns whether the
   // mailbox was successfully prepared. |mailbox| is an out parameter only
@@ skipping 16 matching lines @@
 
   // Returns whether the mailbox was successfully prepared from the SkImage.
   // The mailbox is an out parameter only populated on success.
   bool prepareMailboxFromImage(sk_sp<SkImage>, cc::TextureMailbox*);
 
   // Resets Skia's texture bindings. This method should be called after
   // changing texture bindings.
   void resetSkiaTextureBinding();
 
   std::unique_ptr<PaintRecorder> m_recorder;
-  sk_sp<SkSurface> m_surface;
-  std::unique_ptr<PaintCanvas> m_surfacePaintCanvas;
+  sk_sp<PaintSurface> m_surface;
   sk_sp<SkImage> m_hibernationImage;
   int m_initialSurfaceSaveCount;
   std::unique_ptr<WebExternalTextureLayer> m_layer;
   std::unique_ptr<WebGraphicsContext3DProvider> m_contextProvider;
   std::unique_ptr<SharedContextRateLimiter> m_rateLimiter;
   std::unique_ptr<Logger> m_logger;
   WeakPtrFactory<Canvas2DLayerBridge> m_weakPtrFactory;
   ImageBuffer* m_imageBuffer;
   int m_msaaSampleCount;
   int m_framesSinceLastCommit = 0;
@@ skipping 39 matching lines @@
   // Each element in this vector represents an IOSurface backed texture that
   // is ready to be reused.
   // Elements in this vector can safely be purged in low memory conditions.
   Vector<RefPtr<ImageInfo>> m_imageInfoCache;
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 };
 
 }  // namespace blink
 
 #endif