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

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

Issue 9288080: Merge 105985 - 2012-01-26 Nikolas Zimmermann <nzimmermann@rim.com> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 11 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if ENABLE(SVG) 25 #if ENABLE(SVG)
26 #include "RenderSVGResource.h" 26 #include "RenderSVGResource.h"
27 27
28 #include "Frame.h"
29 #include "FrameView.h"
28 #include "RenderSVGResourceContainer.h" 30 #include "RenderSVGResourceContainer.h"
29 #include "RenderSVGResourceSolidColor.h" 31 #include "RenderSVGResourceSolidColor.h"
30 #include "SVGResources.h" 32 #include "SVGResources.h"
31 #include "SVGResourcesCache.h" 33 #include "SVGResourcesCache.h"
32 #include "SVGURIReference.h" 34 #include "SVGURIReference.h"
33 35
34 namespace WebCore { 36 namespace WebCore {
35 37
36 static inline bool inheritColorFromParentStyleIfNeeded(RenderObject* object, boo l applyToFill, Color& color) 38 static inline bool inheritColorFromParentStyleIfNeeded(RenderObject* object, boo l applyToFill, Color& color)
37 { 39 {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 } 175 }
174 176
175 current = current->parent(); 177 current = current->parent();
176 } 178 }
177 } 179 }
178 180
179 } 181 }
180 182
181 #endif 183 #endif
182 184
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698