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

Side by Side Diff: Source/WebCore/svg/SVGStyledElement.cpp

Issue 11879026: Merge 139457 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 | « LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt ('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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 { 349 {
350 SVGElement::insertedInto(rootParent); 350 SVGElement::insertedInto(rootParent);
351 updateRelativeLengthsInformation(); 351 updateRelativeLengthsInformation();
352 buildPendingResourcesIfNeeded(); 352 buildPendingResourcesIfNeeded();
353 return InsertionDone; 353 return InsertionDone;
354 } 354 }
355 355
356 void SVGStyledElement::buildPendingResourcesIfNeeded() 356 void SVGStyledElement::buildPendingResourcesIfNeeded()
357 { 357 {
358 Document* document = this->document(); 358 Document* document = this->document();
359 if (!needsPendingResourceHandling() || !document) 359 if (!needsPendingResourceHandling() || !document || !inDocument() || isInSha dowTree())
360 return; 360 return;
361 361
362 SVGDocumentExtensions* extensions = document->accessSVGExtensions(); 362 SVGDocumentExtensions* extensions = document->accessSVGExtensions();
363 String resourceId = getIdAttribute(); 363 String resourceId = getIdAttribute();
364 if (!extensions->hasPendingResource(resourceId)) 364 if (!extensions->hasPendingResource(resourceId))
365 return; 365 return;
366 366
367 // Mark pending resources as pending for removal. 367 // Mark pending resources as pending for removal.
368 extensions->markPendingResourcesForRemoval(resourceId); 368 extensions->markPendingResourcesForRemoval(resourceId);
369 369
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 } 476 }
477 477
478 bool SVGStyledElement::isKeyboardFocusable(KeyboardEvent*) const 478 bool SVGStyledElement::isKeyboardFocusable(KeyboardEvent*) const
479 { 479 {
480 return isMouseFocusable(); 480 return isMouseFocusable();
481 } 481 }
482 482
483 } 483 }
484 484
485 #endif // ENABLE(SVG) 485 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « LayoutTests/svg/custom/use-rebuild-resources-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698