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

Side by Side Diff: Source/WebCore/svg/SVGStyledElement.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
« no previous file with comments | « Source/WebCore/svg/SVGStyledElement.h ('k') | 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) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 // Notify resources about id changes, this is important as we cache reso urces by id in SVGDocumentExtensions 342 // Notify resources about id changes, this is important as we cache reso urces by id in SVGDocumentExtensions
343 if (object && object->isSVGResourceContainer()) 343 if (object && object->isSVGResourceContainer())
344 object->toRenderSVGResourceContainer()->idChanged(); 344 object->toRenderSVGResourceContainer()->idChanged();
345 if (inDocument()) 345 if (inDocument())
346 buildPendingResourcesIfNeeded(); 346 buildPendingResourcesIfNeeded();
347 SVGElementInstance::invalidateAllInstancesOfElement(this); 347 SVGElementInstance::invalidateAllInstancesOfElement(this);
348 return; 348 return;
349 } 349 }
350 } 350 }
351 351
352 void SVGStyledElement::attach()
353 {
354 SVGElement::attach();
355
356 if (RenderObject* object = renderer())
357 object->updateFromElement();
358 }
359
360 Node::InsertionNotificationRequest SVGStyledElement::insertedInto(Node* rootPare nt) 352 Node::InsertionNotificationRequest SVGStyledElement::insertedInto(Node* rootPare nt)
361 { 353 {
362 SVGElement::insertedInto(rootParent); 354 SVGElement::insertedInto(rootParent);
363 updateRelativeLengthsInformation(); 355 updateRelativeLengthsInformation();
364 buildPendingResourcesIfNeeded(); 356 buildPendingResourcesIfNeeded();
365 return InsertionDone; 357 return InsertionDone;
366 } 358 }
367 359
368 void SVGStyledElement::buildPendingResourcesIfNeeded() 360 void SVGStyledElement::buildPendingResourcesIfNeeded()
369 { 361 {
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 } 502 }
511 503
512 bool SVGStyledElement::isKeyboardFocusable(KeyboardEvent*) const 504 bool SVGStyledElement::isKeyboardFocusable(KeyboardEvent*) const
513 { 505 {
514 return isMouseFocusable(); 506 return isMouseFocusable();
515 } 507 }
516 508
517 } 509 }
518 510
519 #endif // ENABLE(SVG) 511 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/svg/SVGStyledElement.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698