Source/core/paint/SVGContainerPainter.cpp - Issue 1224933002: Combine outline and focus ring code paths

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/core/paint/SVGContainerPainter.cpp

Issue 1224933002: Combine outline and focus ring code paths (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fix empty focus ring on Mac Created 5 years, 3 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

« no previous file with comments | « Source/core/paint/ReplacedPainter.cpp ('k') | Source/core/paint/SVGImagePainter.cpp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "config.h"	5 #include "config.h"

6 #include "core/paint/SVGContainerPainter.h"	6 #include "core/paint/SVGContainerPainter.h"

7	7

8 #include "core/layout/svg/LayoutSVGContainer.h"	8 #include "core/layout/svg/LayoutSVGContainer.h"

9 #include "core/layout/svg/LayoutSVGViewportContainer.h"	9 #include "core/layout/svg/LayoutSVGViewportContainer.h"

10 #include "core/layout/svg/SVGLayoutSupport.h"	10 #include "core/layout/svg/SVGLayoutSupport.h"

(...skipping 43 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
54 child->paint(paintContext.paintInfo(), IntPoint());	54 child->paint(paintContext.paintInfo(), IntPoint());

55 }	55 }

56 }	56 }

57	57

58 if (paintInfoBeforeFiltering.phase != PaintPhaseForeground)	58 if (paintInfoBeforeFiltering.phase != PaintPhaseForeground)

59 return;	59 return;

60	60

61 if (m_layoutSVGContainer.style()->outlineWidth() && m_layoutSVGContainer.sty le()->visibility() == VISIBLE) {	61 if (m_layoutSVGContainer.style()->outlineWidth() && m_layoutSVGContainer.sty le()->visibility() == VISIBLE) {

62 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);	62 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);

63 outlinePaintInfo.phase = PaintPhaseSelfOutline;	63 outlinePaintInfo.phase = PaintPhaseSelfOutline;

64 LayoutRect layoutBoundingBox(boundingBox);	64 ObjectPainter(m_layoutSVGContainer).paintOutline(outlinePaintInfo, Layou tPoint(boundingBox.location()));

65 ObjectPainter(m_layoutSVGContainer).paintOutline(outlinePaintInfo, m_lay outSVGContainer.outlineVisualOverflowRect(), layoutBoundingBox.size(), layoutBou ndingBox.location());

66 }	65 }

67	66

68 if (paintInfoBeforeFiltering.isPrinting())	67 if (paintInfoBeforeFiltering.isPrinting())

69 ObjectPainter(m_layoutSVGContainer).addPDFURLRectIfNeeded(paintInfoBefor eFiltering, LayoutPoint());	68 ObjectPainter(m_layoutSVGContainer).addPDFURLRectIfNeeded(paintInfoBefor eFiltering, LayoutPoint());

70 }	69 }

71	70

72 } // namespace blink	71 } // namespace blink

OLD	NEW