Forward fill and stroke styles from 2d canvas to canvas filters

third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 112 matching lines @@
 FilterEffectBuilder::~FilterEffectBuilder()
 {
 }
 
 DEFINE_TRACE(FilterEffectBuilder)
 {
     visitor->trace(m_lastEffect);
     visitor->trace(m_referenceFilters);
 }
 
-bool FilterEffectBuilder::build(Element* element, const FilterOperations& operations, float zoom)
+bool FilterEffectBuilder::build(Element* element, const FilterOperations& operations, float zoom, PassRefPtr<SkShader> fillShader, PassRefPtr<SkShader> strokeShader)
 {
     // Create a parent filter for shorthand filters. These have already been scaled by the CSS code for page zoom, so scale is 1.0 here.
     RefPtrWillBeRawPtr<Filter> parentFilter = Filter::create(1.0f);
     RefPtrWillBeRawPtr<FilterEffect> previousEffect = parentFilter->sourceGraphic();
     for (size_t i = 0; i < operations.operations().size(); ++i) {
         RefPtrWillBeRawPtr<FilterEffect> effect = nullptr;
         FilterOperation* filterOperation = operations.operations().at(i).get();
         switch (filterOperation->type()) {
         case FilterOperation::REFERENCE: {
-            RefPtrWillBeRawPtr<Filter> referenceFilter = ReferenceFilterBuilder::build(zoom, element, previousEffect.get(), toReferenceFilterOperation(*filterOperation));
+            RefPtrWillBeRawPtr<Filter> referenceFilter = ReferenceFilterBuilder::build(zoom, element, previousEffect.get(), toReferenceFilterOperation(*filterOperation), fillShader, strokeShader);

[fs, 2015/12/21 19:34:20]

Won't this "lose" the shaders if there were more than one "reference" filters in
the same chain? (PassRefPtr copying semantics.)

[ajuma, 2016/01/11 19:14:08]

Good catch, thanks! This now uses a raw pointer to an SkPaint (rather than a
PassRefPtr to a shader) so this is no longer a problem.

             if (referenceFilter) {
                 effect = referenceFilter->lastEffect();
                 m_referenceFilters.append(referenceFilter);
             }
             break;
         }
         case FilterOperation::GRAYSCALE: {
             Vector<float> inputParameters = grayscaleMatrix(toBasicColorMatrixFilterOperation(filterOperation)->amount());
             effect = FEColorMatrix::create(parentFilter.get(), FECOLORMATRIX_TYPE_MATRIX, inputParameters);
             break;
@@ skipping 97 matching lines @@
 
     // If we didn't make any effects, tell our caller we are not valid
     if (!m_lastEffect.get())
         return false;
 
     return true;
 }
 
 } // namespace blink