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

Side by Side Diff: Source/core/rendering/svg/SVGRenderTreeAsText.cpp

Issue 19697011: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTreeAsText.cpp ('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, 2007, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
3 * (C) 2005 Rob Buis <buis@kde.org> 3 * (C) 2005 Rob Buis <buis@kde.org>
4 * (C) 2006 Alexander Kellett <lypanov@kde.org> 4 * (C) 2006 Alexander Kellett <lypanov@kde.org>
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 SVGRootInlineBox* box = static_cast<SVGRootInlineBox*>(text.firstRootBox()); 377 SVGRootInlineBox* box = static_cast<SVGRootInlineBox*>(text.firstRootBox());
378 if (!box) 378 if (!box)
379 return; 379 return;
380 380
381 ts << " " << enclosingIntRect(FloatRect(text.location(), FloatSize(box->logi calWidth(), box->logicalHeight()))); 381 ts << " " << enclosingIntRect(FloatRect(text.location(), FloatSize(box->logi calWidth(), box->logicalHeight())));
382 382
383 // FIXME: Remove this hack, once the new text layout engine is completly lan ded. We want to preserve the old layout test results for now. 383 // FIXME: Remove this hack, once the new text layout engine is completly lan ded. We want to preserve the old layout test results for now.
384 ts << " contains 1 chunk(s)"; 384 ts << " contains 1 chunk(s)";
385 385
386 if (text.parent() && (text.parent()->style()->visitedDependentColor(CSSPrope rtyColor) != text.style()->visitedDependentColor(CSSPropertyColor))) 386 if (text.parent() && (text.parent()->style()->visitedDependentColor(CSSPrope rtyColor) != text.style()->visitedDependentColor(CSSPropertyColor)))
387 writeNameValuePair(ts, "color", text.style()->visitedDependentColor(CSSP ropertyColor).nameForRenderTreeAsText()); 387 writeNameValuePair(ts, "color", text.resolveColor(CSSPropertyColor).name ForRenderTreeAsText());
388 } 388 }
389 389
390 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent) 390 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent)
391 { 391 {
392 Vector<SVGTextFragment>& fragments = textBox->textFragments(); 392 Vector<SVGTextFragment>& fragments = textBox->textFragments();
393 if (fragments.isEmpty()) 393 if (fragments.isEmpty())
394 return; 394 return;
395 395
396 RenderSVGInlineText* textRenderer = toRenderSVGInlineText(textBox->textRende rer()); 396 RenderSVGInlineText* textRenderer = toRenderSVGInlineText(textBox->textRende rer());
397 ASSERT(textRenderer); 397 ASSERT(textRenderer);
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 ts << " "; 669 ts << " ";
670 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource()); 670 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource());
671 ts << " "; 671 ts << " ";
672 writeStandardPrefix(ts, *filter, 0); 672 writeStandardPrefix(ts, *filter, 0);
673 ts << " " << filter->resourceBoundingBox(&renderer) << "\n"; 673 ts << " " << filter->resourceBoundingBox(&renderer) << "\n";
674 } 674 }
675 } 675 }
676 } 676 }
677 677
678 } // namespace WebCore 678 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTreeAsText.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698