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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderSVGRoot.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org> 3 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
4 2007 Eric Seidel <eric@webkit.org> 4 2007 Eric Seidel <eric@webkit.org>
5 5
6 This file is part of the KDE project 6 This file is part of the KDE project
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 SVGLength height = svg->height(); 220 SVGLength height = svg->height();
221 if (height.unitType() == LengthTypePercentage && svg->hasSetContainerSiz e()) 221 if (height.unitType() == LengthTypePercentage && svg->hasSetContainerSiz e())
222 h = svg->relativeHeightValue(); 222 h = svg->relativeHeightValue();
223 else 223 else
224 h = height.value(svg); 224 h = height.value(svg);
225 225
226 m_viewport = FloatRect(0, 0, w, h); 226 m_viewport = FloatRect(0, 0, w, h);
227 } 227 }
228 } 228 }
229 229
230 IntRect RenderSVGRoot::clippedOverflowRectForRepaint(RenderBoxModelObject* repai ntContainer) 230 IntRect RenderSVGRoot::clippedOverflowRectForRepaint(RenderBox* repaintContainer )
231 { 231 {
232 IntRect repaintRect; 232 IntRect repaintRect;
233 233
234 for (RenderObject* current = firstChild(); current != 0; current = current-> nextSibling()) 234 for (RenderObject* current = firstChild(); current != 0; current = current-> nextSibling())
235 repaintRect.unite(current->clippedOverflowRectForRepaint(repaintContaine r)); 235 repaintRect.unite(current->clippedOverflowRectForRepaint(repaintContaine r));
236 236
237 #if ENABLE(SVG_FILTERS) 237 #if ENABLE(SVG_FILTERS)
238 // Filters can expand the bounding box 238 // Filters can expand the bounding box
239 SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->f ilter()); 239 SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->f ilter());
240 if (filter) 240 if (filter)
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 RenderBox::position(box); 334 RenderBox::position(box);
335 if (m_absoluteBounds.isEmpty()) 335 if (m_absoluteBounds.isEmpty())
336 setNeedsLayout(true, false); 336 setNeedsLayout(true, false);
337 } 337 }
338 338
339 } 339 }
340 340
341 #endif // ENABLE(SVG) 341 #endif // ENABLE(SVG)
342 342
343 // vim:ts=4:noet 343 // vim:ts=4:noet
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderSVGRoot.h ('k') | third_party/WebKit/WebCore/rendering/RenderSVGText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698