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

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

Issue 1160643004: Fix cull rect computation for SVG{Container,Image,Shape}Painter outlines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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/ObjectPainter.h ('k') | Source/core/paint/SVGContainerPainter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/ObjectPainter.h" 6 #include "core/paint/ObjectPainter.h"
7 7
8 #include "core/layout/LayoutObject.h" 8 #include "core/layout/LayoutObject.h"
9 #include "core/layout/LayoutTheme.h" 9 #include "core/layout/LayoutTheme.h"
10 #include "core/style/ComputedStyle.h" 10 #include "core/style/ComputedStyle.h"
11 #include "core/paint/LayoutObjectDrawingRecorder.h" 11 #include "core/paint/LayoutObjectDrawingRecorder.h"
12 #include "core/paint/PaintInfo.h" 12 #include "core/paint/PaintInfo.h"
13 #include "platform/geometry/LayoutPoint.h" 13 #include "platform/geometry/LayoutPoint.h"
14 #include "platform/graphics/GraphicsContextStateSaver.h" 14 #include "platform/graphics/GraphicsContextStateSaver.h"
15 15
16 namespace blink { 16 namespace blink {
17 17
18 LayoutRect ObjectPainter::outlineBounds(const LayoutRect& objectBounds, const Co mputedStyle& style)
19 {
20 int outlineOutset;
21 if (style.outlineStyleIsAuto())
22 outlineOutset = GraphicsContext::focusRingOutsetExtent(style.outlineOffs et(), style.outlineWidth());
23 else
24 outlineOutset = style.outlineSize();
fs 2015/06/08 16:30:51 This pattern appears to pop up here and there... M
chrishtr 2015/06/08 22:59:41 Sure...do as a followup maybe?
25 LayoutRect outlineBounds(objectBounds);
26 outlineBounds.inflate(outlineOutset);
27 return outlineBounds;
28 }
29
18 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const ComputedSty le& style, const Vector<LayoutRect>& focusRingRects) 30 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const ComputedSty le& style, const Vector<LayoutRect>& focusRingRects)
19 { 31 {
20 ASSERT(style.outlineStyleIsAuto()); 32 ASSERT(style.outlineStyleIsAuto());
21 Vector<IntRect> focusRingIntRects; 33 Vector<IntRect> focusRingIntRects;
22 for (size_t i = 0; i < focusRingRects.size(); ++i) 34 for (size_t i = 0; i < focusRingRects.size(); ++i)
23 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i])); 35 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i]));
24 paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), st yle.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor) ); 36 paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), st yle.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor) );
25 } 37 }
26 38
27 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& o bjectBounds, const LayoutRect& visualOverflowBounds) 39 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& o bjectBounds, const LayoutRect& visualOverflowBounds)
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0)); 379 quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0));
368 quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0)); 380 quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0));
369 quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0)); 381 quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0));
370 break; 382 break;
371 } 383 }
372 384
373 graphicsContext->fillPolygon(4, quad, color, antialias); 385 graphicsContext->fillPolygon(4, quad, color, antialias);
374 } 386 }
375 387
376 } // namespace blink 388 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/ObjectPainter.h ('k') | Source/core/paint/SVGContainerPainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698