Simplify rate limiter logic in Canvas2DLayerBridge

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 16 matching lines @@
 #define Canvas2DLayerBridge_h
 
 #include "cc/layers/texture_layer_client.h"
 #include "cc/resources/texture_mailbox.h"
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/graphics/ImageBufferSurface.h"
 #include "platform/graphics/paint/PaintRecorder.h"
 #include "platform/graphics/paint/PaintSurface.h"
 #include "public/platform/WebExternalTextureLayer.h"
-#include "public/platform/WebThread.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "ui/gfx/color_space.h"
 #include "wtf/Allocator.h"
 #include "wtf/Deque.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/WeakPtr.h"
 
@@ skipping 25 matching lines @@
 #else
 #define CANVAS2D_HIBERNATION_ENABLED 1
 #define USE_IOSURFACE_FOR_2D_CANVAS 0
 #endif
 
 // TODO: Fix background rendering and remove this workaround. crbug.com/600386
 #define CANVAS2D_BACKGROUND_RENDER_SWITCH_TO_CPU 0
 
 class PLATFORM_EXPORT Canvas2DLayerBridge
     : public NON_EXPORTED_BASE(cc::TextureLayerClient),
-      public WebThread::TaskObserver,
       public RefCounted<Canvas2DLayerBridge> {
   WTF_MAKE_NONCOPYABLE(Canvas2DLayerBridge);
 
  public:
   enum AccelerationMode {
     DisableAcceleration,
     EnableAcceleration,
     ForceAccelerationForTesting,
   };
 
@@ skipping 104 matching lines @@
 #endif  // USE_IOSURFACE_FOR_2D_CANVAS
 
     MailboxInfo(const MailboxInfo&);
     MailboxInfo();
   };
 
   gpu::gles2::GLES2Interface* contextGL();
   void startRecording();
   void skipQueuedDrawCommands();
   void flushRecordingOnly();
-  void unregisterTaskObserver();
   void reportSurfaceCreationFailure();
 
-  // WebThread::TaskOberver implementation
-  void willProcessTask() override;
-  void didProcessTask() override;
-
   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
@@ skipping 27 matching lines @@
   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;
   size_t m_bytesAllocated;
   bool m_haveRecordedDrawCommands;
   bool m_destructionInProgress;
   SkFilterQuality m_filterQuality;
   bool m_isHidden;
   bool m_isDeferralEnabled;
-  bool m_isRegisteredTaskObserver;
-  bool m_renderingTaskCompletedForCurrentFrame;
   bool m_softwareRenderingWhileHidden;
   bool m_surfaceCreationFailedAtLeastOnce = false;
   bool m_hibernationScheduled = false;
   bool m_dontUseIdleSchedulingForTesting = false;
   bool m_didDrawSinceLastFlush = false;
   bool m_didDrawSinceLastGpuFlush = false;
 
   friend class Canvas2DLayerBridgeTest;
   friend class CanvasRenderingContext2DTest;
   friend class HTMLCanvasPainterTestForSPv2;
@@ skipping 23 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