Fix rebase conflict

Author: ccameron-chromium

source

@@ -75549,6 +75549,9 @@ interface <dfn interface>OffscreenCanvasRenderingContext2D</dfn> {
   data-x="dom-PredefinedColorSpace-display-p3-linear">display-p3-linear</code></dfn>" value indicates the
   <span>'display-p3-linear'</span> color space.</p>
 
+  <p><span data-x="Converting Colors">Color space conversion</span> must be applied to the canvas's
+  backing store when rendering the canvas to the output device.</p>
+
   <p class="note">The algorithm for converting between color spaces can be found in the
   <span>Converting Colors</span> section of <cite>CSS Color</cite>. This color space conversion is
   identical to the color space conversion that would be applied to an <code>img</code> element with