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

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

Issue 16677006: Merge 150896 "Dirty the first RootInlineBox, always" (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1500/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/svg/SVGRootInlineBox.h ('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) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Computer Inc. 3 * Copyright (C) 2006 Apple Computer Inc.
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@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 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved. 6 * Copyright (C) 2011 Torch Mobile (Beijing) CO. Ltd. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 if (renderingContext.isRenderingPrepared()) { 61 if (renderingContext.isRenderingPrepared()) {
62 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) { 62 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() ) {
63 if (child->isSVGInlineTextBox()) 63 if (child->isSVGInlineTextBox())
64 SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer(toRender SVGInlineText(static_cast<SVGInlineTextBox*>(child)->textRenderer())); 64 SVGInlineFlowBox::computeTextMatchMarkerRectForRenderer(toRender SVGInlineText(static_cast<SVGInlineTextBox*>(child)->textRenderer()));
65 65
66 child->paint(paintInfo, LayoutPoint(), 0, 0); 66 child->paint(paintInfo, LayoutPoint(), 0, 0);
67 } 67 }
68 } 68 }
69 } 69 }
70 70
71 void SVGRootInlineBox::markDirty(bool dirty)
72 {
73 if (dirty)
74 for (InlineBox* child = firstChild(); child; child = child->nextOnLine() )
75 child->markDirty(true);
76 RootInlineBox::markDirty(dirty);
77 }
78
71 void SVGRootInlineBox::computePerCharacterLayoutInformation() 79 void SVGRootInlineBox::computePerCharacterLayoutInformation()
72 { 80 {
73 RenderSVGText* textRoot = toRenderSVGText(block()); 81 RenderSVGText* textRoot = toRenderSVGText(block());
74 ASSERT(textRoot); 82 ASSERT(textRoot);
75 83
76 Vector<SVGTextLayoutAttributes*>& layoutAttributes = textRoot->layoutAttribu tes(); 84 Vector<SVGTextLayoutAttributes*>& layoutAttributes = textRoot->layoutAttribu tes();
77 if (layoutAttributes.isEmpty()) 85 if (layoutAttributes.isEmpty())
78 return; 86 return;
79 87
80 if (textRoot->needsReordering()) 88 if (textRoot->needsReordering())
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 310
303 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes) 311 void SVGRootInlineBox::reorderValueLists(Vector<SVGTextLayoutAttributes*>& attri butes)
304 { 312 {
305 Vector<InlineBox*> leafBoxesInLogicalOrder; 313 Vector<InlineBox*> leafBoxesInLogicalOrder;
306 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes); 314 collectLeafBoxesInLogicalOrder(leafBoxesInLogicalOrder, reverseInlineBoxRang eAndValueListsIfNeeded, &attributes);
307 } 315 }
308 316
309 } // namespace WebCore 317 } // namespace WebCore
310 318
311 #endif // ENABLE(SVG) 319 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGRootInlineBox.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698