getImageData now finalizesFrame and disableAcceleration updates composit

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h

 /*
  * Copyright (C) 2006, 2007, 2009, 2010, 2011, 2012 Apple 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 182 matching lines @@
   void ResetUsageTracking();
 
   void FinalizeFrame() override { usage_counters_.num_frames_since_reset++; }
 
   bool IsPaintable() const final { return HasImageBuffer(); }
 
   ColorBehavior DrawImageColorBehavior() const final;
 
   void WillDrawImage(CanvasImageSource*) const final;
 
+ protected:
+  virtual void NeedsFinalizeFrame() {
+    CanvasRenderingContext::NeedsFinalizeFrame();
+  }
+
  private:
   friend class CanvasRenderingContext2DAutoRestoreSkCanvas;
 
   CanvasRenderingContext2D(HTMLCanvasElement*,
                            const CanvasContextCreationAttributes& attrs,
                            Document&);
 
   void DispatchContextLostEvent(TimerBase*);
   void DispatchContextRestoredEvent(TimerBase*);
   void TryRestoreContextEvent(TimerBase*);
@@ skipping 48 matching lines @@
 
 DEFINE_TYPE_CASTS(CanvasRenderingContext2D,
                   CanvasRenderingContext,
                   context,
                   context->Is2d() && context->canvas(),
                   context.Is2d() && context.canvas());
 
 }  // namespace blink
 
 #endif  // CanvasRenderingContext2D_h