Make CSSStyleImageValue a member of CanvasImageSource.

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/ExceptionStatePlaceholder.h"
+#include "core/css/cssom/CSSURLImageValue.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
 #include "modules/canvas2d/CanvasGradient.h"
 #include "modules/canvas2d/CanvasPattern.h"
 #include "modules/canvas2d/CanvasStyle.h"
 #include "modules/canvas2d/Path2D.h"
 #include "platform/Histogram.h"
+#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
 #include "platform/graphics/StrokeData.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 
 namespace blink {
 
@@ skipping 828 matching lines @@
     srcRect->intersect(imageRect);
 
     // To clip the destination rectangle in the same proportion, transform the clipped src rect
     *dstRect = *srcRect;
     dstRect->scale(scale.width(), scale.height());
     dstRect->move(offset);
 }
 
 static inline CanvasImageSource* toImageSourceInternal(const CanvasImageSourceUnion& value, ExceptionState& exceptionState)
 {
+    if (value.isCSSImageValue())
+        return RuntimeEnabledFeatures::cssPaintAPIEnabled() ? value.getAsCSSImageValue() : nullptr;

[Justin Novosad, 2016/09/28 17:12:33]

Good idea to do it this way.

[Justin Novosad, 2016/09/28 17:17:35]

Wait a second... To be correct, a TypeError exception should be thrown if the
feature is disabled.

[Gleb Lanbin, 2016/09/28 17:47:00]

Done.

     if (value.isHTMLImageElement())
         return value.getAsHTMLImageElement();
     if (value.isHTMLVideoElement())
         return value.getAsHTMLVideoElement();
     if (value.isHTMLCanvasElement())
         return value.getAsHTMLCanvasElement();
     if (value.isImageBitmap()) {
         if (static_cast<ImageBitmap*>(value.getAsImageBitmap())->isNeutered()) {
             exceptionState.throwDOMException(InvalidStateError, String::format("The image source is detached"));
             return nullptr;
@@ skipping 829 matching lines @@
         ExpensiveCanvasHeuristicParameters::RadialGradientFillVariableCostPerArea[index] * m_usageCounters.boundingBoxAreaFillType[BaseRenderingContext2D::RadialGradientFillType];
 
     float shadowAdjustment =
         ExpensiveCanvasHeuristicParameters::ShadowFixedCost[index] * m_usageCounters.numBlurredShadows +
         ExpensiveCanvasHeuristicParameters::ShadowVariableCostPerAreaTimesShadowBlurSquared[index] * m_usageCounters.boundingBoxAreaTimesShadowBlurSquared;
 
     return basicCostOfDrawCalls + fillTypeAdjustment + shadowAdjustment;
 }
 
 } // namespace blink