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

Side by Side Diff: Source/core/layout/svg/LayoutSVGInline.cpp

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 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
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 Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Inc. All rights reserved.
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 101 }
102 102
103 void LayoutSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) co nst 103 void LayoutSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) co nst
104 { 104 {
105 const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this ); 105 const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this );
106 if (!object) 106 if (!object)
107 return; 107 return;
108 108
109 FloatRect textBoundingBox = object->strokeBoundingBox(); 109 FloatRect textBoundingBox = object->strokeBoundingBox();
110 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 110 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
111 quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x( ), textBoundingBox.y() + box->y(), box->logicalWidth(), box->logicalHeight()), f alse, wasFixed)); 111 quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x( ).toFloat(), textBoundingBox.y() + box->y().toFloat(), box->logicalWidth().toFlo at(), box->logicalHeight().toFloat()), false, wasFixed));
112 } 112 }
113 113
114 void LayoutSVGInline::willBeDestroyed() 114 void LayoutSVGInline::willBeDestroyed()
115 { 115 {
116 SVGResourcesCache::clientDestroyed(this); 116 SVGResourcesCache::clientDestroyed(this);
117 LayoutInline::willBeDestroyed(); 117 LayoutInline::willBeDestroyed();
118 } 118 }
119 119
120 void LayoutSVGInline::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle) 120 void LayoutSVGInline::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
121 { 121 {
(...skipping 22 matching lines...) Expand all
144 LayoutInline::removeChild(child); 144 LayoutInline::removeChild(child);
145 return; 145 return;
146 } 146 }
147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 147 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
148 textLayoutObject->subtreeChildWillBeRemoved(child, affectedAttributes); 148 textLayoutObject->subtreeChildWillBeRemoved(child, affectedAttributes);
149 LayoutInline::removeChild(child); 149 LayoutInline::removeChild(child);
150 textLayoutObject->subtreeChildWasRemoved(affectedAttributes); 150 textLayoutObject->subtreeChildWasRemoved(affectedAttributes);
151 } 151 }
152 152
153 } 153 }
OLDNEW
« no previous file with comments | « Source/core/layout/line/RootInlineBox.cpp ('k') | Source/core/layout/svg/LayoutSVGInlineText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698