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

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

Issue 1431193004: Reland of Make LayoutImageResource::image() parameter explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « third_party/WebKit/Source/core/paint/ImagePainter.cpp ('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/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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 if (m_layoutSVGImage.style()->outlineWidth()) { 45 if (m_layoutSVGImage.style()->outlineWidth()) {
46 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering); 46 PaintInfo outlinePaintInfo(paintInfoBeforeFiltering);
47 outlinePaintInfo.phase = PaintPhaseSelfOutline; 47 outlinePaintInfo.phase = PaintPhaseSelfOutline;
48 ObjectPainter(m_layoutSVGImage).paintOutline(outlinePaintInfo, LayoutPoi nt(boundingBox.location())); 48 ObjectPainter(m_layoutSVGImage).paintOutline(outlinePaintInfo, LayoutPoi nt(boundingBox.location()));
49 } 49 }
50 } 50 }
51 51
52 void SVGImagePainter::paintForeground(const PaintInfo& paintInfo) 52 void SVGImagePainter::paintForeground(const PaintInfo& paintInfo)
53 { 53 {
54 RefPtr<Image> image = m_layoutSVGImage.imageResource()->image(); 54 RefPtr<Image> image = m_layoutSVGImage.imageResource()->image(IntSize());
55 FloatRect destRect = m_layoutSVGImage.objectBoundingBox(); 55 FloatRect destRect = m_layoutSVGImage.objectBoundingBox();
56 FloatRect srcRect(0, 0, image->width(), image->height()); 56 FloatRect srcRect(0, 0, image->width(), image->height());
57 57
58 SVGImageElement* imageElement = toSVGImageElement(m_layoutSVGImage.element() ); 58 SVGImageElement* imageElement = toSVGImageElement(m_layoutSVGImage.element() );
59 imageElement->preserveAspectRatio()->currentValue()->transformRect(destRect, srcRect); 59 imageElement->preserveAspectRatio()->currentValue()->transformRect(destRect, srcRect);
60 60
61 InterpolationQuality interpolationQuality = InterpolationDefault; 61 InterpolationQuality interpolationQuality = InterpolationDefault;
62 interpolationQuality = ImageQualityController::imageQualityController()->cho oseInterpolationQuality(paintInfo.context, &m_layoutSVGImage, image.get(), image .get(), LayoutSize(destRect.size())); 62 interpolationQuality = ImageQualityController::imageQualityController()->cho oseInterpolationQuality(paintInfo.context, &m_layoutSVGImage, image.get(), image .get(), LayoutSize(destRect.size()));
63 63
64 InterpolationQuality previousInterpolationQuality = paintInfo.context->image InterpolationQuality(); 64 InterpolationQuality previousInterpolationQuality = paintInfo.context->image InterpolationQuality();
65 paintInfo.context->setImageInterpolationQuality(interpolationQuality); 65 paintInfo.context->setImageInterpolationQuality(interpolationQuality);
66 paintInfo.context->drawImage(image.get(), destRect, srcRect, SkXfermode::kSr cOver_Mode); 66 paintInfo.context->drawImage(image.get(), destRect, srcRect, SkXfermode::kSr cOver_Mode);
67 paintInfo.context->setImageInterpolationQuality(previousInterpolationQuality ); 67 paintInfo.context->setImageInterpolationQuality(previousInterpolationQuality );
68 } 68 }
69 69
70 } // namespace blink 70 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/paint/ImagePainter.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698