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

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

Issue 1321613002: Refactor ObjectPainter::paintOutline to take a paintOffset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove ObjectPainter::outlineRectForSVG 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
« no previous file with comments | « Source/core/paint/SVGContainerPainter.cpp ('k') | Source/core/paint/SVGShapePainter.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/SVGImagePainter.h" 6 #include "core/paint/SVGImagePainter.h"
7 7
8 #include "core/layout/ImageQualityController.h" 8 #include "core/layout/ImageQualityController.h"
9 #include "core/layout/LayoutImageResource.h" 9 #include "core/layout/LayoutImageResource.h"
10 #include "core/layout/svg/LayoutSVGImage.h" 10 #include "core/layout/svg/LayoutSVGImage.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 paintContext.paintInfo().context->drawPicture(bufferedForeground .get()); 53 paintContext.paintInfo().context->drawPicture(bufferedForeground .get());
54 } 54 }
55 } 55 }
56 } 56 }
57 57
58 if (m_layoutSVGImage.style()->outlineWidth()) { 58 if (m_layoutSVGImage.style()->outlineWidth()) {
59 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering); 59 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
60 outlinePaintInfo.phase = PaintPhaseSelfOutline; 60 outlinePaintInfo.phase = PaintPhaseSelfOutline;
61 LayoutRect layoutBoundingBox(boundingBox); 61 LayoutRect layoutBoundingBox(boundingBox);
62 LayoutRect visualOverflowRect = ObjectPainter::outlineBounds(layoutBound ingBox, m_layoutSVGImage.styleRef()); 62 ObjectPainter(m_layoutSVGImage).paintOutline(outlinePaintInfo, m_layoutS VGImage.outlineVisualOverflowRect(), layoutBoundingBox.size(), layoutBoundingBox .location());
63 ObjectPainter(m_layoutSVGImage).paintOutline(outlinePaintInfo, layoutBou ndingBox, visualOverflowRect);
64 } 63 }
65 } 64 }
66 65
67 void SVGImagePainter::paintForeground(const PaintInfo& paintInfo) 66 void SVGImagePainter::paintForeground(const PaintInfo& paintInfo)
68 { 67 {
69 RefPtr<Image> image = m_layoutSVGImage.imageResource()->image(); 68 RefPtr<Image> image = m_layoutSVGImage.imageResource()->image();
70 FloatRect destRect = m_layoutSVGImage.objectBoundingBox(); 69 FloatRect destRect = m_layoutSVGImage.objectBoundingBox();
71 FloatRect srcRect(0, 0, image->width(), image->height()); 70 FloatRect srcRect(0, 0, image->width(), image->height());
72 71
73 SVGImageElement* imageElement = toSVGImageElement(m_layoutSVGImage.element() ); 72 SVGImageElement* imageElement = toSVGImageElement(m_layoutSVGImage.element() );
74 imageElement->preserveAspectRatio()->currentValue()->transformRect(destRect, srcRect); 73 imageElement->preserveAspectRatio()->currentValue()->transformRect(destRect, srcRect);
75 74
76 InterpolationQuality interpolationQuality = InterpolationDefault; 75 InterpolationQuality interpolationQuality = InterpolationDefault;
77 if (m_layoutSVGImage.style()->svgStyle().bufferedRendering() != BR_STATIC || RuntimeEnabledFeatures::slimmingPaintEnabled()) 76 if (m_layoutSVGImage.style()->svgStyle().bufferedRendering() != BR_STATIC || RuntimeEnabledFeatures::slimmingPaintEnabled())
78 interpolationQuality = ImageQualityController::imageQualityController()- >chooseInterpolationQuality(paintInfo.context, &m_layoutSVGImage, image.get(), i mage.get(), LayoutSize(destRect.size())); 77 interpolationQuality = ImageQualityController::imageQualityController()- >chooseInterpolationQuality(paintInfo.context, &m_layoutSVGImage, image.get(), i mage.get(), LayoutSize(destRect.size()));
79 78
80 InterpolationQuality previousInterpolationQuality = paintInfo.context->image InterpolationQuality(); 79 InterpolationQuality previousInterpolationQuality = paintInfo.context->image InterpolationQuality();
81 paintInfo.context->setImageInterpolationQuality(interpolationQuality); 80 paintInfo.context->setImageInterpolationQuality(interpolationQuality);
82 paintInfo.context->drawImage(image.get(), destRect, srcRect, SkXfermode::kSr cOver_Mode); 81 paintInfo.context->drawImage(image.get(), destRect, srcRect, SkXfermode::kSr cOver_Mode);
83 paintInfo.context->setImageInterpolationQuality(previousInterpolationQuality ); 82 paintInfo.context->setImageInterpolationQuality(previousInterpolationQuality );
84 } 83 }
85 84
86 } // namespace blink 85 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/paint/SVGContainerPainter.cpp ('k') | Source/core/paint/SVGShapePainter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698