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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderSVGContainer.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, 2007, 2008 Rob Buis <buis@kde.org> 3 2004, 2005, 2007, 2008 Rob Buis <buis@kde.org>
4 2007 Eric Seidel <eric@webkit.org> 4 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 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 void RenderSVGContainer::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty) 386 void RenderSVGContainer::addFocusRingRects(GraphicsContext* graphicsContext, int tx, int ty)
387 { 387 {
388 graphicsContext->addFocusRingRect(m_absoluteBounds); 388 graphicsContext->addFocusRingRect(m_absoluteBounds);
389 } 389 }
390 390
391 void RenderSVGContainer::absoluteRects(Vector<IntRect>& rects, int, int, bool) 391 void RenderSVGContainer::absoluteRects(Vector<IntRect>& rects, int, int, bool)
392 { 392 {
393 rects.append(absoluteClippedOverflowRect()); 393 rects.append(absoluteClippedOverflowRect());
394 } 394 }
395 395
396 void RenderSVGContainer::absoluteQuads(Vector<FloatQuad>& quads, bool topLevel)
397 {
398 quads.append(absoluteClippedOverflowRect());
399 }
400
396 FloatRect RenderSVGContainer::relativeBBox(bool includeStroke) const 401 FloatRect RenderSVGContainer::relativeBBox(bool includeStroke) const
397 { 402 {
398 FloatRect rect; 403 FloatRect rect;
399 404
400 RenderObject* current = firstChild(); 405 RenderObject* current = firstChild();
401 for (; current != 0; current = current->nextSibling()) { 406 for (; current != 0; current = current->nextSibling()) {
402 FloatRect childBBox = current->relativeBBox(includeStroke); 407 FloatRect childBBox = current->relativeBBox(includeStroke);
403 FloatRect mappedBBox = current->localTransform().mapRect(childBBox); 408 FloatRect mappedBBox = current->localTransform().mapRect(childBBox);
404 409
405 // <svg> can have a viewBox contributing to the bbox 410 // <svg> can have a viewBox contributing to the bbox
(...skipping 18 matching lines...) Expand all
424 // Spec: Only graphical elements can be targeted by the mouse, period. 429 // Spec: Only graphical elements can be targeted by the mouse, period.
425 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched." 430 // 16.4: "If there are no graphics elements whose relevant graphics content is under the pointer (i.e., there is no target element), the event is not dispat ched."
426 return false; 431 return false;
427 } 432 }
428 433
429 } 434 }
430 435
431 #endif // ENABLE(SVG) 436 #endif // ENABLE(SVG)
432 437
433 // vim:ts=4:noet 438 // vim:ts=4:noet
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698