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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 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/CSSCrossfadeValue.h ('k') | Source/core/css/CSSGradientValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSCrossfadeValue.cpp
diff --git a/Source/core/css/CSSCrossfadeValue.cpp b/Source/core/css/CSSCrossfadeValue.cpp
index b2a7e004e6dd40b474b436343fb7019db40881b3..e8c7de07405100a314ec298185fc7ff3af7e595b 100644
--- a/Source/core/css/CSSCrossfadeValue.cpp
+++ b/Source/core/css/CSSCrossfadeValue.cpp
@@ -27,7 +27,7 @@
#include "core/css/CSSCrossfadeValue.h"
#include "core/css/CSSImageValue.h"
-#include "core/rendering/RenderObject.h"
+#include "core/layout/LayoutObject.h"
#include "core/rendering/style/StyleFetchedImage.h"
#include "platform/graphics/CrossfadeGeneratedImage.h"
#include "wtf/text/StringBuilder.h"
@@ -47,7 +47,7 @@ static bool subimageIsPending(CSSValue* value)
return false;
}
-static bool subimageKnownToBeOpaque(CSSValue* value, const RenderObject* renderer)
+static bool subimageKnownToBeOpaque(CSSValue* value, const LayoutObject* renderer)
{
if (value->isImageValue())
return toCSSImageValue(value)->knownToBeOpaque(renderer);
@@ -105,7 +105,7 @@ String CSSCrossfadeValue::customCSSText() const
return result.toString();
}
-IntSize CSSCrossfadeValue::fixedSize(const RenderObject* renderer)
+IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* renderer)
{
float percentage = m_percentageValue->getFloatValue();
float inversePercentage = 1 - percentage;
@@ -134,7 +134,7 @@ bool CSSCrossfadeValue::isPending() const
return subimageIsPending(m_fromValue.get()) || subimageIsPending(m_toValue.get());
}
-bool CSSCrossfadeValue::knownToBeOpaque(const RenderObject* renderer) const
+bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* renderer) const
{
return subimageKnownToBeOpaque(m_fromValue.get(), renderer) && subimageKnownToBeOpaque(m_toValue.get(), renderer);
}
@@ -164,7 +164,7 @@ void CSSCrossfadeValue::loadSubimages(ResourceFetcher* fetcher)
m_crossfadeSubimageObserver.setReady(true);
}
-PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize& size)
+PassRefPtr<Image> CSSCrossfadeValue::image(LayoutObject* renderer, const IntSize& size)
{
if (size.isEmpty())
return nullptr;
@@ -190,7 +190,7 @@ PassRefPtr<Image> CSSCrossfadeValue::image(RenderObject* renderer, const IntSize
void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
{
for (const auto& curr : clients()) {
- RenderObject* client = const_cast<RenderObject*>(curr.key);
+ LayoutObject* client = const_cast<LayoutObject*>(curr.key);
client->imageChanged(static_cast<WrappedImagePtr>(this));
}
}
« no previous file with comments | « Source/core/css/CSSCrossfadeValue.h ('k') | Source/core/css/CSSGradientValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698