| 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;
|
|
|