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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderPath.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, 2008 Rob Buis <buis@kde.org> 3 2004, 2005, 2008 Rob Buis <buis@kde.org>
4 2005, 2007 Eric Seidel <eric@webkit.org> 4 2005, 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 setPath(static_cast<SVGStyledTransformableElement*>(element())->toPathData() ); 164 setPath(static_cast<SVGStyledTransformableElement*>(element())->toPathData() );
165 165
166 m_absoluteBounds = absoluteClippedOverflowRect(); 166 m_absoluteBounds = absoluteClippedOverflowRect();
167 167
168 repainter.repaintAfterLayout(); 168 repainter.repaintAfterLayout();
169 169
170 setNeedsLayout(false); 170 setNeedsLayout(false);
171 } 171 }
172 172
173 IntRect RenderPath::clippedOverflowRectForRepaint(RenderBoxModelObject* /*repain tContainer*/) 173 IntRect RenderPath::clippedOverflowRectForRepaint(RenderBox* /*repaintContainer* /)
174 { 174 {
175 // FIXME: handle non-root repaintContainer 175 // FIXME: handle non-root repaintContainer
176 FloatRect repaintRect = absoluteTransform().mapRect(relativeBBox(true)); 176 FloatRect repaintRect = absoluteTransform().mapRect(relativeBBox(true));
177 177
178 // Markers can expand the bounding box 178 // Markers can expand the bounding box
179 repaintRect.unite(m_markerBounds); 179 repaintRect.unite(m_markerBounds);
180 180
181 #if ENABLE(SVG_FILTERS) 181 #if ENABLE(SVG_FILTERS)
182 // Filters can expand the bounding box 182 // Filters can expand the bounding box
183 SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->f ilter()); 183 SVGResourceFilter* filter = getFilterById(document(), style()->svgStyle()->f ilter());
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 463
464 if (midMarker) 464 if (midMarker)
465 bounds.unite(midMarker->cachedBounds()); 465 bounds.unite(midMarker->cachedBounds());
466 466
467 if (endMarker) 467 if (endMarker)
468 bounds.unite(endMarker->cachedBounds()); 468 bounds.unite(endMarker->cachedBounds());
469 469
470 return bounds; 470 return bounds;
471 } 471 }
472 472
473 IntRect RenderPath::outlineBoundsForRepaint(RenderBoxModelObject* /*repaintConta iner*/) const 473 IntRect RenderPath::outlineBoundsForRepaint(RenderBox* /*repaintContainer*/) con st
474 { 474 {
475 // FIXME: handle non-root repaintContainer 475 // FIXME: handle non-root repaintContainer
476 IntRect result = m_absoluteBounds; 476 IntRect result = m_absoluteBounds;
477 adjustRectForOutlineAndShadow(result); 477 adjustRectForOutlineAndShadow(result);
478 return result; 478 return result;
479 } 479 }
480 480
481 } 481 }
482 482
483 #endif // ENABLE(SVG) 483 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderPath.h ('k') | third_party/WebKit/WebCore/rendering/RenderReplaced.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698