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

Side by Side Diff: Source/core/style/StyleFetchedImageSet.cpp

Issue 1314793010: Support fragment URLs for all kinds of SVG images (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 14 matching lines...) Expand all
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "core/style/StyleFetchedImageSet.h" 27 #include "core/style/StyleFetchedImageSet.h"
28 28
29 #include "core/css/CSSImageSetValue.h" 29 #include "core/css/CSSImageSetValue.h"
30 #include "core/fetch/ImageResource.h" 30 #include "core/fetch/ImageResource.h"
31 #include "core/layout/LayoutObject.h" 31 #include "core/layout/LayoutObject.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 StyleFetchedImageSet::StyleFetchedImageSet(ImageResource* image, float imageScal eFactor, CSSImageSetValue* value) 35 StyleFetchedImageSet::StyleFetchedImageSet(ImageResource* image, float imageScal eFactor, CSSImageSetValue* value, const KURL& urlWithFragment)
36 : m_bestFitImage(image) 36 : m_bestFitImage(image)
37 , m_imageScaleFactor(imageScaleFactor) 37 , m_imageScaleFactor(imageScaleFactor)
38 , m_imageSetValue(value) 38 , m_imageSetValue(value)
39 , m_urlWithFragment(urlWithFragment)
39 { 40 {
40 m_isImageResourceSet = true; 41 m_isImageResourceSet = true;
41 m_bestFitImage->addClient(this); 42 m_bestFitImage->addClient(this);
42 } 43 }
43 44
44 45
45 StyleFetchedImageSet::~StyleFetchedImageSet() 46 StyleFetchedImageSet::~StyleFetchedImageSet()
46 { 47 {
47 m_bestFitImage->removeClient(this); 48 m_bestFitImage->removeClient(this);
48 } 49 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 m_bestFitImage->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio); 90 m_bestFitImage->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
90 } 91 }
91 92
92 bool StyleFetchedImageSet::usesImageContainerSize() const 93 bool StyleFetchedImageSet::usesImageContainerSize() const
93 { 94 {
94 return m_bestFitImage->usesImageContainerSize(); 95 return m_bestFitImage->usesImageContainerSize();
95 } 96 }
96 97
97 void StyleFetchedImageSet::setContainerSizeForLayoutObject(const LayoutObject* l ayoutObject, const IntSize& imageContainerSize, float imageContainerZoomFactor) 98 void StyleFetchedImageSet::setContainerSizeForLayoutObject(const LayoutObject* l ayoutObject, const IntSize& imageContainerSize, float imageContainerZoomFactor)
98 { 99 {
99 m_bestFitImage->setContainerSizeForLayoutObject(layoutObject, imageContainer Size, imageContainerZoomFactor); 100 m_bestFitImage->setContainerParametersForLayoutObject(layoutObject, imageCon tainerSize, imageContainerZoomFactor, m_urlWithFragment);
100 } 101 }
101 102
102 void StyleFetchedImageSet::addClient(LayoutObject* layoutObject) 103 void StyleFetchedImageSet::addClient(LayoutObject* layoutObject)
103 { 104 {
104 m_bestFitImage->addClient(layoutObject); 105 m_bestFitImage->addClient(layoutObject);
105 } 106 }
106 107
107 void StyleFetchedImageSet::removeClient(LayoutObject* layoutObject) 108 void StyleFetchedImageSet::removeClient(LayoutObject* layoutObject)
108 { 109 {
109 m_bestFitImage->removeClient(layoutObject); 110 m_bestFitImage->removeClient(layoutObject);
110 } 111 }
111 112
112 PassRefPtr<Image> StyleFetchedImageSet::image(LayoutObject* layoutObject, const IntSize&) const 113 PassRefPtr<Image> StyleFetchedImageSet::image(LayoutObject* layoutObject, const IntSize&) const
113 { 114 {
114 return m_bestFitImage->imageForLayoutObject(layoutObject); 115 return m_bestFitImage->imageForLayoutObject(layoutObject);
115 } 116 }
116 117
117 bool StyleFetchedImageSet::knownToBeOpaque(const LayoutObject* layoutObject) con st 118 bool StyleFetchedImageSet::knownToBeOpaque(const LayoutObject* layoutObject) con st
118 { 119 {
119 return m_bestFitImage->currentFrameKnownToBeOpaque(layoutObject); 120 return m_bestFitImage->currentFrameKnownToBeOpaque(layoutObject);
120 } 121 }
121 122
122 DEFINE_TRACE(StyleFetchedImageSet) 123 DEFINE_TRACE(StyleFetchedImageSet)
123 { 124 {
124 visitor->trace(m_imageSetValue); 125 visitor->trace(m_imageSetValue);
125 StyleImage::trace(visitor); 126 StyleImage::trace(visitor);
126 } 127 }
127 128
128 } // namespace blink 129 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698