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

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

Issue 12545020: Revert 145087 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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
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 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 Google, Inc. All rights reserved. 5 * Copyright (C) 2009 Google, Inc. All rights reserved.
6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 6 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 143 }
144 } 144 }
145 145
146 // FIXME: This really should be drawn from local coordinates, but currently we hack it 146 // FIXME: This really should be drawn from local coordinates, but currently we hack it
147 // to avoid our clip killing our outline rect. Thus we translate our 147 // to avoid our clip killing our outline rect. Thus we translate our
148 // outline rect into parent coords before drawing. 148 // outline rect into parent coords before drawing.
149 // FIXME: This means our focus ring won't share our rotation like it should. 149 // FIXME: This means our focus ring won't share our rotation like it should.
150 // We should instead disable our clip during PaintPhaseOutline 150 // We should instead disable our clip during PaintPhaseOutline
151 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth() && style()->visibility() == VISIBLE) { 151 if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSe lfOutline) && style()->outlineWidth() && style()->visibility() == VISIBLE) {
152 IntRect paintRectInParent = enclosingIntRect(localToParentTransform().ma pRect(repaintRect)); 152 IntRect paintRectInParent = enclosingIntRect(localToParentTransform().ma pRect(repaintRect));
153 paintOutline(paintInfo, paintRectInParent); 153 paintOutline(paintInfo.context, paintRectInParent);
154 } 154 }
155 } 155 }
156 156
157 // addFocusRingRects is called from paintOutline and needs to be in the same coo rdinates as the paintOuline call 157 // addFocusRingRects is called from paintOutline and needs to be in the same coo rdinates as the paintOuline call
158 void RenderSVGContainer::addFocusRingRects(Vector<IntRect>& rects, const LayoutP oint&, const RenderLayerModelObject*) 158 void RenderSVGContainer::addFocusRingRects(Vector<IntRect>& rects, const LayoutP oint&)
159 { 159 {
160 IntRect paintRectInParent = enclosingIntRect(localToParentTransform().mapRec t(repaintRectInLocalCoordinates())); 160 IntRect paintRectInParent = enclosingIntRect(localToParentTransform().mapRec t(repaintRectInLocalCoordinates()));
161 if (!paintRectInParent.isEmpty()) 161 if (!paintRectInParent.isEmpty())
162 rects.append(paintRectInParent); 162 rects.append(paintRectInParent);
163 } 163 }
164 164
165 void RenderSVGContainer::updateCachedBoundaries() 165 void RenderSVGContainer::updateCachedBoundaries()
166 { 166 {
167 SVGRenderSupport::computeContainerBoundingBoxes(this, m_objectBoundingBox, m _objectBoundingBoxValid, m_strokeBoundingBox, m_repaintBoundingBox); 167 SVGRenderSupport::computeContainerBoundingBoxes(this, m_objectBoundingBox, m _objectBoundingBoxValid, m_strokeBoundingBox, m_repaintBoundingBox);
168 SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingB ox); 168 SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingB ox);
(...skipping 18 matching lines...) Expand all
187 } 187 }
188 188
189 // Spec: Only graphical elements can be targeted by the mouse, period. 189 // Spec: Only graphical elements can be targeted by the mouse, period.
190 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched." 190 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched."
191 return false; 191 return false;
192 } 192 }
193 193
194 } 194 }
195 195
196 #endif // ENABLE(SVG) 196 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGContainer.h ('k') | Source/WebCore/rendering/svg/RenderSVGImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698