getImageData now finalizesFrame and disableAcceleration updates composit

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

Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
index 9b239fabc7e2e614911e3d62f11b5d8e2080b306..9653160eccf6da95850252b47b4b17683b287e83 100644
--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp
@@ -1539,7 +1539,7 @@ ImageData* BaseRenderingContext2D::getImageData(
     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;
@@ -1609,6 +1609,8 @@ ImageData* BaseRenderingContext2D::getImageData(
     return nullptr;
   }
 
+  NeedsFinalizeFrame();
+
   DOMArrayBuffer* array_buffer = DOMArrayBuffer::Create(contents);
   return ImageData::Create(image_data_rect.size(),
                            DOMUint8ClampedArray::Create(