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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderSVGTextPath.cpp

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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 * This file is part of the WebKit project. 2 * This file is part of the WebKit project.
3 * 3 *
4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 4 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 RenderObject* object = rootBox ? rootBox->object() : 0; 85 RenderObject* object = rootBox ? rootBox->object() : 0;
86 86
87 if (!object) 87 if (!object)
88 return; 88 return;
89 89
90 int xRef = object->xPos() + xPos(); 90 int xRef = object->xPos() + xPos();
91 int yRef = object->yPos() + yPos(); 91 int yRef = object->yPos() + yPos();
92 92
93 for (InlineRunBox* curr = firstBox; curr; curr = curr->nextLineBox()) { 93 for (InlineRunBox* curr = firstBox; curr; curr = curr->nextLineBox()) {
94 FloatRect rect(xRef + curr->xPos(), yRef + curr->yPos(), curr->width(), curr->height()); 94 FloatRect rect(xRef + curr->xPos(), yRef + curr->yPos(), curr->width(), curr->height());
95 // FIXME: broken with CSS transforms
95 rects.append(enclosingIntRect(absoluteTransform().mapRect(rect))); 96 rects.append(enclosingIntRect(absoluteTransform().mapRect(rect)));
96 } 97 }
97 } 98 }
98 99
100 void RenderSVGTextPath::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
101 {
102 InlineRunBox* firstBox = firstLineBox();
103
104 SVGRootInlineBox* rootBox = firstBox ? static_cast<SVGInlineTextBox*>(firstB ox)->svgRootInlineBox() : 0;
105 RenderObject* object = rootBox ? rootBox->object() : 0;
106
107 if (!object)
108 return;
109
110 int xRef = object->xPos() + xPos();
111 int yRef = object->yPos() + yPos();
112
113 for (InlineRunBox* curr = firstBox; curr; curr = curr->nextLineBox()) {
114 FloatRect rect(xRef + curr->xPos(), yRef + curr->yPos(), curr->width(), curr->height());
115 // FIXME: broken with CSS transforms
116 quads.append(absoluteTransform().mapRect(rect));
117 }
118 }
119
99 } 120 }
100 121
101 #endif // ENABLE(SVG) 122 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderSVGTextPath.h ('k') | third_party/WebKit/WebCore/rendering/RenderTableCell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698