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

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

Issue 1185753005: Return int from outlineWidth() and outlineSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
« no previous file with comments | « no previous file | Source/core/style/ComputedStyle.h » ('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/ImagePainter.h" 6 #include "core/paint/ImagePainter.h"
7 7
8 #include "core/dom/Document.h" 8 #include "core/dom/Document.h"
9 #include "core/dom/Element.h" 9 #include "core/dom/Element.h"
10 #include "core/editing/FrameSelection.h" 10 #include "core/editing/FrameSelection.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 return; 47 return;
48 48
49 // Even if the theme handles focus ring drawing for entire elements, it won' t do it for 49 // Even if the theme handles focus ring drawing for entire elements, it won' t do it for
50 // an area within an image, so we don't call LayoutTheme::supportsFocusRing here. 50 // an area within an image, so we don't call LayoutTheme::supportsFocusRing here.
51 51
52 Path path = areaElement.computePath(&m_layoutImage); 52 Path path = areaElement.computePath(&m_layoutImage);
53 if (path.isEmpty()) 53 if (path.isEmpty())
54 return; 54 return;
55 55
56 const ComputedStyle& areaElementStyle = *areaElement.ensureComputedStyle(); 56 const ComputedStyle& areaElementStyle = *areaElement.ensureComputedStyle();
57 unsigned short outlineWidth = areaElementStyle.outlineWidth(); 57 int outlineWidth = areaElementStyle.outlineWidth();
58 if (!outlineWidth) 58 if (!outlineWidth)
59 return; 59 return;
60 60
61 IntRect focusRect = m_layoutImage.absoluteContentBox(); 61 IntRect focusRect = m_layoutImage.absoluteContentBox();
62 62
63 LayoutObjectDrawingRecorder drawingRecorder(*paintInfo.context, m_layoutImag e, paintInfo.phase, focusRect); 63 LayoutObjectDrawingRecorder drawingRecorder(*paintInfo.context, m_layoutImag e, paintInfo.phase, focusRect);
64 if (drawingRecorder.canUseCachedDrawing()) 64 if (drawingRecorder.canUseCachedDrawing())
65 return; 65 return;
66 66
67 // FIXME: Clip path instead of context when Skia pathops is ready. 67 // FIXME: Clip path instead of context when Skia pathops is ready.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", " data", InspectorPaintImageEvent::data(m_layoutImage)); 139 TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", " data", InspectorPaintImageEvent::data(m_layoutImage));
140 140
141 InterpolationQuality previousInterpolationQuality = context->imageInterpolat ionQuality(); 141 InterpolationQuality previousInterpolationQuality = context->imageInterpolat ionQuality();
142 context->setImageInterpolationQuality(interpolationQuality); 142 context->setImageInterpolationQuality(interpolationQuality);
143 context->drawImage(image.get(), alignedRect, SkXfermode::kSrcOver_Mode, m_la youtImage.shouldRespectImageOrientation()); 143 context->drawImage(image.get(), alignedRect, SkXfermode::kSrcOver_Mode, m_la youtImage.shouldRespectImageOrientation());
144 context->setImageInterpolationQuality(previousInterpolationQuality); 144 context->setImageInterpolationQuality(previousInterpolationQuality);
145 } 145 }
146 146
147 } // namespace blink 147 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/style/ComputedStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698