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

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

Issue 750333004: Change rendering code to use RenderObject::resolveColor (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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/core/paint/TableCellPainter.cpp ('k') | Source/core/svg/SVGAnimatedColor.cpp » ('j') | 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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 { 386 {
387 SVGRootInlineBox* box = toSVGRootInlineBox(text.firstRootBox()); 387 SVGRootInlineBox* box = toSVGRootInlineBox(text.firstRootBox());
388 if (!box) 388 if (!box)
389 return; 389 return;
390 390
391 ts << " " << enclosingIntRect(FloatRect(FloatPoint(text.location()), FloatSi ze(box->logicalWidth(), box->logicalHeight()))); 391 ts << " " << enclosingIntRect(FloatRect(FloatPoint(text.location()), FloatSi ze(box->logicalWidth(), box->logicalHeight())));
392 392
393 // 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. 393 // 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.
394 ts << " contains 1 chunk(s)"; 394 ts << " contains 1 chunk(s)";
395 395
396 if (text.parent() && (text.parent()->style()->visitedDependentColor(CSSPrope rtyColor) != text.style()->visitedDependentColor(CSSPropertyColor))) 396 if (text.parent() && (text.parent()->resolveColor(CSSPropertyColor) != text. resolveColor(CSSPropertyColor)))
397 writeNameValuePair(ts, "color", text.resolveColor(CSSPropertyColor).name ForRenderTreeAsText()); 397 writeNameValuePair(ts, "color", text.resolveColor(CSSPropertyColor).name ForRenderTreeAsText());
398 } 398 }
399 399
400 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent) 400 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent)
401 { 401 {
402 Vector<SVGTextFragment>& fragments = textBox->textFragments(); 402 Vector<SVGTextFragment>& fragments = textBox->textFragments();
403 if (fragments.isEmpty()) 403 if (fragments.isEmpty())
404 return; 404 return;
405 405
406 RenderSVGInlineText& textRenderer = toRenderSVGInlineText(textBox->renderer( )); 406 RenderSVGInlineText& textRenderer = toRenderSVGInlineText(textBox->renderer( ));
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 ts << " "; 674 ts << " ";
675 writeNameAndQuotedValue(ts, "filter", svgStyle.filterResource()); 675 writeNameAndQuotedValue(ts, "filter", svgStyle.filterResource());
676 ts << " "; 676 ts << " ";
677 writeStandardPrefix(ts, *filter, 0); 677 writeStandardPrefix(ts, *filter, 0);
678 ts << " " << filter->resourceBoundingBox(&renderer) << "\n"; 678 ts << " " << filter->resourceBoundingBox(&renderer) << "\n";
679 } 679 }
680 } 680 }
681 } 681 }
682 682
683 } // namespace blink 683 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/TableCellPainter.cpp ('k') | Source/core/svg/SVGAnimatedColor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698