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

Unified Diff: third_party/WebKit/Source/core/style/StyleFetchedImage.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp b/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
index efd30cf076c9dc3359046e2e0ac3e6b2aff899b2..5b3f777c8e9cc1d82481bde39d1bfa518ece2254 100644
--- a/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
+++ b/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
@@ -78,7 +78,7 @@ PassRefPtrWillBeRawPtr<CSSValue> StyleFetchedImage::computedCSSValue() const
bool StyleFetchedImage::canRender() const
{
- return !m_image->errorOccurred() && !m_image->image()->isNull();
+ return !m_image->errorOccurred() && !m_image->getImage()->isNull();
}
bool StyleFetchedImage::isLoaded() const
@@ -93,8 +93,8 @@ bool StyleFetchedImage::errorOccurred() const
LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier, const LayoutSize& defaultObjectSize) const
{
- if (m_image->image() && m_image->image()->isSVGImage())
- return imageSizeForSVGImage(toSVGImage(m_image->image()), multiplier, defaultObjectSize);
+ if (m_image->getImage() && m_image->getImage()->isSVGImage())
+ return imageSizeForSVGImage(toSVGImage(m_image->getImage()), multiplier, defaultObjectSize);
// Image orientation should only be respected for content images,
// not decorative images such as StyleImage (backgrounds,
@@ -126,24 +126,24 @@ void StyleFetchedImage::removeClient(LayoutObject* layoutObject)
void StyleFetchedImage::notifyFinished(Resource* resource)
{
- if (m_document && m_image && m_image->image() && m_image->image()->isSVGImage())
- toSVGImage(m_image->image())->updateUseCounters(*m_document);
+ if (m_document && m_image && m_image->getImage() && m_image->getImage()->isSVGImage())
+ toSVGImage(m_image->getImage())->updateUseCounters(*m_document);
// Oilpan: do not prolong the Document's lifetime.
m_document.clear();
}
PassRefPtr<Image> StyleFetchedImage::image(const LayoutObject*, const IntSize& containerSize, float zoom) const
{
- if (!m_image->image()->isSVGImage())
- return m_image->image();
+ if (!m_image->getImage()->isSVGImage())
+ return m_image->getImage();
- return SVGImageForContainer::create(toSVGImage(m_image->image()), containerSize, zoom, m_url);
+ return SVGImageForContainer::create(toSVGImage(m_image->getImage()), containerSize, zoom, m_url);
}
bool StyleFetchedImage::knownToBeOpaque(const LayoutObject* layoutObject) const
{
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "PaintImage", "data", InspectorPaintImageEvent::data(layoutObject, *m_image.get()));
- return m_image->image()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata);
+ return m_image->getImage()->currentFrameKnownToBeOpaque(Image::PreCacheMetadata);
}
DEFINE_TRACE(StyleFetchedImage)
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.cpp ('k') | third_party/WebKit/Source/core/style/StyleFetchedImageSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698