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

Unified Diff: Source/core/html/HTMLImageElement.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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
« no previous file with comments | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLImageFallbackHelper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLImageElement.cpp
diff --git a/Source/core/html/HTMLImageElement.cpp b/Source/core/html/HTMLImageElement.cpp
index a827b7e393382b5a3e1a386d8a0467a496a7578e..f406d99bad97768b67ff65f71fbe5a49d47c9934 100644
--- a/Source/core/html/HTMLImageElement.cpp
+++ b/Source/core/html/HTMLImageElement.cpp
@@ -333,7 +333,7 @@ ImageCandidate HTMLImageElement::findBestFitImageFromPictureParent()
return ImageCandidate();
}
-LayoutObject* HTMLImageElement::createLayoutObject(const LayoutStyle& style)
+LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style)
{
if (style.hasContent())
return LayoutObject::createObject(this, style);
@@ -706,14 +706,14 @@ void HTMLImageElement::reattachFallbackContent()
lazyReattachIfAttached();
}
-PassRefPtr<LayoutStyle> HTMLImageElement::customStyleForLayoutObject()
+PassRefPtr<ComputedStyle> HTMLImageElement::customStyleForLayoutObject()
{
- RefPtr<LayoutStyle> newStyle = originalStyleForLayoutObject();
+ RefPtr<ComputedStyle> newStyle = originalStyleForLayoutObject();
if (!m_useFallbackContent)
return newStyle;
- RefPtr<LayoutStyle> style = LayoutStyle::clone(*newStyle);
+ RefPtr<ComputedStyle> style = ComputedStyle::clone(*newStyle);
return HTMLImageFallbackHelper::customStyleForAltText(*this, style);
}
« no previous file with comments | « Source/core/html/HTMLImageElement.h ('k') | Source/core/html/HTMLImageFallbackHelper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698