getImageData now finalizesFrame and disableAcceleration updates composit

third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/canvas2d/BaseRenderingContext2D.h"
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/css/cssom/CSSURLImageValue.h"
@@ skipping 1521 matching lines @@
   if (!result)
     exception_state.ThrowRangeError("Out of memory at ImageData creation");
   return result;
 }
 
 ImageData* BaseRenderingContext2D::getImageData(
     int sx,
     int sy,
     int sw,
     int sh,
-    ExceptionState& exception_state) const {
+    ExceptionState& exception_state) {
   if (!WTF::CheckMul(sw, sh).IsValid<int>()) {
     exception_state.ThrowRangeError("Out of memory at ImageData creation");
     return nullptr;
   }
 
   usage_counters_.num_get_image_data_calls++;
   usage_counters_.area_get_image_data_calls += sw * sh;
   if (!OriginClean())
     exception_state.ThrowSecurityError(
         "The canvas has been tainted by cross-origin data.");
@@ skipping 49 matching lines @@
       exception_state.ThrowRangeError("Out of memory at ImageData creation");
     return result;
   }
 
   WTF::ArrayBufferContents contents;
   if (!buffer->GetImageData(kUnmultiplied, image_data_rect, contents)) {
     exception_state.ThrowRangeError("Out of memory at ImageData creation");
     return nullptr;
   }
 
+  NeedsFinalizeFrame();
+
   DOMArrayBuffer* array_buffer = DOMArrayBuffer::Create(contents);
   return ImageData::Create(image_data_rect.size(),
                            DOMUint8ClampedArray::Create(
                                array_buffer, 0, array_buffer->ByteLength()));
 }
 
 void BaseRenderingContext2D::putImageData(ImageData* data,
                                           int dx,
                                           int dy,
                                           ExceptionState& exception_state) {
@@ skipping 426 matching lines @@
       ExpensiveCanvasHeuristicParameters::kShadowFixedCost[index] *
           usage_counters_.num_blurred_shadows +
       ExpensiveCanvasHeuristicParameters::
               kShadowVariableCostPerAreaTimesShadowBlurSquared[index] *
           usage_counters_.bounding_box_area_times_shadow_blur_squared;
 
   return basic_cost_of_draw_calls + fill_type_adjustment + shadow_adjustment;
 }
 
 }  // namespace blink