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

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

Issue 184023003: Make InlineBox::renderer() and related subclass methods return reference. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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) 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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 if (text.parent() && (text.parent()->style()->visitedDependentColor(CSSPrope rtyColor) != text.style()->visitedDependentColor(CSSPropertyColor))) 394 if (text.parent() && (text.parent()->style()->visitedDependentColor(CSSPrope rtyColor) != text.style()->visitedDependentColor(CSSPropertyColor)))
395 writeNameValuePair(ts, "color", text.resolveColor(CSSPropertyColor).name ForRenderTreeAsText()); 395 writeNameValuePair(ts, "color", text.resolveColor(CSSPropertyColor).name ForRenderTreeAsText());
396 } 396 }
397 397
398 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent) 398 static inline void writeSVGInlineTextBox(TextStream& ts, SVGInlineTextBox* textB ox, int indent)
399 { 399 {
400 Vector<SVGTextFragment>& fragments = textBox->textFragments(); 400 Vector<SVGTextFragment>& fragments = textBox->textFragments();
401 if (fragments.isEmpty()) 401 if (fragments.isEmpty())
402 return; 402 return;
403 403
404 RenderSVGInlineText* textRenderer = toRenderSVGInlineText(textBox->textRende rer()); 404 RenderSVGInlineText* textRenderer = &toRenderSVGInlineText(textBox->textRend erer());
Inactive 2014/02/28 02:28:19 RenderSVGInlineText& textRenderer = toRenderSVGInl
405 ASSERT(textRenderer);
406 405
407 const SVGRenderStyle* svgStyle = textRenderer->style()->svgStyle(); 406 const SVGRenderStyle* svgStyle = textRenderer->style()->svgStyle();
408 String text = textBox->textRenderer()->text(); 407 String text = textBox->textRenderer().text();
409 408
410 unsigned fragmentsSize = fragments.size(); 409 unsigned fragmentsSize = fragments.size();
411 for (unsigned i = 0; i < fragmentsSize; ++i) { 410 for (unsigned i = 0; i < fragmentsSize; ++i) {
412 SVGTextFragment& fragment = fragments.at(i); 411 SVGTextFragment& fragment = fragments.at(i);
413 writeIndent(ts, indent + 1); 412 writeIndent(ts, indent + 1);
414 413
415 unsigned startOffset = fragment.characterOffset; 414 unsigned startOffset = fragment.characterOffset;
416 unsigned endOffset = fragment.characterOffset + fragment.length; 415 unsigned endOffset = fragment.characterOffset + fragment.length;
417 416
418 // FIXME: Remove this hack, once the new text layout engine is completly landed. We want to preserve the old layout test results for now. 417 // FIXME: Remove this hack, once the new text layout engine is completly landed. We want to preserve the old layout test results for now.
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 ts << " "; 672 ts << " ";
674 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource()); 673 writeNameAndQuotedValue(ts, "filter", svgStyle->filterResource());
675 ts << " "; 674 ts << " ";
676 writeStandardPrefix(ts, *filter, 0); 675 writeStandardPrefix(ts, *filter, 0);
677 ts << " " << filter->resourceBoundingBox(&renderer) << "\n"; 676 ts << " " << filter->resourceBoundingBox(&renderer) << "\n";
678 } 677 }
679 } 678 }
680 } 679 }
681 680
682 } // namespace WebCore 681 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698