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

Unified Diff: Source/core/css/CSSImageGeneratorValue.cpp

Issue 1105103003: Update renderer in core/css. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « Source/core/css/CSSImageGeneratorValue.h ('k') | Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSImageGeneratorValue.cpp
diff --git a/Source/core/css/CSSImageGeneratorValue.cpp b/Source/core/css/CSSImageGeneratorValue.cpp
index 08c81b8e9008dc1e435f7ec3f77c0289030af7a3..d533d80d0193d89707dd6f53220b062a59968ba8 100644
--- a/Source/core/css/CSSImageGeneratorValue.cpp
+++ b/Source/core/css/CSSImageGeneratorValue.cpp
@@ -42,9 +42,9 @@ CSSImageGeneratorValue::~CSSImageGeneratorValue()
{
}
-void CSSImageGeneratorValue::addClient(LayoutObject* renderer, const IntSize& size)
+void CSSImageGeneratorValue::addClient(LayoutObject* layoutObject, const IntSize& size)
{
- ASSERT(renderer);
+ ASSERT(layoutObject);
#if !ENABLE(OILPAN)
ref();
#else
@@ -57,19 +57,19 @@ void CSSImageGeneratorValue::addClient(LayoutObject* renderer, const IntSize& si
if (!size.isEmpty())
m_sizes.add(size);
- LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
+ LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject);
if (it == m_clients.end())
- m_clients.add(renderer, SizeAndCount(size, 1));
+ m_clients.add(layoutObject, SizeAndCount(size, 1));
else {
SizeAndCount& sizeCount = it->value;
++sizeCount.count;
}
}
-void CSSImageGeneratorValue::removeClient(LayoutObject* renderer)
+void CSSImageGeneratorValue::removeClient(LayoutObject* layoutObject)
{
- ASSERT(renderer);
- LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
+ ASSERT(layoutObject);
+ LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject);
ASSERT_WITH_SECURITY_IMPLICATION(it != m_clients.end());
IntSize removedImageSize;
@@ -82,7 +82,7 @@ void CSSImageGeneratorValue::removeClient(LayoutObject* renderer)
}
if (!--sizeCount.count)
- m_clients.remove(renderer);
+ m_clients.remove(layoutObject);
#if !ENABLE(OILPAN)
deref();
@@ -94,16 +94,16 @@ void CSSImageGeneratorValue::removeClient(LayoutObject* renderer)
#endif
}
-Image* CSSImageGeneratorValue::getImage(LayoutObject* renderer, const IntSize& size)
+Image* CSSImageGeneratorValue::getImage(LayoutObject* layoutObject, const IntSize& size)
{
- LayoutObjectSizeCountMap::iterator it = m_clients.find(renderer);
+ LayoutObjectSizeCountMap::iterator it = m_clients.find(layoutObject);
if (it != m_clients.end()) {
SizeAndCount& sizeCount = it->value;
IntSize oldSize = sizeCount.size;
if (oldSize != size) {
RefPtrWillBeRawPtr<CSSImageGeneratorValue> protect(this);
- removeClient(renderer);
- addClient(renderer, size);
+ removeClient(layoutObject);
+ addClient(layoutObject, size);
}
}
@@ -120,17 +120,17 @@ void CSSImageGeneratorValue::putImage(const IntSize& size, PassRefPtr<Image> ima
m_images.add(size, image);
}
-PassRefPtr<Image> CSSImageGeneratorValue::image(LayoutObject* renderer, const IntSize& size)
+PassRefPtr<Image> CSSImageGeneratorValue::image(LayoutObject* layoutObject, const IntSize& size)
{
switch (classType()) {
case CanvasClass:
- return toCSSCanvasValue(this)->image(renderer, size);
+ return toCSSCanvasValue(this)->image(layoutObject, size);
case CrossfadeClass:
- return toCSSCrossfadeValue(this)->image(renderer, size);
+ return toCSSCrossfadeValue(this)->image(layoutObject, size);
case LinearGradientClass:
- return toCSSLinearGradientValue(this)->image(renderer, size);
+ return toCSSLinearGradientValue(this)->image(layoutObject, size);
case RadialGradientClass:
- return toCSSRadialGradientValue(this)->image(renderer, size);
+ return toCSSRadialGradientValue(this)->image(layoutObject, size);
default:
ASSERT_NOT_REACHED();
}
@@ -154,17 +154,17 @@ bool CSSImageGeneratorValue::isFixedSize() const
return false;
}
-IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* renderer)
+IntSize CSSImageGeneratorValue::fixedSize(const LayoutObject* layoutObject)
{
switch (classType()) {
case CanvasClass:
- return toCSSCanvasValue(this)->fixedSize(renderer);
+ return toCSSCanvasValue(this)->fixedSize(layoutObject);
case CrossfadeClass:
- return toCSSCrossfadeValue(this)->fixedSize(renderer);
+ return toCSSCrossfadeValue(this)->fixedSize(layoutObject);
case LinearGradientClass:
- return toCSSLinearGradientValue(this)->fixedSize(renderer);
+ return toCSSLinearGradientValue(this)->fixedSize(layoutObject);
case RadialGradientClass:
- return toCSSRadialGradientValue(this)->fixedSize(renderer);
+ return toCSSRadialGradientValue(this)->fixedSize(layoutObject);
default:
ASSERT_NOT_REACHED();
}
@@ -188,17 +188,17 @@ bool CSSImageGeneratorValue::isPending() const
return false;
}
-bool CSSImageGeneratorValue::knownToBeOpaque(const LayoutObject* renderer) const
+bool CSSImageGeneratorValue::knownToBeOpaque(const LayoutObject* layoutObject) const
{
switch (classType()) {
case CrossfadeClass:
- return toCSSCrossfadeValue(this)->knownToBeOpaque(renderer);
+ return toCSSCrossfadeValue(this)->knownToBeOpaque(layoutObject);
case CanvasClass:
return false;
case LinearGradientClass:
- return toCSSLinearGradientValue(this)->knownToBeOpaque(renderer);
+ return toCSSLinearGradientValue(this)->knownToBeOpaque(layoutObject);
case RadialGradientClass:
- return toCSSRadialGradientValue(this)->knownToBeOpaque(renderer);
+ return toCSSRadialGradientValue(this)->knownToBeOpaque(layoutObject);
default:
ASSERT_NOT_REACHED();
}
« no previous file with comments | « Source/core/css/CSSImageGeneratorValue.h ('k') | Source/core/css/CSSImageValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698