Fix failing transferToImageBitmap layout tests and commit pixel test on Mac

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 58 matching lines @@
 class WebGraphicsContext3DProvider;
 class WebLayer;
 
 // Manages a rendering target (framebuffer + attachment) for a canvas.  Can publish its rendering
 // results to a WebLayer for compositing.
 class PLATFORM_EXPORT DrawingBuffer : public NON_EXPORTED_BASE(cc::TextureLayerClient), public RefCounted<DrawingBuffer> {
     WTF_MAKE_NONCOPYABLE(DrawingBuffer);
 public:
     enum PreserveDrawingBuffer {
         Preserve,
-        Discard
+        Discard,
     };
     enum WebGLVersion {
         WebGL1,
         WebGL2,
     };
 
+    enum ChromiumImageUsage {
+        AllowChromiumImage,
+        DisallowChromiumImage,
+    };
+
     static PassRefPtr<DrawingBuffer> create(
         std::unique_ptr<WebGraphicsContext3DProvider>,
         const IntSize&,
         bool premultipliedAlpha,
         bool wantAlphaChannel,
         bool wantDepthBuffer,
         bool wantStencilBuffer,
         bool wantAntialiasing,
         PreserveDrawingBuffer,
-        WebGLVersion);
+        WebGLVersion,
+        ChromiumImageUsage);
     static void forceNextDrawingBufferCreationToFail();
 
     ~DrawingBuffer() override;
 
     // Destruction will be completed after all mailboxes are released.
     void beginDestruction();
 
     // Issues a glClear() on all framebuffers associated with this DrawingBuffer. The caller is responsible for
     // making the context current and setting the clear values and masks. Modifies the framebuffer binding.
     void clearFramebuffers(GLbitfield clearMask);
@@ skipping 148 matching lines @@
 protected: // For unittests
     DrawingBuffer(
         std::unique_ptr<WebGraphicsContext3DProvider>,
         std::unique_ptr<Extensions3DUtil>,
         bool discardFramebufferSupported,
         bool wantAlphaChannel,
         bool premultipliedAlpha,
         PreserveDrawingBuffer,
         WebGLVersion,
         bool wantsDepth,
-        bool wantsStencil);
+        bool wantsStencil,
+        ChromiumImageUsage);
 
     bool initialize(const IntSize&, bool useMultisampling);
 
     // Shared memory bitmaps that were released by the compositor and can be used again by this DrawingBuffer.
     struct RecycledBitmap {
         std::unique_ptr<cc::SharedBitmap> bitmap;
         IntSize size;
     };
     Vector<RecycledBitmap> m_recycledBitmaps;
 
@@ skipping 221 matching lines @@
 
     // If the width and height of the Canvas's backing store don't
     // match those that we were given in the most recent call to
     // reshape(), then we need an intermediate bitmap to read back the
     // frame buffer into. This seems to happen when CSS styles are
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     // Used to flip a bitmap vertically.
     Vector<uint8_t> m_scanline;
+
+    // In the case of OffscreenCanvas, we do not want to enable the WebGLImageChromium flag,
+    // so we replace all the RuntimeEnabledFeatures::webGLImageChromiumEnabled() call with
+    // shouldUseChromiumImage() call, and set m_chromiumImageUsage to DisallowChromiumImage
+    // in the case of OffscreenCanvas.
+    ChromiumImageUsage m_chromiumImageUsage;
+    bool shouldUseChromiumImage();
 };
 
 } // namespace blink
 
 #endif // DrawingBuffer_h