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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderPath.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 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 2004, 2005, 2008 Rob Buis <buis@kde.org> 3 2004, 2005, 2008 Rob Buis <buis@kde.org>
4 2005, 2007 Eric Seidel <eric@webkit.org> 4 2005, 2007 Eric Seidel <eric@webkit.org>
5 5
6 This file is part of the KDE project 6 This file is part of the KDE project
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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 void RenderPath::addFocusRingRects(GraphicsContext* graphicsContext, int, int) 232 void RenderPath::addFocusRingRects(GraphicsContext* graphicsContext, int, int)
233 { 233 {
234 graphicsContext->addFocusRingRect(enclosingIntRect(relativeBBox(true))); 234 graphicsContext->addFocusRingRect(enclosingIntRect(relativeBBox(true)));
235 } 235 }
236 236
237 void RenderPath::absoluteRects(Vector<IntRect>& rects, int, int, bool) 237 void RenderPath::absoluteRects(Vector<IntRect>& rects, int, int, bool)
238 { 238 {
239 rects.append(absoluteClippedOverflowRect()); 239 rects.append(absoluteClippedOverflowRect());
240 } 240 }
241 241
242 void RenderPath::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
243 {
244 quads.append(absoluteClippedOverflowRect());
245 }
246
242 bool RenderPath::nodeAtPoint(const HitTestRequest& request, HitTestResult& resul t, int _x, int _y, int, int, HitTestAction hitTestAction) 247 bool RenderPath::nodeAtPoint(const HitTestRequest& request, HitTestResult& resul t, int _x, int _y, int, int, HitTestAction hitTestAction)
243 { 248 {
244 // We only draw in the forground phase, so we only hit-test then. 249 // We only draw in the forground phase, so we only hit-test then.
245 if (hitTestAction != HitTestForeground) 250 if (hitTestAction != HitTestForeground)
246 return false; 251 return false;
247 252
248 IntPoint absolutePoint(_x, _y); 253 IntPoint absolutePoint(_x, _y);
249 254
250 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_PATH_HITTESTING, s tyle()->svgStyle()->pointerEvents()); 255 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_PATH_HITTESTING, s tyle()->svgStyle()->pointerEvents());
251 256
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 445
441 if (endMarker) 446 if (endMarker)
442 bounds.unite(endMarker->cachedBounds()); 447 bounds.unite(endMarker->cachedBounds());
443 448
444 return bounds; 449 return bounds;
445 } 450 }
446 451
447 } 452 }
448 453
449 #endif // ENABLE(SVG) 454 #endif // ENABLE(SVG)
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderPath.h ('k') | third_party/WebKit/WebCore/rendering/RenderSVGContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698