Source/core/platform/graphics/filters/FEMerge.cpp - Issue 14856010: Adding color space conversion code

Side by Side Diff: Source/core/platform/graphics/filters/FEMerge.cpp

Issue 14856010: Adding color space conversion code (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Attemptimp to re-upload the patch Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « Source/core/platform/graphics/filters/FELighting.cpp ('k') | Source/core/platform/graphics/filters/FEMorphology.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>	2 * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>

3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>	3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>

4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>	4 * Copyright (C) 2005 Eric Seidel <eric@webkit.org>

5 * Copyright (C) 2013 Google Inc. All rights reserved.	5 * Copyright (C) 2013 Google Inc. All rights reserved.

6 *	6 *

7 * This library is free software; you can redistribute it and/or	7 * This library is free software; you can redistribute it and/or

8 * modify it under the terms of the GNU Library General Public	8 * modify it under the terms of the GNU Library General Public

9 * License as published by the Free Software Foundation; either	9 * License as published by the Free Software Foundation; either

10 * version 2 of the License, or (at your option) any later version.	10 * version 2 of the License, or (at your option) any later version.

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 }	60 }

61 }	61 }

62	62

63 SkImageFilter* FEMerge::createImageFilter(SkiaImageFilterBuilder* builder)	63 SkImageFilter* FEMerge::createImageFilter(SkiaImageFilterBuilder* builder)

64 {	64 {

65 unsigned size = numberOfEffectInputs();	65 unsigned size = numberOfEffectInputs();

66	66

67 OwnArrayPtr<SkAutoTUnref<SkImageFilter> > inputRefs = adoptArrayPtr(new SkAu toTUnref<SkImageFilter>[size]);	67 OwnArrayPtr<SkAutoTUnref<SkImageFilter> > inputRefs = adoptArrayPtr(new SkAu toTUnref<SkImageFilter>[size]);

68 OwnArrayPtr<SkImageFilter> inputs = adoptArrayPtr(new SkImageFilter[size]) ;	68 OwnArrayPtr<SkImageFilter> inputs = adoptArrayPtr(new SkImageFilter[size]) ;

69 for (unsigned i = 0; i < size; ++i) {	69 for (unsigned i = 0; i < size; ++i) {

70 inputRefs[i].reset(builder->build(inputEffect(i)));	70 inputRefs[i].reset(builder->build(inputEffect(i), operatingColorSpace()) );

71 inputs[i] = inputRefs[i].get();	71 inputs[i] = inputRefs[i].get();

72 }	72 }

73 return new SkMergeImageFilter(inputs.get(), size);	73 return new SkMergeImageFilter(inputs.get(), size);

74 }	74 }

75	75

76 TextStream& FEMerge::externalRepresentation(TextStream& ts, int indent) const	76 TextStream& FEMerge::externalRepresentation(TextStream& ts, int indent) const

77 {	77 {

78 writeIndent(ts, indent);	78 writeIndent(ts, indent);

79 ts << "[feMerge";	79 ts << "[feMerge";

80 FilterEffect::externalRepresentation(ts);	80 FilterEffect::externalRepresentation(ts);

81 unsigned size = numberOfEffectInputs();	81 unsigned size = numberOfEffectInputs();

82 ASSERT(size > 0);	82 ASSERT(size > 0);

83 ts << " mergeNodes=\"" << size << "\"]\n";	83 ts << " mergeNodes=\"" << size << "\"]\n";

84 for (unsigned i = 0; i < size; ++i)	84 for (unsigned i = 0; i < size; ++i)

85 inputEffect(i)->externalRepresentation(ts, indent + 1);	85 inputEffect(i)->externalRepresentation(ts, indent + 1);

86 return ts;	86 return ts;

87 }	87 }

88	88

89 } // namespace WebCore	89 } // namespace WebCore

OLD	NEW