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

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

Issue 995583002: [S.P.] Use a correct bounding box for outlines of LayoutInlines for cull rects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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') | no next file » | 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/layout/PaintInfo.h" 10 #include "core/layout/PaintInfo.h"
11 #include "core/layout/style/LayoutStyle.h" 11 #include "core/layout/style/LayoutStyle.h"
12 #include "core/paint/LayoutObjectDrawingRecorder.h" 12 #include "core/paint/LayoutObjectDrawingRecorder.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 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const LayoutPoint & paintOffset, const LayoutStyle& style) 18 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const LayoutStyle & style, const Vector<LayoutRect>& focusRingRects)
19 { 19 {
20 Vector<LayoutRect> focusRingRects;
21 m_layoutObject.addFocusRingRects(focusRingRects, paintOffset);
22 ASSERT(style.outlineStyleIsAuto()); 20 ASSERT(style.outlineStyleIsAuto());
23 Vector<IntRect> focusRingIntRects; 21 Vector<IntRect> focusRingIntRects;
24 for (size_t i = 0; i < focusRingRects.size(); ++i) 22 for (size_t i = 0; i < focusRingRects.size(); ++i)
25 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i])); 23 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i]));
26 paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), st yle.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor) ); 24 paintInfo.context->drawFocusRing(focusRingIntRects, style.outlineWidth(), st yle.outlineOffset(), m_layoutObject.resolveColor(style, CSSPropertyOutlineColor) );
27 } 25 }
28 26
29 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& o bjectBounds, const LayoutRect& visualOverflowBounds) 27 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& o bjectBounds, const LayoutRect& visualOverflowBounds)
30 { 28 {
31 const LayoutStyle& styleToUse = m_layoutObject.styleRef(); 29 const LayoutStyle& styleToUse = m_layoutObject.styleRef();
32 if (!styleToUse.hasOutline()) 30 if (!styleToUse.hasOutline())
33 return; 31 return;
34 32
35 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutObject, pain tInfo.phase, visualOverflowBounds); 33 LayoutObjectDrawingRecorder recorder(paintInfo.context, m_layoutObject, pain tInfo.phase, visualOverflowBounds);
36 if (recorder.canUseCachedDrawing()) 34 if (recorder.canUseCachedDrawing())
37 return; 35 return;
38 36
39 if (styleToUse.outlineStyleIsAuto()) { 37 if (styleToUse.outlineStyleIsAuto()) {
40 if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutObject)) { 38 if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_layoutObject)) {
41 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring. 39 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
42 paintFocusRing(paintInfo, objectBounds.location(), styleToUse); 40 Vector<LayoutRect> focusRingRects;
41 m_layoutObject.addFocusRingRects(focusRingRects, objectBounds.locati on());
42 paintFocusRing(paintInfo, styleToUse, focusRingRects);
43 } 43 }
44 return; 44 return;
45 } 45 }
46 46
47 if (styleToUse.outlineStyle() == BNONE) 47 if (styleToUse.outlineStyle() == BNONE)
48 return; 48 return;
49 49
50 IntRect inner = pixelSnappedIntRect(objectBounds); 50 IntRect inner = pixelSnappedIntRect(objectBounds);
51 inner.inflate(styleToUse.outlineOffset()); 51 inner.inflate(styleToUse.outlineOffset());
52 52
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0)); 341 quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0));
342 quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0)); 342 quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0));
343 quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0)); 343 quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0));
344 break; 344 break;
345 } 345 }
346 346
347 graphicsContext->fillPolygon(4, quad, color, antialias); 347 graphicsContext->fillPolygon(4, quad, color, antialias);
348 } 348 }
349 349
350 } // namespace blink 350 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/ObjectPainter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698