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

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

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 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 | Annotate | Revision Log
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/LayoutTheme.h" 8 #include "core/layout/LayoutTheme.h"
9 #include "core/paint/RenderDrawingRecorder.h" 9 #include "core/paint/RenderDrawingRecorder.h"
10 #include "core/rendering/PaintInfo.h" 10 #include "core/rendering/PaintInfo.h"
11 #include "core/rendering/RenderObject.h" 11 #include "core/rendering/RenderObject.h"
12 #include "core/rendering/style/RenderStyle.h" 12 #include "core/rendering/style/RenderStyle.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, RenderStyle* style) 18 void ObjectPainter::paintFocusRing(const PaintInfo& paintInfo, const LayoutPoint & paintOffset, const RenderStyle* style)
19 { 19 {
20 Vector<LayoutRect> focusRingRects; 20 Vector<LayoutRect> focusRingRects;
21 m_renderObject.addFocusRingRects(focusRingRects, paintOffset); 21 m_renderObject.addFocusRingRects(focusRingRects, paintOffset);
22 ASSERT(style->outlineStyleIsAuto()); 22 ASSERT(style->outlineStyleIsAuto());
23 Vector<IntRect> focusRingIntRects; 23 Vector<IntRect> focusRingIntRects;
24 for (size_t i = 0; i < focusRingRects.size(); ++i) 24 for (size_t i = 0; i < focusRingRects.size(); ++i)
25 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i])); 25 focusRingIntRects.append(pixelSnappedIntRect(focusRingRects[i]));
26 paintInfo.context->drawFocusRing(focusRingIntRects, style->outlineWidth(), s tyle->outlineOffset(), m_renderObject.resolveColor(style, CSSPropertyOutlineColo r)); 26 paintInfo.context->drawFocusRing(focusRingIntRects, style->outlineWidth(), s tyle->outlineOffset(), m_renderObject.resolveColor(style, CSSPropertyOutlineColo r));
27 } 27 }
28 28
29 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& p aintRect) 29 void ObjectPainter::paintOutline(const PaintInfo& paintInfo, const LayoutRect& p aintRect)
30 { 30 {
31 RenderStyle* styleToUse = m_renderObject.style(); 31 const RenderStyle* styleToUse = m_renderObject.style();
32 if (!styleToUse->hasOutline()) 32 if (!styleToUse->hasOutline())
33 return; 33 return;
34 34
35 RenderDrawingRecorder recorder(paintInfo.context, m_renderObject, paintInfo. phase, paintRect); 35 RenderDrawingRecorder recorder(paintInfo.context, m_renderObject, paintInfo. phase, paintRect);
36 if (recorder.canUseCachedDrawing()) 36 if (recorder.canUseCachedDrawing())
37 return; 37 return;
38 38
39 if (styleToUse->outlineStyleIsAuto()) { 39 if (styleToUse->outlineStyleIsAuto()) {
40 if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_renderObject)) { 40 if (LayoutTheme::theme().shouldDrawDefaultFocusRing(&m_renderObject)) {
41 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring. 41 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
(...skipping 299 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

Powered by Google App Engine
This is Rietveld 408576698