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

Unified Diff: Source/core/css/resolver/StyleAdjuster.cpp

Issue 889563002: Make RenderObject::style() return a const object (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Blind fix for Mac. Created 5 years, 11 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: Source/core/css/resolver/StyleAdjuster.cpp
diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp
index 89cdfefc173b462bf453fdb94f5fa806a9b72293..000f207079248b13fe18633a900a7fbbc3196970 100644
--- a/Source/core/css/resolver/StyleAdjuster.cpp
+++ b/Source/core/css/resolver/StyleAdjuster.cpp
@@ -151,7 +151,7 @@ static bool hasWillChangeThatCreatesStackingContext(const RenderStyle* style)
return false;
}
-void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e, const CachedUAStyle* cachedUAStyle)
+void StyleAdjuster::adjustRenderStyle(RenderStyle* style, const RenderStyle* parentStyle, Element *e, const CachedUAStyle* cachedUAStyle)
{
ASSERT(parentStyle);
@@ -336,7 +336,7 @@ void StyleAdjuster::adjustStyleForAlignment(RenderStyle& style, const RenderStyl
}
}
-void StyleAdjuster::adjustStyleForHTMLElement(RenderStyle* style, RenderStyle* parentStyle, HTMLElement& element)
+void StyleAdjuster::adjustStyleForHTMLElement(RenderStyle* style, const RenderStyle* parentStyle, HTMLElement& element)
{
// <div> and <span> are the most common elements on the web, we skip all the work for them.
if (isHTMLDivElement(element) || isHTMLSpanElement(element))
@@ -457,7 +457,7 @@ void StyleAdjuster::adjustOverflow(RenderStyle* style)
}
}
-void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, RenderStyle* parentStyle)
+void StyleAdjuster::adjustStyleForDisplay(RenderStyle* style, const RenderStyle* parentStyle)
{
if (style->display() == BLOCK && !style->isFloating())
return;

Powered by Google App Engine
This is Rietveld 408576698