third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp - Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/.

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/LayoutSVGText.cpp

Issue 1741073002: Rename enums/functions that collide in chromium style in core/layout/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-6

Patch Set: get-names-7: rebase Created 4 years, 10 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/line/TrailingObjects.cpp ('k') | third_party/WebKit/Source/core/layout/svg/SVGLayoutTreeAsText.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2006 Apple Computer, Inc.	2 * Copyright (C) 2006 Apple Computer, Inc.

3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>	3 * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>

4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>	4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>

5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>	5 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>

6 * Copyright (C) 2008 Rob Buis <buis@kde.org>	6 * Copyright (C) 2008 Rob Buis <buis@kde.org>

7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>	7 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>

8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.	8 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved.

9 * Copyright (C) 2012 Google Inc.	9 * Copyright (C) 2012 Google Inc.

10 *	10 *

(...skipping 444 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
455 LayoutPoint clippedPointInContents(pointInContents);	455 LayoutPoint clippedPointInContents(pointInContents);

456 clippedPointInContents.clampNegativeToZero();	456 clippedPointInContents.clampNegativeToZero();

457	457

458 ASSERT(!rootBox->nextRootBox());	458 ASSERT(!rootBox->nextRootBox());

459 ASSERT(childrenInline());	459 ASSERT(childrenInline());

460	460

461 InlineBox* closestBox = toSVGRootInlineBox(rootBox)->closestLeafChildForPosi tion(clippedPointInContents);	461 InlineBox* closestBox = toSVGRootInlineBox(rootBox)->closestLeafChildForPosi tion(clippedPointInContents);

462 if (!closestBox)	462 if (!closestBox)

463 return createPositionWithAffinity(0);	463 return createPositionWithAffinity(0);

464	464

465 return closestBox->lineLayoutItem().positionForPoint(LayoutPoint(clippedPoin tInContents.x(), closestBox->y()));	465 return closestBox->getLineLayoutItem().positionForPoint(LayoutPoint(clippedP ointInContents.x(), closestBox->y()));

466 }	466 }

467	467

468 void LayoutSVGText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) cons t	468 void LayoutSVGText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) cons t

469 {	469 {

470 quads.append(localToAbsoluteQuad(strokeBoundingBox(), 0 /* mode */, wasFixed ));	470 quads.append(localToAbsoluteQuad(strokeBoundingBox(), 0 /* mode */, wasFixed ));

471 }	471 }

472	472

473 void LayoutSVGText::paint(const PaintInfo& paintInfo, const LayoutPoint&) const	473 void LayoutSVGText::paint(const PaintInfo& paintInfo, const LayoutPoint&) const

474 {	474 {

475 SVGTextPainter(*this).paint(paintInfo);	475 SVGTextPainter(*this).paint(paintInfo);

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
539 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);	539 paintInvalidationState.pushDelayedPaintInvalidationTarget(*this);

540	540

541 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState);	541 ForceHorriblySlowRectMapping slowRectMapping(&paintInvalidationState);

542 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, pai ntInvalidationState.paintInvalidationContainer());	542 PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, pai ntInvalidationState.paintInvalidationContainer());

543 if (reason == PaintInvalidationSVGResourceChange)	543 if (reason == PaintInvalidationSVGResourceChange)

544 childTreeWalkState.setForceSubtreeInvalidationWithinContainer();	544 childTreeWalkState.setForceSubtreeInvalidationWithinContainer();

545 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState);	545 invalidatePaintOfSubtreesIfNeeded(childTreeWalkState);

546 }	546 }

547	547

548 } // namespace blink	548 } // namespace blink

OLD	NEW