Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(652)

Side by Side Diff: Source/core/rendering/svg/RenderSVGResource.cpp

Issue 625933003: Consolidated checks for the PaintBehaviorRenderingSVGMask flag (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2007 Rob Buis <buis@kde.org> 3 * Copyright (C) 2007 Rob Buis <buis@kde.org>
4 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org> 4 * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2010. 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.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 24
25 #include "core/rendering/svg/RenderSVGResource.h" 25 #include "core/rendering/svg/RenderSVGResource.h"
26 26
27 #include "core/frame/FrameView.h"
28 #include "core/frame/LocalFrame.h"
29 #include "core/rendering/svg/RenderSVGResourceClipper.h" 27 #include "core/rendering/svg/RenderSVGResourceClipper.h"
30 #include "core/rendering/svg/RenderSVGResourceFilter.h" 28 #include "core/rendering/svg/RenderSVGResourceFilter.h"
31 #include "core/rendering/svg/RenderSVGResourceMasker.h" 29 #include "core/rendering/svg/RenderSVGResourceMasker.h"
32 #include "core/rendering/svg/RenderSVGResourceSolidColor.h" 30 #include "core/rendering/svg/RenderSVGResourceSolidColor.h"
31 #include "core/rendering/svg/SVGRenderSupport.h"
33 #include "core/rendering/svg/SVGResources.h" 32 #include "core/rendering/svg/SVGResources.h"
34 #include "core/rendering/svg/SVGResourcesCache.h" 33 #include "core/rendering/svg/SVGResourcesCache.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceM ode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback) 37 RenderSVGResource* RenderSVGResource::requestPaintingResource(RenderSVGResourceM ode mode, RenderObject* object, const RenderStyle* style, bool& hasFallback)
39 { 38 {
40 ASSERT(object); 39 ASSERT(object);
41 ASSERT(style); 40 ASSERT(style);
42 41
43 hasFallback = false; 42 hasFallback = false;
44 43
45 // If we have no style at all, ignore it. 44 // If we have no style at all, ignore it.
46 const SVGRenderStyle& svgStyle = style->svgStyle(); 45 const SVGRenderStyle& svgStyle = style->svgStyle();
47 46
48 bool isRenderingMask = false; 47 bool isRenderingMask = SVGRenderSupport::isRenderingMaskImage(*object);
49 if (object->frame() && object->frame()->view())
50 isRenderingMask = object->frame()->view()->paintBehavior() & PaintBehavi orRenderingSVGMask;
51 48
52 // If we have no fill/stroke, return 0. 49 // If we have no fill/stroke, return 0.
53 if (mode == ApplyToFillMode) { 50 if (mode == ApplyToFillMode) {
54 // When rendering the mask for a RenderSVGResourceClipper, always use th e initial fill paint server, and ignore stroke. 51 // When rendering the mask for a RenderSVGResourceClipper, always use th e initial fill paint server, and ignore stroke.
55 if (isRenderingMask) { 52 if (isRenderingMask) {
56 RenderSVGResourceSolidColor* colorResource = RenderSVGResource::shar edSolidPaintingResource(); 53 RenderSVGResourceSolidColor* colorResource = RenderSVGResource::shar edSolidPaintingResource();
57 colorResource->setColor(SVGRenderStyle::initialFillPaintColor()); 54 colorResource->setColor(SVGRenderStyle::initialFillPaintColor());
58 return colorResource; 55 return colorResource;
59 } 56 }
60 57
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 // This will process the rest of the ancestors. 191 // This will process the rest of the ancestors.
195 toRenderSVGResourceContainer(current)->removeAllClientsFromCache(); 192 toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
196 break; 193 break;
197 } 194 }
198 195
199 current = current->parent(); 196 current = current->parent();
200 } 197 }
201 } 198 }
202 199
203 } 200 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGResourceSolidColor.cpp » ('j') | Source/core/rendering/svg/SVGRenderSupport.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698