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

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

Issue 10540037: Merge 118608 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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) 2009, Google Inc. All rights reserved. 2 * Copyright (c) 2009, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 RenderObject::styleWillChange(diff, newStyle); 100 RenderObject::styleWillChange(diff, newStyle);
101 } 101 }
102 102
103 void RenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyl e* oldStyle) 103 void RenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyl e* oldStyle)
104 { 104 {
105 RenderObject::styleDidChange(diff, oldStyle); 105 RenderObject::styleDidChange(diff, oldStyle);
106 SVGResourcesCache::clientStyleChanged(this, diff, style()); 106 SVGResourcesCache::clientStyleChanged(this, diff, style());
107 } 107 }
108 108
109 void RenderSVGModelObject::updateFromElement()
110 {
111 RenderObject::updateFromElement();
112 SVGResourcesCache::clientUpdatedFromElement(this, style());
113 }
114
115 bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co nst LayoutPoint&, const LayoutPoint&, HitTestAction) 109 bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co nst LayoutPoint&, const LayoutPoint&, HitTestAction)
116 { 110 {
117 ASSERT_NOT_REACHED(); 111 ASSERT_NOT_REACHED();
118 return false; 112 return false;
119 } 113 }
120 114
121 static void getElementCTM(SVGElement* element, AffineTransform& transform) 115 static void getElementCTM(SVGElement* element, AffineTransform& transform)
122 { 116 {
123 ASSERT(element); 117 ASSERT(element);
124 element->document()->updateLayoutIgnorePendingStylesheets(); 118 element->document()->updateLayoutIgnorePendingStylesheets();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 if (!isGraphicsElement(renderer)) 177 if (!isGraphicsElement(renderer))
184 return false; 178 return false;
185 AffineTransform ctm; 179 AffineTransform ctm;
186 getElementCTM(static_cast<SVGElement*>(renderer->node()), ctm); 180 getElementCTM(static_cast<SVGElement*>(renderer->node()), ctm);
187 return rect.contains(ctm.mapRect(renderer->repaintRectInLocalCoordinates())) ; 181 return rect.contains(ctm.mapRect(renderer->repaintRectInLocalCoordinates())) ;
188 } 182 }
189 183
190 } // namespace WebCore 184 } // namespace WebCore
191 185
192 #endif // ENABLE(SVG) 186 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGModelObject.h ('k') | Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698