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

Side by Side Diff: Source/WebCore/rendering/svg/RenderSVGText.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) 2006 Apple Computer, Inc. 2 * Copyright (C) 2006 Apple Computer, Inc.
3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org> 3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
6 * Copyright (C) 2008 Rob Buis <buis@kde.org> 6 * Copyright (C) 2008 Rob Buis <buis@kde.org>
7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.
9 * Copyright (C) 2012 Google Inc. 9 * Copyright (C) 2012 Google Inc.
10 * 10 *
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 511
512 if (const ShadowData* textShadow = style()->textShadow()) 512 if (const ShadowData* textShadow = style()->textShadow())
513 textShadow->adjustRectForShadow(repaintRect); 513 textShadow->adjustRectForShadow(repaintRect);
514 514
515 return repaintRect; 515 return repaintRect;
516 } 516 }
517 517
518 void RenderSVGText::addChild(RenderObject* child, RenderObject* beforeChild) 518 void RenderSVGText::addChild(RenderObject* child, RenderObject* beforeChild)
519 { 519 {
520 RenderSVGBlock::addChild(child, beforeChild); 520 RenderSVGBlock::addChild(child, beforeChild);
521
522 SVGResourcesCache::clientWasAddedToTree(child, child->style());
521 subtreeChildWasAdded(child); 523 subtreeChildWasAdded(child);
522 } 524 }
523 525
524 void RenderSVGText::removeChild(RenderObject* child) 526 void RenderSVGText::removeChild(RenderObject* child)
525 { 527 {
528 SVGResourcesCache::clientWillBeRemovedFromTree(child);
529
526 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 530 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
527 subtreeChildWillBeRemoved(child, affectedAttributes); 531 subtreeChildWillBeRemoved(child, affectedAttributes);
528 RenderSVGBlock::removeChild(child); 532 RenderSVGBlock::removeChild(child);
529 subtreeChildWasRemoved(affectedAttributes); 533 subtreeChildWasRemoved(affectedAttributes);
530 } 534 }
531 535
532 // Fix for <rdar://problem/8048875>. We should not render :first-line CSS Style 536 // Fix for <rdar://problem/8048875>. We should not render :first-line CSS Style
533 // in a SVG text element context. 537 // in a SVG text element context.
534 RenderBlock* RenderSVGText::firstLineBlock() const 538 RenderBlock* RenderSVGText::firstLineBlock() const
535 { 539 {
536 return 0; 540 return 0;
537 } 541 }
538 542
539 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl e 543 // Fix for <rdar://problem/8048875>. We should not render :first-letter CSS Styl e
540 // in a SVG text element context. 544 // in a SVG text element context.
541 void RenderSVGText::updateFirstLetter() 545 void RenderSVGText::updateFirstLetter()
542 { 546 {
543 } 547 }
544 548
545 } 549 }
546 550
547 #endif // ENABLE(SVG) 551 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/svg/RenderSVGRoot.cpp ('k') | Source/WebCore/rendering/svg/SVGResourcesCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698