<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200098] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200098">200098</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-26 11:20:09 -0700 (Tue, 26 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderElement::style() should return const RenderStyle
https://bugs.webkit.org/show_bug.cgi?id=157016
Reviewed by Geoff Garen.
Style should be changed via setStyle, not by mutating it directly.
Pulling this string turns RenderStyle const in many places.
* accessibility/AccessibilityObject.cpp:
(WebCore::startOfStyleRange):
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
(getAttributeSetForAccessibilityObject):
* bindings/objc/DOM.mm:
(-[DOMNode innerFrameQuad]):
(-[DOMNode computedFontSize]):
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::createPositionListForLayer):
(WebCore::positionOffsetValue):
(WebCore::ComputedStyleExtractor::currentColorOrValidColor):
(WebCore::getTransitionPropertyValue):
(WebCore::scrollSnapDestination):
(WebCore::scrollSnapPoints):
(WebCore::scrollSnapCoordinates):
(WebCore::logUnimplementedPropertyID):
(WebCore::fontFamilyFromStyle):
(WebCore::lineHeightFromStyle):
(WebCore::fontSizeFromStyle):
(WebCore::fontStyleFromStyle):
(WebCore::fontVariantFromStyle):
(WebCore::fontWeightFromStyle):
(WebCore::fontSynthesisFromStyle):
(WebCore::zoomAdjustedPaddingOrMarginPixelValue):
(WebCore::paddingOrMarginIsRendererDependent):
(WebCore::convertToRegionBreak):
(WebCore::isLayoutDependent):
(WebCore::updateStyleIfNeededForNode):
(WebCore::computeRenderStyleForProperty):
(WebCore::ComputedStyleExtractor::propertyValue):
(WebCore::CSSComputedStyleDeclaration::length):
(WebCore::CSSComputedStyleDeclaration::item):
(WebCore::ComputedStyleExtractor::propertyMatches):
* css/CSSComputedStyleDeclaration.h:
* css/CSSToLengthConversionData.cpp:
(WebCore::CSSToLengthConversionData::viewportWidthFactor):
(WebCore::CSSToLengthConversionData::viewportHeightFactor):
(WebCore::CSSToLengthConversionData::viewportMinFactor):
(WebCore::CSSToLengthConversionData::viewportMaxFactor):
* css/CSSToLengthConversionData.h:
(WebCore::CSSToLengthConversionData::CSSToLengthConversionData):
(WebCore::CSSToLengthConversionData::style):
(WebCore::CSSToLengthConversionData::rootStyle):
(WebCore::CSSToLengthConversionData::computingFontSize):
(WebCore::CSSToLengthConversionData::copyWithAdjustedZoom):
* css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::style):
(WebCore::CSSToStyleMap::rootElementStyle):
* css/CSSToStyleMap.h:
* css/MediaQueryEvaluator.cpp:
(WebCore::MediaQueryEvaluator::MediaQueryEvaluator):
* css/MediaQueryEvaluator.h:
* css/SVGCSSComputedStyleDeclaration.cpp:
(WebCore::strokeDashArrayToCSSValueList):
(WebCore::ComputedStyleExtractor::adjustSVGPaintForCurrentColor):
(WebCore::ComputedStyleExtractor::svgPropertyValue):
* css/SourceSizeList.cpp:
(WebCore::match):
(WebCore::defaultLength):
(WebCore::computeLength):
(WebCore::parseSizesAttribute):
* css/StyleBuilderCustom.h:
(WebCore::ApplyPropertyBorderImageModifier::applyValue):
(WebCore::ApplyPropertyBorderImageModifier::getValue):
(WebCore::StyleBuilderCustom::applyInheritClip):
(WebCore::StyleBuilderCustom::applyInheritCounter):
(WebCore::StyleBuilderCustom::applyValueContent):
(WebCore::StyleBuilderCustom::applyValueAlt):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::sweepMatchedPropertiesCache):
(WebCore::StyleResolver::State::State):
(WebCore::isAtShadowBoundary):
(WebCore::StyleResolver::styleForElement):
(WebCore::StyleResolver::keyframeStylesForAnimation):
(WebCore::StyleResolver::pseudoStyleForElement):
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::checkForTextSizeAdjust):
(WebCore::StyleResolver::checkForZoomChange):
(WebCore::StyleResolver::checkForGenericFamilyChange):
* css/StyleResolver.h:
(WebCore::StyleResolver::style):
(WebCore::StyleResolver::parentStyle):
(WebCore::StyleResolver::rootElementStyle):
(WebCore::StyleResolver::element):
(WebCore::StyleResolver::document):
(WebCore::StyleResolver::documentSettings):
(WebCore::StyleResolver::State::State):
(WebCore::StyleResolver::State::takeStyle):
(WebCore::StyleResolver::State::parentStyle):
(WebCore::StyleResolver::State::rootElementStyle):
(WebCore::StyleResolver::State::regionForStyling):
(WebCore::StyleResolver::State::elementLinkState):
* dom/Document.cpp:
(WebCore::Document::updateLayoutIgnorePendingStylesheets):
(WebCore::Document::styleForElementIgnoringPendingStylesheets):
(WebCore::Document::setVisuallyOrdered):
(WebCore::Document::createParser):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::styleResolver):
(WebCore::Element::resolveStyle):
(WebCore::checkForEmptyStyleChange):
(WebCore::checkForSiblingStyleChanges):
(WebCore::beforeOrAfterPseudoElement):
(WebCore::Element::existingComputedStyle):
(WebCore::Element::resolveComputedStyle):
(WebCore::Element::computedStyle):
(WebCore::Element::didDetachRenderers):
(WebCore::Element::resolveCustomStyle):
* dom/Element.h:
* dom/Node.cpp:
(WebCore::computeEditabilityFromComputedStyle):
(WebCore::Node::pseudoAwareLastChild):
(WebCore::Node::computedStyle):
* dom/Node.h:
* dom/NodeRenderStyle.h:
(WebCore::Node::renderStyle):
* dom/PseudoElement.cpp:
(WebCore::PseudoElement::clearHostElement):
(WebCore::PseudoElement::resolveCustomStyle):
* dom/PseudoElement.h:
* editing/ApplyBlockElementCommand.cpp:
(WebCore::isNewLineAtPosition):
(WebCore::ApplyBlockElementCommand::renderStyleOfEnclosingTextNode):
(WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
(WebCore::ApplyBlockElementCommand::endOfNextParagraphSplittingTextNodesIfNeeded):
* editing/ApplyBlockElementCommand.h:
* editing/EditingStyle.cpp:
(WebCore::EditingStyle::init):
(WebCore::EditingStyle::removeTextFillAndStrokeColorsIfNeeded):
* editing/EditingStyle.h:
* editing/Editor.h:
* editing/SimplifyMarkupCommand.cpp:
(WebCore::SimplifyMarkupCommand::doApply):
* editing/cocoa/EditorCocoa.mm:
(WebCore::Editor::styleForSelectionStart):
(WebCore::Editor::getTextDecorationAttributesRespectingTypingStyle):
* editing/ios/EditorIOS.mm:
(WebCore::Editor::fontForSelection):
(WebCore::Editor::fontAttributesForSelectionStart):
* editing/mac/EditorMac.mm:
(WebCore::Editor::fontForSelection):
(WebCore::Editor::fontAttributesForSelectionStart):
* html/HTMLTitleElement.cpp:
(WebCore::HTMLTitleElement::computedTextWithDirection):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::FontProxy::fontsNeedUpdate):
(WebCore::CanvasRenderingContext2D::FontProxy::initialize):
(WebCore::CanvasRenderingContext2D::setFont):
(WebCore::CanvasRenderingContext2D::setTextBaseline):
(WebCore::CanvasRenderingContext2D::toTextDirection):
(WebCore::CanvasRenderingContext2D::drawTextInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/parser/HTMLResourcePreloader.cpp:
(WebCore::HTMLResourcePreloader::preload):
(WebCore::mediaAttributeMatches):
* html/shadow/SliderThumbElement.cpp:
(WebCore::RenderSliderThumb::RenderSliderThumb):
(WebCore::RenderSliderThumb::updateAppearance):
(WebCore::RenderSliderContainer::layout):
(WebCore::SliderThumbElement::hostInput):
(WebCore::SliderThumbElement::resolveCustomStyle):
(WebCore::SliderContainerElement::createElementRenderer):
(WebCore::SliderContainerElement::resolveCustomStyle):
* html/shadow/SliderThumbElement.h:
* html/shadow/TextControlInnerElements.cpp:
(WebCore::TextControlInnerElement::create):
(WebCore::TextControlInnerElement::resolveCustomStyle):
(WebCore::TextControlInnerTextElement::renderer):
(WebCore::TextControlInnerTextElement::resolveCustomStyle):
(WebCore::TextControlPlaceholderElement::TextControlPlaceholderElement):
(WebCore::TextControlPlaceholderElement::resolveCustomStyle):
* html/shadow/TextControlInnerElements.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::selectCursor):
* page/animation/AnimationBase.cpp:
(WebCore::solveStepsFunction):
(WebCore::AnimationBase::AnimationBase):
* page/animation/AnimationBase.h:
(WebCore::AnimationBase::~AnimationBase):
(WebCore::AnimationBase::renderer):
(WebCore::AnimationBase::animation):
(WebCore::AnimationBase::setAnimation):
* page/animation/AnimationController.cpp:
(WebCore::AnimationController::cancelAnimations):
(WebCore::AnimationController::updateAnimations):
* page/animation/AnimationController.h:
* page/animation/CompositeAnimation.cpp:
(WebCore::CompositeAnimation::clearRenderer):
(WebCore::CompositeAnimation::updateTransitions):
(WebCore::CompositeAnimation::updateKeyframeAnimations):
(WebCore::CompositeAnimation::animate):
* page/animation/CompositeAnimation.h:
* page/animation/ImplicitAnimation.cpp:
(WebCore::ImplicitAnimation::ImplicitAnimation):
(WebCore::ImplicitAnimation::shouldSendEventForListener):
(WebCore::ImplicitAnimation::animate):
(WebCore::ImplicitAnimation::sendTransitionEvent):
(WebCore::ImplicitAnimation::reset):
* page/animation/ImplicitAnimation.h:
(WebCore::ImplicitAnimation::create):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::KeyframeAnimation):
(WebCore::KeyframeAnimation::fetchIntervalEndpointsForProperty):
(WebCore::KeyframeAnimation::animate):
* page/animation/KeyframeAnimation.h:
* page/ios/FrameIOS.mm:
(WebCore::ancestorRespondingToScrollWheelEvents):
* rendering/FlowThreadController.cpp:
(WebCore::FlowThreadController::styleDidChange):
* rendering/InlineFlowBox.cpp:
(WebCore::clipRectForNinePieceImageStrip):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::styleDidChange):
(WebCore::RenderBlock::lineHeight):
(WebCore::RenderBlock::firstLineBlock):
(WebCore::styleForFirstLetter):
(WebCore::RenderBlock::updateFirstLetterStyle):
(WebCore::RenderBlock::createFirstLetterRenderer):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::adjustBlockChildForPagination):
(WebCore::calculateMinimumPageHeight):
(WebCore::RenderBlockFlow::adjustComputedFontSizes):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::styleDidChange):
(WebCore::RenderBox::borderRadii):
(WebCore::RenderBox::enclosingFloatPaintingLayer):
(WebCore::RenderBox::logicalVisualOverflowRectForPropagation):
(WebCore::RenderBox::visualOverflowRectForPropagation):
(WebCore::RenderBox::logicalLayoutOverflowRectForPropagation):
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBox.h:
(WebCore::RenderBox::applyTopLeftLocationOffset):
(WebCore::RenderBox::hasRenderOverflow):
(WebCore::RenderBox::hasVisualOverflow):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::backgroundRoundedRectAdjustedForBleedAvoidance):
(WebCore::applyBoxShadowForBackground):
* rendering/RenderButton.cpp:
(WebCore::RenderButton::addChild):
(WebCore::RenderButton::styleWillChange):
(WebCore::RenderButton::styleDidChange):
(WebCore::RenderButton::setupInnerStyle):
(WebCore::RenderButton::layout):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::styleWillChange):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor):
(WebCore::RenderElement::uncachedFirstLineStyle):
(WebCore::RenderElement::cachedFirstLineStyle):
(WebCore::RenderElement::firstLineStyle):
(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::addControlStatesForRenderer):
(WebCore::RenderElement::getCachedPseudoStyle):
(WebCore::RenderElement::getMutableCachedPseudoStyle):
(WebCore::RenderElement::getUncachedPseudoStyle):
(WebCore::RenderElement::paintOutline):
* rendering/RenderElement.h:
(WebCore::RenderElement::hasInitializedStyle):
(WebCore::RenderElement::style):
(WebCore::RenderElement::mutableStyle):
(WebCore::RenderElement::element):
(WebCore::RenderObject::isRenderInline):
(WebCore::RenderObject::style):
(WebCore::RenderObject::firstLineStyle):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::layout):
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::RenderFlowThread):
(WebCore::RenderFlowThread::createFlowThreadStyle):
* rendering/RenderFlowThread.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::layoutShadowControls):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::styleDidChange):
(WebCore::RenderInline::updateAlwaysCreateLineBoxes):
(WebCore::RenderInline::paintOutline):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupClipPath):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::paintScrollbar):
(WebCore::itemOffsetForAlignment):
(WebCore::RenderListBox::paintItemForeground):
(WebCore::RenderListBox::paintItemBackground):
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::updateMargins):
(WebCore::RenderListMarker::lineHeight):
* rendering/RenderMarquee.cpp:
(WebCore::RenderMarquee::computePosition):
(WebCore::RenderMarquee::updateMarqueeStyle):
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::adjustInnerStyle):
(RenderMenuList::updateOptionsWidth):
(RenderMenuList::itemStyle):
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::isValidColumnSpanner):
* rendering/RenderMultiColumnSpannerPlaceholder.cpp:
(WebCore::RenderMultiColumnSpannerPlaceholder::createAnonymous):
* rendering/RenderMultiColumnSpannerPlaceholder.h:
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::checkRegionStyle):
(WebCore::RenderNamedFlowFragment::computeStyleInRegion):
* rendering/RenderNamedFlowFragment.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::innerLineHeight):
(WebCore::decorationColor):
(WebCore::RenderObject::getTextDecorationColorsAndStyles):
* rendering/RenderObject.h:
(WebCore::RenderObject::minPreferredLogicalWidth):
(WebCore::RenderObject::maxPreferredLogicalWidth):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::computePreferredLogicalWidths):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::paintRowGroupBorderIfRequired):
(WebCore::physicalBorderForDirection):
* rendering/RenderText.h:
(WebCore::RenderText::characterAt):
(WebCore::RenderText::style):
(WebCore::RenderText::firstLineStyle):
(WebCore::RenderText::getCachedPseudoStyle):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::styleDidChange):
* rendering/RenderTextControlMultiLine.cpp:
(WebCore::RenderTextControlMultiLine::layoutSpecialExcludedChild):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::layout):
(WebCore::RenderTextControlSingleLine::styleDidChange):
* rendering/RenderTextFragment.cpp:
(WebCore::RenderTextFragment::styleDidChange):
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMediaToggleClosedCaptionsButton):
(WebCore::borderRadiiFromStyle):
(WebCore::RenderThemeGtk::paintMediaSliderTrack):
(WebCore::RenderThemeGtk::paintMediaSliderThumb):
(WebCore::RenderThemeGtk::paintMediaVolumeSliderTrack):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
(WebCore::SimpleLineLayout::hitTestFlow):
* rendering/TextAutoSizing.cpp:
(WebCore::TextAutoSizingKey::TextAutoSizingKey):
* rendering/TextAutoSizing.h:
(WebCore::TextAutoSizingKey::style):
(WebCore::TextAutoSizingKey::isDeleted):
* rendering/TextPaintStyle.cpp:
(WebCore::computeTextSelectionPaintStyle):
* rendering/line/BreakingContext.h:
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::layout):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::setColumnRuleWidth):
(WebCore::RenderStyle::resetColumnRule):
(WebCore::RenderStyle::setColumnSpan):
(WebCore::RenderStyle::inheritColumnPropertiesFrom):
(WebCore::RenderStyle::setTransform):
(WebCore::RenderStyle::setTransformOriginX):
(WebCore::RenderStyle::setTransformOriginY):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::positionForOffset):
(WebCore::SVGInlineTextBox::selectionRectForTextFragment):
(WebCore::SVGInlineTextBox::localSelectionRect):
(WebCore::SVGInlineTextBox::paintSelectionBackground):
(WebCore::SVGInlineTextBox::paint):
(WebCore::SVGInlineTextBox::acquirePaintingResource):
(WebCore::SVGInlineTextBox::releasePaintingResource):
(WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
(WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
(WebCore::SVGInlineTextBox::constructTextRun):
(WebCore::SVGInlineTextBox::paintDecorationWithStyle):
(WebCore::SVGInlineTextBox::paintTextWithShadows):
(WebCore::SVGInlineTextBox::paintText):
* rendering/svg/SVGInlineTextBox.h:
* rendering/svg/SVGPathData.cpp:
(WebCore::updatePathFromCircleElement):
(WebCore::updatePathFromEllipseElement):
(WebCore::updatePathFromRectElement):
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
* style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::Parent::Parent):
(WebCore::Style::TreeResolver::popScope):
(WebCore::Style::TreeResolver::styleForElement):
(WebCore::Style::TreeResolver::pushParent):
(WebCore::Style::TreeResolver::resolveComposedTree):
* style/StyleTreeResolver.h:
(WebCore::Style::TreeResolver::scope):
* style/StyleUpdate.cpp:
(WebCore::Style::Update::textUpdate):
(WebCore::Style::Update::elementStyle):
(WebCore::Style::Update::addElement):
* style/StyleUpdate.h:
(WebCore::Style::Update::document):
* svg/SVGElement.cpp:
(WebCore::SVGElement::synchronizeSystemLanguage):
(WebCore::SVGElement::resolveCustomStyle):
(WebCore::SVGElement::setUseOverrideComputedStyle):
(WebCore::SVGElement::computedStyle):
* svg/SVGElement.h:
* svg/SVGElementRareData.h:
(WebCore::SVGElementRareData::ensureAnimatedSMILStyleProperties):
(WebCore::SVGElementRareData::overrideComputedStyle):
* svg/SVGGraphicsElement.cpp:
(WebCore::SVGGraphicsElement::animatedLocalTransform):
* svg/SVGLengthContext.cpp:
(WebCore::SVGLengthContext::convertValueFromPercentageToUserUnits):
(WebCore::renderStyleForLengthResolving):
(WebCore::SVGLengthContext::convertValueFromUserUnitsToEMS):
(WebCore::SVGLengthContext::convertValueFromEMSToUserUnits):
(WebCore::SVGLengthContext::convertValueFromUserUnitsToEXS):
(WebCore::SVGLengthContext::convertValueFromEXSToUserUnits):
* svg/SVGStopElement.cpp:
(WebCore::SVGStopElement::stopColorIncludingOpacity):
* svg/SVGTextElement.cpp:
(WebCore::SVGTextElement::animatedLocalTransform):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMmm">trunk/Source/WebCore/bindings/objc/DOM.mm</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationh">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSToLengthConversionDatacpp">trunk/Source/WebCore/css/CSSToLengthConversionData.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSToLengthConversionDatah">trunk/Source/WebCore/css/CSSToLengthConversionData.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSToStyleMapcpp">trunk/Source/WebCore/css/CSSToStyleMap.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSToStyleMaph">trunk/Source/WebCore/css/CSSToStyleMap.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorh">trunk/Source/WebCore/css/MediaQueryEvaluator.h</a></li>
<li><a href="#trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssSourceSizeListcpp">trunk/Source/WebCore/css/SourceSizeList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomNodeRenderStyleh">trunk/Source/WebCore/dom/NodeRenderStyle.h</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementcpp">trunk/Source/WebCore/dom/PseudoElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPseudoElementh">trunk/Source/WebCore/dom/PseudoElement.h</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyBlockElementCommandcpp">trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyBlockElementCommandh">trunk/Source/WebCore/editing/ApplyBlockElementCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStyleh">trunk/Source/WebCore/editing/EditingStyle.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingSimplifyMarkupCommandcpp">trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaEditorCocoamm">trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTitleElementcpp">trunk/Source/WebCore/html/HTMLTitleElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLResourcePreloadercpp">trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementcpp">trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSliderThumbElementh">trunk/Source/WebCore/html/shadow/SliderThumbElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementscpp">trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowTextControlInnerElementsh">trunk/Source/WebCore/html/shadow/TextControlInnerElements.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBaseh">trunk/Source/WebCore/page/animation/AnimationBase.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllercpp">trunk/Source/WebCore/page/animation/AnimationController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationControllerh">trunk/Source/WebCore/page/animation/AnimationController.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationCompositeAnimationcpp">trunk/Source/WebCore/page/animation/CompositeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCompositeAnimationh">trunk/Source/WebCore/page/animation/CompositeAnimation.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationcpp">trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationImplicitAnimationh">trunk/Source/WebCore/page/animation/ImplicitAnimation.h</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationh">trunk/Source/WebCore/page/animation/KeyframeAnimation.h</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingFlowThreadControllercpp">trunk/Source/WebCore/rendering/FlowThreadController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtoncpp">trunk/Source/WebCore/rendering/RenderButton.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListMarkercpp">trunk/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueecpp">trunk/Source/WebCore/rendering/RenderMarquee.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSpannerPlaceholdercpp">trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSpannerPlaceholderh">trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmenth">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTexth">trunk/Source/WebCore/rendering/RenderText.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlMultiLinecpp">trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextFragmentcpp">trunk/Source/WebCore/rendering/RenderTextFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutoSizingcpp">trunk/Source/WebCore/rendering/TextAutoSizing.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextAutoSizingh">trunk/Source/WebCore/rendering/TextAutoSizing.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContexth">trunk/Source/WebCore/rendering/line/BreakingContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxh">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGPathDatacpp">trunk/Source/WebCore/rendering/svg/SVGPathData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolverh">trunk/Source/WebCore/style/StyleTreeResolver.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleUpdatecpp">trunk/Source/WebCore/style/StyleUpdate.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleUpdateh">trunk/Source/WebCore/style/StyleUpdate.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementRareDatah">trunk/Source/WebCore/svg/SVGElementRareData.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGGraphicsElementcpp">trunk/Source/WebCore/svg/SVGGraphicsElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGLengthContextcpp">trunk/Source/WebCore/svg/SVGLengthContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGStopElementcpp">trunk/Source/WebCore/svg/SVGStopElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTextElementcpp">trunk/Source/WebCore/svg/SVGTextElement.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/ChangeLog 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1,3 +1,428 @@
</span><ins>+2016-04-26 Antti Koivisto <antti@apple.com>
+
+ RenderElement::style() should return const RenderStyle
+ https://bugs.webkit.org/show_bug.cgi?id=157016
+
+ Reviewed by Geoff Garen.
+
+ Style should be changed via setStyle, not by mutating it directly.
+
+ Pulling this string turns RenderStyle const in many places.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::startOfStyleRange):
+ * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+ (getAttributeSetForAccessibilityObject):
+ * bindings/objc/DOM.mm:
+ (-[DOMNode innerFrameQuad]):
+ (-[DOMNode computedFontSize]):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::createPositionListForLayer):
+ (WebCore::positionOffsetValue):
+ (WebCore::ComputedStyleExtractor::currentColorOrValidColor):
+ (WebCore::getTransitionPropertyValue):
+ (WebCore::scrollSnapDestination):
+ (WebCore::scrollSnapPoints):
+ (WebCore::scrollSnapCoordinates):
+ (WebCore::logUnimplementedPropertyID):
+ (WebCore::fontFamilyFromStyle):
+ (WebCore::lineHeightFromStyle):
+ (WebCore::fontSizeFromStyle):
+ (WebCore::fontStyleFromStyle):
+ (WebCore::fontVariantFromStyle):
+ (WebCore::fontWeightFromStyle):
+ (WebCore::fontSynthesisFromStyle):
+ (WebCore::zoomAdjustedPaddingOrMarginPixelValue):
+ (WebCore::paddingOrMarginIsRendererDependent):
+ (WebCore::convertToRegionBreak):
+ (WebCore::isLayoutDependent):
+ (WebCore::updateStyleIfNeededForNode):
+ (WebCore::computeRenderStyleForProperty):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ (WebCore::CSSComputedStyleDeclaration::length):
+ (WebCore::CSSComputedStyleDeclaration::item):
+ (WebCore::ComputedStyleExtractor::propertyMatches):
+ * css/CSSComputedStyleDeclaration.h:
+ * css/CSSToLengthConversionData.cpp:
+ (WebCore::CSSToLengthConversionData::viewportWidthFactor):
+ (WebCore::CSSToLengthConversionData::viewportHeightFactor):
+ (WebCore::CSSToLengthConversionData::viewportMinFactor):
+ (WebCore::CSSToLengthConversionData::viewportMaxFactor):
+ * css/CSSToLengthConversionData.h:
+ (WebCore::CSSToLengthConversionData::CSSToLengthConversionData):
+ (WebCore::CSSToLengthConversionData::style):
+ (WebCore::CSSToLengthConversionData::rootStyle):
+ (WebCore::CSSToLengthConversionData::computingFontSize):
+ (WebCore::CSSToLengthConversionData::copyWithAdjustedZoom):
+ * css/CSSToStyleMap.cpp:
+ (WebCore::CSSToStyleMap::style):
+ (WebCore::CSSToStyleMap::rootElementStyle):
+ * css/CSSToStyleMap.h:
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::MediaQueryEvaluator::MediaQueryEvaluator):
+ * css/MediaQueryEvaluator.h:
+ * css/SVGCSSComputedStyleDeclaration.cpp:
+ (WebCore::strokeDashArrayToCSSValueList):
+ (WebCore::ComputedStyleExtractor::adjustSVGPaintForCurrentColor):
+ (WebCore::ComputedStyleExtractor::svgPropertyValue):
+ * css/SourceSizeList.cpp:
+ (WebCore::match):
+ (WebCore::defaultLength):
+ (WebCore::computeLength):
+ (WebCore::parseSizesAttribute):
+ * css/StyleBuilderCustom.h:
+ (WebCore::ApplyPropertyBorderImageModifier::applyValue):
+ (WebCore::ApplyPropertyBorderImageModifier::getValue):
+ (WebCore::StyleBuilderCustom::applyInheritClip):
+ (WebCore::StyleBuilderCustom::applyInheritCounter):
+ (WebCore::StyleBuilderCustom::applyValueContent):
+ (WebCore::StyleBuilderCustom::applyValueAlt):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::sweepMatchedPropertiesCache):
+ (WebCore::StyleResolver::State::State):
+ (WebCore::isAtShadowBoundary):
+ (WebCore::StyleResolver::styleForElement):
+ (WebCore::StyleResolver::keyframeStylesForAnimation):
+ (WebCore::StyleResolver::pseudoStyleForElement):
+ (WebCore::StyleResolver::applyProperty):
+ (WebCore::StyleResolver::checkForTextSizeAdjust):
+ (WebCore::StyleResolver::checkForZoomChange):
+ (WebCore::StyleResolver::checkForGenericFamilyChange):
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::style):
+ (WebCore::StyleResolver::parentStyle):
+ (WebCore::StyleResolver::rootElementStyle):
+ (WebCore::StyleResolver::element):
+ (WebCore::StyleResolver::document):
+ (WebCore::StyleResolver::documentSettings):
+ (WebCore::StyleResolver::State::State):
+ (WebCore::StyleResolver::State::takeStyle):
+ (WebCore::StyleResolver::State::parentStyle):
+ (WebCore::StyleResolver::State::rootElementStyle):
+ (WebCore::StyleResolver::State::regionForStyling):
+ (WebCore::StyleResolver::State::elementLinkState):
+ * dom/Document.cpp:
+ (WebCore::Document::updateLayoutIgnorePendingStylesheets):
+ (WebCore::Document::styleForElementIgnoringPendingStylesheets):
+ (WebCore::Document::setVisuallyOrdered):
+ (WebCore::Document::createParser):
+ * dom/Document.h:
+ * dom/Element.cpp:
+ (WebCore::Element::styleResolver):
+ (WebCore::Element::resolveStyle):
+ (WebCore::checkForEmptyStyleChange):
+ (WebCore::checkForSiblingStyleChanges):
+ (WebCore::beforeOrAfterPseudoElement):
+ (WebCore::Element::existingComputedStyle):
+ (WebCore::Element::resolveComputedStyle):
+ (WebCore::Element::computedStyle):
+ (WebCore::Element::didDetachRenderers):
+ (WebCore::Element::resolveCustomStyle):
+ * dom/Element.h:
+ * dom/Node.cpp:
+ (WebCore::computeEditabilityFromComputedStyle):
+ (WebCore::Node::pseudoAwareLastChild):
+ (WebCore::Node::computedStyle):
+ * dom/Node.h:
+ * dom/NodeRenderStyle.h:
+ (WebCore::Node::renderStyle):
+ * dom/PseudoElement.cpp:
+ (WebCore::PseudoElement::clearHostElement):
+ (WebCore::PseudoElement::resolveCustomStyle):
+ * dom/PseudoElement.h:
+ * editing/ApplyBlockElementCommand.cpp:
+ (WebCore::isNewLineAtPosition):
+ (WebCore::ApplyBlockElementCommand::renderStyleOfEnclosingTextNode):
+ (WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
+ (WebCore::ApplyBlockElementCommand::endOfNextParagraphSplittingTextNodesIfNeeded):
+ * editing/ApplyBlockElementCommand.h:
+ * editing/EditingStyle.cpp:
+ (WebCore::EditingStyle::init):
+ (WebCore::EditingStyle::removeTextFillAndStrokeColorsIfNeeded):
+ * editing/EditingStyle.h:
+ * editing/Editor.h:
+ * editing/SimplifyMarkupCommand.cpp:
+ (WebCore::SimplifyMarkupCommand::doApply):
+ * editing/cocoa/EditorCocoa.mm:
+ (WebCore::Editor::styleForSelectionStart):
+ (WebCore::Editor::getTextDecorationAttributesRespectingTypingStyle):
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::fontForSelection):
+ (WebCore::Editor::fontAttributesForSelectionStart):
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::fontForSelection):
+ (WebCore::Editor::fontAttributesForSelectionStart):
+ * html/HTMLTitleElement.cpp:
+ (WebCore::HTMLTitleElement::computedTextWithDirection):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::FontProxy::fontsNeedUpdate):
+ (WebCore::CanvasRenderingContext2D::FontProxy::initialize):
+ (WebCore::CanvasRenderingContext2D::setFont):
+ (WebCore::CanvasRenderingContext2D::setTextBaseline):
+ (WebCore::CanvasRenderingContext2D::toTextDirection):
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/parser/HTMLResourcePreloader.cpp:
+ (WebCore::HTMLResourcePreloader::preload):
+ (WebCore::mediaAttributeMatches):
+ * html/shadow/SliderThumbElement.cpp:
+ (WebCore::RenderSliderThumb::RenderSliderThumb):
+ (WebCore::RenderSliderThumb::updateAppearance):
+ (WebCore::RenderSliderContainer::layout):
+ (WebCore::SliderThumbElement::hostInput):
+ (WebCore::SliderThumbElement::resolveCustomStyle):
+ (WebCore::SliderContainerElement::createElementRenderer):
+ (WebCore::SliderContainerElement::resolveCustomStyle):
+ * html/shadow/SliderThumbElement.h:
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::TextControlInnerElement::create):
+ (WebCore::TextControlInnerElement::resolveCustomStyle):
+ (WebCore::TextControlInnerTextElement::renderer):
+ (WebCore::TextControlInnerTextElement::resolveCustomStyle):
+ (WebCore::TextControlPlaceholderElement::TextControlPlaceholderElement):
+ (WebCore::TextControlPlaceholderElement::resolveCustomStyle):
+ * html/shadow/TextControlInnerElements.h:
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::selectCursor):
+ * page/animation/AnimationBase.cpp:
+ (WebCore::solveStepsFunction):
+ (WebCore::AnimationBase::AnimationBase):
+ * page/animation/AnimationBase.h:
+ (WebCore::AnimationBase::~AnimationBase):
+ (WebCore::AnimationBase::renderer):
+ (WebCore::AnimationBase::animation):
+ (WebCore::AnimationBase::setAnimation):
+ * page/animation/AnimationController.cpp:
+ (WebCore::AnimationController::cancelAnimations):
+ (WebCore::AnimationController::updateAnimations):
+ * page/animation/AnimationController.h:
+ * page/animation/CompositeAnimation.cpp:
+ (WebCore::CompositeAnimation::clearRenderer):
+ (WebCore::CompositeAnimation::updateTransitions):
+ (WebCore::CompositeAnimation::updateKeyframeAnimations):
+ (WebCore::CompositeAnimation::animate):
+ * page/animation/CompositeAnimation.h:
+ * page/animation/ImplicitAnimation.cpp:
+ (WebCore::ImplicitAnimation::ImplicitAnimation):
+ (WebCore::ImplicitAnimation::shouldSendEventForListener):
+ (WebCore::ImplicitAnimation::animate):
+ (WebCore::ImplicitAnimation::sendTransitionEvent):
+ (WebCore::ImplicitAnimation::reset):
+ * page/animation/ImplicitAnimation.h:
+ (WebCore::ImplicitAnimation::create):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::KeyframeAnimation):
+ (WebCore::KeyframeAnimation::fetchIntervalEndpointsForProperty):
+ (WebCore::KeyframeAnimation::animate):
+ * page/animation/KeyframeAnimation.h:
+ * page/ios/FrameIOS.mm:
+ (WebCore::ancestorRespondingToScrollWheelEvents):
+ * rendering/FlowThreadController.cpp:
+ (WebCore::FlowThreadController::styleDidChange):
+ * rendering/InlineFlowBox.cpp:
+ (WebCore::clipRectForNinePieceImageStrip):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::styleDidChange):
+ (WebCore::RenderBlock::lineHeight):
+ (WebCore::RenderBlock::firstLineBlock):
+ (WebCore::styleForFirstLetter):
+ (WebCore::RenderBlock::updateFirstLetterStyle):
+ (WebCore::RenderBlock::createFirstLetterRenderer):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::adjustBlockChildForPagination):
+ (WebCore::calculateMinimumPageHeight):
+ (WebCore::RenderBlockFlow::adjustComputedFontSizes):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::styleDidChange):
+ (WebCore::RenderBox::borderRadii):
+ (WebCore::RenderBox::enclosingFloatPaintingLayer):
+ (WebCore::RenderBox::logicalVisualOverflowRectForPropagation):
+ (WebCore::RenderBox::visualOverflowRectForPropagation):
+ (WebCore::RenderBox::logicalLayoutOverflowRectForPropagation):
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::applyTopLeftLocationOffset):
+ (WebCore::RenderBox::hasRenderOverflow):
+ (WebCore::RenderBox::hasVisualOverflow):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::backgroundRoundedRectAdjustedForBleedAvoidance):
+ (WebCore::applyBoxShadowForBackground):
+ * rendering/RenderButton.cpp:
+ (WebCore::RenderButton::addChild):
+ (WebCore::RenderButton::styleWillChange):
+ (WebCore::RenderButton::styleDidChange):
+ (WebCore::RenderButton::setupInnerStyle):
+ (WebCore::RenderButton::layout):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::styleWillChange):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor):
+ (WebCore::RenderElement::uncachedFirstLineStyle):
+ (WebCore::RenderElement::cachedFirstLineStyle):
+ (WebCore::RenderElement::firstLineStyle):
+ (WebCore::RenderElement::styleWillChange):
+ (WebCore::RenderElement::addControlStatesForRenderer):
+ (WebCore::RenderElement::getCachedPseudoStyle):
+ (WebCore::RenderElement::getMutableCachedPseudoStyle):
+ (WebCore::RenderElement::getUncachedPseudoStyle):
+ (WebCore::RenderElement::paintOutline):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::hasInitializedStyle):
+ (WebCore::RenderElement::style):
+ (WebCore::RenderElement::mutableStyle):
+ (WebCore::RenderElement::element):
+ (WebCore::RenderObject::isRenderInline):
+ (WebCore::RenderObject::style):
+ (WebCore::RenderObject::firstLineStyle):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::layout):
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::RenderFlowThread):
+ (WebCore::RenderFlowThread::createFlowThreadStyle):
+ * rendering/RenderFlowThread.h:
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::layoutShadowControls):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::styleDidChange):
+ (WebCore::RenderInline::updateAlwaysCreateLineBoxes):
+ (WebCore::RenderInline::paintOutline):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupClipPath):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::paintScrollbar):
+ (WebCore::itemOffsetForAlignment):
+ (WebCore::RenderListBox::paintItemForeground):
+ (WebCore::RenderListBox::paintItemBackground):
+ * rendering/RenderListMarker.cpp:
+ (WebCore::RenderListMarker::updateMargins):
+ (WebCore::RenderListMarker::lineHeight):
+ * rendering/RenderMarquee.cpp:
+ (WebCore::RenderMarquee::computePosition):
+ (WebCore::RenderMarquee::updateMarqueeStyle):
+ * rendering/RenderMenuList.cpp:
+ (WebCore::RenderMenuList::adjustInnerStyle):
+ (RenderMenuList::updateOptionsWidth):
+ (RenderMenuList::itemStyle):
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::isValidColumnSpanner):
+ * rendering/RenderMultiColumnSpannerPlaceholder.cpp:
+ (WebCore::RenderMultiColumnSpannerPlaceholder::createAnonymous):
+ * rendering/RenderMultiColumnSpannerPlaceholder.h:
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::checkRegionStyle):
+ (WebCore::RenderNamedFlowFragment::computeStyleInRegion):
+ * rendering/RenderNamedFlowFragment.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::innerLineHeight):
+ (WebCore::decorationColor):
+ (WebCore::RenderObject::getTextDecorationColorsAndStyles):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::minPreferredLogicalWidth):
+ (WebCore::RenderObject::maxPreferredLogicalWidth):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::computePreferredLogicalWidths):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::paintRowGroupBorderIfRequired):
+ (WebCore::physicalBorderForDirection):
+ * rendering/RenderText.h:
+ (WebCore::RenderText::characterAt):
+ (WebCore::RenderText::style):
+ (WebCore::RenderText::firstLineStyle):
+ (WebCore::RenderText::getCachedPseudoStyle):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::styleDidChange):
+ * rendering/RenderTextControlMultiLine.cpp:
+ (WebCore::RenderTextControlMultiLine::layoutSpecialExcludedChild):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::layout):
+ (WebCore::RenderTextControlSingleLine::styleDidChange):
+ * rendering/RenderTextFragment.cpp:
+ (WebCore::RenderTextFragment::styleDidChange):
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintMediaToggleClosedCaptionsButton):
+ (WebCore::borderRadiiFromStyle):
+ (WebCore::RenderThemeGtk::paintMediaSliderTrack):
+ (WebCore::RenderThemeGtk::paintMediaSliderThumb):
+ (WebCore::RenderThemeGtk::paintMediaVolumeSliderTrack):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+ (WebCore::SimpleLineLayout::hitTestFlow):
+ * rendering/TextAutoSizing.cpp:
+ (WebCore::TextAutoSizingKey::TextAutoSizingKey):
+ * rendering/TextAutoSizing.h:
+ (WebCore::TextAutoSizingKey::style):
+ (WebCore::TextAutoSizingKey::isDeleted):
+ * rendering/TextPaintStyle.cpp:
+ (WebCore::computeTextSelectionPaintStyle):
+ * rendering/line/BreakingContext.h:
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::layout):
+ * rendering/style/RenderStyle.h:
+ (WebCore::RenderStyle::setColumnRuleWidth):
+ (WebCore::RenderStyle::resetColumnRule):
+ (WebCore::RenderStyle::setColumnSpan):
+ (WebCore::RenderStyle::inheritColumnPropertiesFrom):
+ (WebCore::RenderStyle::setTransform):
+ (WebCore::RenderStyle::setTransformOriginX):
+ (WebCore::RenderStyle::setTransformOriginY):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::positionForOffset):
+ (WebCore::SVGInlineTextBox::selectionRectForTextFragment):
+ (WebCore::SVGInlineTextBox::localSelectionRect):
+ (WebCore::SVGInlineTextBox::paintSelectionBackground):
+ (WebCore::SVGInlineTextBox::paint):
+ (WebCore::SVGInlineTextBox::acquirePaintingResource):
+ (WebCore::SVGInlineTextBox::releasePaintingResource):
+ (WebCore::SVGInlineTextBox::prepareGraphicsContextForTextPainting):
+ (WebCore::SVGInlineTextBox::restoreGraphicsContextAfterTextPainting):
+ (WebCore::SVGInlineTextBox::constructTextRun):
+ (WebCore::SVGInlineTextBox::paintDecorationWithStyle):
+ (WebCore::SVGInlineTextBox::paintTextWithShadows):
+ (WebCore::SVGInlineTextBox::paintText):
+ * rendering/svg/SVGInlineTextBox.h:
+ * rendering/svg/SVGPathData.cpp:
+ (WebCore::updatePathFromCircleElement):
+ (WebCore::updatePathFromEllipseElement):
+ (WebCore::updatePathFromRectElement):
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::TreeResolver::Parent::Parent):
+ (WebCore::Style::TreeResolver::popScope):
+ (WebCore::Style::TreeResolver::styleForElement):
+ (WebCore::Style::TreeResolver::pushParent):
+ (WebCore::Style::TreeResolver::resolveComposedTree):
+ * style/StyleTreeResolver.h:
+ (WebCore::Style::TreeResolver::scope):
+ * style/StyleUpdate.cpp:
+ (WebCore::Style::Update::textUpdate):
+ (WebCore::Style::Update::elementStyle):
+ (WebCore::Style::Update::addElement):
+ * style/StyleUpdate.h:
+ (WebCore::Style::Update::document):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::synchronizeSystemLanguage):
+ (WebCore::SVGElement::resolveCustomStyle):
+ (WebCore::SVGElement::setUseOverrideComputedStyle):
+ (WebCore::SVGElement::computedStyle):
+ * svg/SVGElement.h:
+ * svg/SVGElementRareData.h:
+ (WebCore::SVGElementRareData::ensureAnimatedSMILStyleProperties):
+ (WebCore::SVGElementRareData::overrideComputedStyle):
+ * svg/SVGGraphicsElement.cpp:
+ (WebCore::SVGGraphicsElement::animatedLocalTransform):
+ * svg/SVGLengthContext.cpp:
+ (WebCore::SVGLengthContext::convertValueFromPercentageToUserUnits):
+ (WebCore::renderStyleForLengthResolving):
+ (WebCore::SVGLengthContext::convertValueFromUserUnitsToEMS):
+ (WebCore::SVGLengthContext::convertValueFromEMSToUserUnits):
+ (WebCore::SVGLengthContext::convertValueFromUserUnitsToEXS):
+ (WebCore::SVGLengthContext::convertValueFromEXSToUserUnits):
+ * svg/SVGStopElement.cpp:
+ (WebCore::SVGStopElement::stopColorIncludingOpacity):
+ * svg/SVGTextElement.cpp:
+ (WebCore::SVGTextElement::animatedLocalTransform):
+
</ins><span class="cx"> 2016-04-26 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Make FontPlatformData immutable
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = visiblePos.deepEquivalent().deprecatedNode()->renderer();
</span><span class="cx"> RenderObject* startRenderer = renderer;
</span><del>- RenderStyle* style = &renderer->style();
</del><ins>+ auto* style = &renderer->style();
</ins><span class="cx">
</span><span class="cx"> // traverse backward by renderer to look for style change
</span><span class="cx"> for (RenderObject* r = renderer->previousInPreOrder(); r; r = r->previousInPreOrder()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer = object->renderer();
</span><del>- RenderStyle* style = &renderer->style();
</del><ins>+ auto* style = &renderer->style();
</ins><span class="cx">
</span><span class="cx"> AtkAttributeSet* result = nullptr;
</span><span class="cx"> GUniquePtr<gchar> buffer(g_strdup_printf("%i", style->fontSize()));
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1990,7 +1990,7 @@
</span><span class="cx">
</span><span class="cx"> static void AXAttributeStringSetStyle(NSMutableAttributedString* attrString, RenderObject* renderer, NSRange range)
</span><span class="cx"> {
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx">
</span><span class="cx"> // set basic font info
</span><span class="cx"> AXAttributeStringSetFont(attrString, style.fontCascade().primaryFont().getCTFont(), range);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOM.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return emptyQuad();
</span><span class="cx">
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx"> IntRect boundingBox = renderer->absoluteBoundingBoxRect(true /* use transforms*/);
</span><span class="cx">
</span><span class="cx"> boundingBox.move(style.borderLeftWidth(), style.borderTopWidth());
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> - (float)computedFontSize
</span><span class="cx"> {
</span><span class="cx"> WebCore::Node *node = core(self);
</span><del>- RenderStyle *style = node->renderStyle();
</del><ins>+ auto *style = node->renderStyle();
</ins><span class="cx"> if (!style)
</span><span class="cx"> return 0.0f;
</span><span class="cx"> return style->fontDescription().computedSize();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> return positionList;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValue> positionOffsetValue(RenderStyle& style, CSSPropertyID propertyID)
</del><ins>+static RefPtr<CSSValue> positionOffsetValue(const RenderStyle& style, CSSPropertyID propertyID)
</ins><span class="cx"> {
</span><span class="cx"> Length length;
</span><span class="cx"> switch (propertyID) {
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSPrimitiveValue> ComputedStyleExtractor::currentColorOrValidColor(RenderStyle* style, const Color& color) const
</del><ins>+RefPtr<CSSPrimitiveValue> ComputedStyleExtractor::currentColorOrValidColor(const RenderStyle* style, const Color& color) const
</ins><span class="cx"> {
</span><span class="cx"> // This function does NOT look at visited information, so that computed style doesn't expose that.
</span><span class="cx"> if (!color.isValid())
</span><span class="lines">@@ -1143,7 +1143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><del>-static Ref<CSSValueList> scrollSnapDestination(RenderStyle& style, const LengthSize& destination)
</del><ins>+static Ref<CSSValueList> scrollSnapDestination(const RenderStyle& style, const LengthSize& destination)
</ins><span class="cx"> {
</span><span class="cx"> auto list = CSSValueList::createSpaceSeparated();
</span><span class="cx"> list.get().append(zoomAdjustedPixelValueForLength(destination.width(), style));
</span><span class="lines">@@ -1151,7 +1151,7 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSValue> scrollSnapPoints(RenderStyle& style, const ScrollSnapPoints* points)
</del><ins>+static Ref<CSSValue> scrollSnapPoints(const RenderStyle& style, const ScrollSnapPoints* points)
</ins><span class="cx"> {
</span><span class="cx"> if (!points)
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
</span><span class="lines">@@ -1166,7 +1166,7 @@
</span><span class="cx"> return WTFMove(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSValue> scrollSnapCoordinates(RenderStyle& style, const Vector<LengthSize>& coordinates)
</del><ins>+static Ref<CSSValue> scrollSnapCoordinates(const RenderStyle& style, const Vector<LengthSize>& coordinates)
</ins><span class="cx"> {
</span><span class="cx"> if (coordinates.isEmpty())
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
</span><span class="lines">@@ -1807,7 +1807,7 @@
</span><span class="cx"> LOG_ERROR("WebKit does not yet implement getComputedStyle for '%s'.", getPropertyName(propertyID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSValueList> fontFamilyFromStyle(RenderStyle* style)
</del><ins>+static Ref<CSSValueList> fontFamilyFromStyle(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> auto list = CSSValueList::createCommaSeparated();
</span><span class="cx"> for (unsigned i = 0; i < style->fontCascade().familyCount(); ++i)
</span><span class="lines">@@ -1815,7 +1815,7 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> lineHeightFromStyle(RenderStyle& style)
</del><ins>+static Ref<CSSPrimitiveValue> lineHeightFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> Length length = style.lineHeight();
</span><span class="cx"> if (length.isNegative()) // If true, line-height not set; use the font's line spacing.
</span><span class="lines">@@ -1830,19 +1830,19 @@
</span><span class="cx"> return zoomAdjustedPixelValue(floatValueForLength(length, 0), style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontSizeFromStyle(RenderStyle& style)
</del><ins>+static Ref<CSSPrimitiveValue> fontSizeFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontStyleFromStyle(RenderStyle* style)
</del><ins>+static Ref<CSSPrimitiveValue> fontStyleFromStyle(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> if (style->fontDescription().italic())
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueItalic);
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSValue> fontVariantFromStyle(RenderStyle* style)
</del><ins>+static Ref<CSSValue> fontVariantFromStyle(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> if (style->fontDescription().variantSettings().isAllNormal())
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
</span><span class="lines">@@ -2029,7 +2029,7 @@
</span><span class="cx"> return WTFMove(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontWeightFromStyle(RenderStyle* style)
</del><ins>+static Ref<CSSPrimitiveValue> fontWeightFromStyle(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> switch (style->fontDescription().weight()) {
</span><span class="cx"> case FontWeight100:
</span><span class="lines">@@ -2055,7 +2055,7 @@
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSValue> fontSynthesisFromStyle(RenderStyle& style)
</del><ins>+static Ref<CSSValue> fontSynthesisFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> if (style.fontDescription().fontSynthesis() == FontSynthesisNone)
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
</span><span class="lines">@@ -2072,7 +2072,7 @@
</span><span class="cx"> typedef LayoutUnit (RenderBoxModelObject::*RenderBoxComputedCSSValueGetter)() const;
</span><span class="cx">
</span><span class="cx"> template<RenderStyleLengthGetter lengthGetter, RenderBoxComputedCSSValueGetter computedCSSValueGetter>
</span><del>-inline RefPtr<CSSValue> zoomAdjustedPaddingOrMarginPixelValue(RenderStyle& style, RenderObject* renderer)
</del><ins>+inline RefPtr<CSSValue> zoomAdjustedPaddingOrMarginPixelValue(const RenderStyle& style, RenderObject* renderer)
</ins><span class="cx"> {
</span><span class="cx"> Length unzoomzedLength = (style.*lengthGetter)();
</span><span class="cx"> if (!is<RenderBox>(renderer) || unzoomzedLength.isFixed())
</span><span class="lines">@@ -2081,7 +2081,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<RenderStyleLengthGetter lengthGetter>
</span><del>-inline bool paddingOrMarginIsRendererDependent(RenderStyle* style, RenderObject* renderer)
</del><ins>+inline bool paddingOrMarginIsRendererDependent(const RenderStyle* style, RenderObject* renderer)
</ins><span class="cx"> {
</span><span class="cx"> if (!renderer || !renderer->isBox())
</span><span class="cx"> return false;
</span><span class="lines">@@ -2139,7 +2139,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static bool isLayoutDependent(CSSPropertyID propertyID, RenderStyle* style, RenderObject* renderer)
</del><ins>+static bool isLayoutDependent(CSSPropertyID propertyID, const RenderStyle* style, RenderObject* renderer)
</ins><span class="cx"> {
</span><span class="cx"> switch (propertyID) {
</span><span class="cx"> case CSSPropertyWidth:
</span><span class="lines">@@ -2267,7 +2267,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RenderStyle* computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID, std::unique_ptr<RenderStyle>& ownedStyle)
</del><ins>+static inline const RenderStyle* computeRenderStyleForProperty(Node* styledNode, PseudoId pseudoElementSpecifier, CSSPropertyID propertyID, std::unique_ptr<RenderStyle>& ownedStyle)
</ins><span class="cx"> {
</span><span class="cx"> RenderObject* renderer = styledNode->renderer();
</span><span class="cx">
</span><span class="lines">@@ -2373,7 +2373,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<RenderStyle> ownedStyle;
</span><del>- RenderStyle* style = nullptr;
</del><ins>+ const RenderStyle* style = nullptr;
</ins><span class="cx"> RenderObject* renderer = nullptr;
</span><span class="cx"> bool forceFullLayout = false;
</span><span class="cx"> if (updateLayout) {
</span><span class="lines">@@ -3861,7 +3861,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- RenderStyle* style = node->computedStyle(m_pseudoElementSpecifier);
</del><ins>+ auto* style = node->computedStyle(m_pseudoElementSpecifier);
</ins><span class="cx"> if (!style)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -3880,7 +3880,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><del>- RenderStyle* style = node->computedStyle(m_pseudoElementSpecifier);
</del><ins>+ auto* style = node->computedStyle(m_pseudoElementSpecifier);
</ins><span class="cx"> if (!style)
</span><span class="cx"> return emptyString();
</span><span class="cx">
</span><span class="lines">@@ -3899,7 +3899,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (propertyID == CSSPropertyFontSize && is<CSSPrimitiveValue>(*value) && m_node) {
</span><span class="cx"> m_node->document().updateLayoutIgnorePendingStylesheets();
</span><del>- if (RenderStyle* style = m_node->computedStyle(m_pseudoElementSpecifier)) {
</del><ins>+ if (auto* style = m_node->computedStyle(m_pseudoElementSpecifier)) {
</ins><span class="cx"> if (CSSValueID sizeIdentifier = style->fontDescription().keywordSizeAsIdentifier()) {
</span><span class="cx"> auto& primitiveValue = downcast<CSSPrimitiveValue>(*value);
</span><span class="cx"> if (primitiveValue.isValueID() && primitiveValue.getValueID() == sizeIdentifier)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> Node* styledNode() const;
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> svgPropertyValue(CSSPropertyID, EUpdateLayout) const;
</span><del>- RefPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint>, RenderStyle*) const;
</del><ins>+ RefPtr<SVGPaint> adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint>, const RenderStyle*) const;
</ins><span class="cx">
</span><span class="cx"> static Ref<CSSValue> valueForShadow(const ShadowData*, CSSPropertyID, const RenderStyle&, AdjustPixelValuesForComputedStyle = AdjustPixelValues);
</span><del>- RefPtr<CSSPrimitiveValue> currentColorOrValidColor(RenderStyle*, const Color&) const;
</del><ins>+ RefPtr<CSSPrimitiveValue> currentColorOrValidColor(const RenderStyle*, const Color&) const;
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> getCSSPropertyValuesForShorthandProperties(const StylePropertyShorthand&) const;
</span><span class="cx"> RefPtr<CSSValueList> getCSSPropertyValuesForSidesShorthand(const StylePropertyShorthand&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToLengthConversionDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToLengthConversionData.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToLengthConversionData.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSToLengthConversionData.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> double CSSToLengthConversionData::viewportWidthFactor() const
</span><span class="cx"> {
</span><span class="cx"> if (m_style && !m_computingFontSize)
</span><del>- m_style->setHasViewportUnits();
</del><ins>+ const_cast<RenderStyle*>(m_style)->setHasViewportUnits();
</ins><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> double CSSToLengthConversionData::viewportHeightFactor() const
</span><span class="cx"> {
</span><span class="cx"> if (m_style && !m_computingFontSize)
</span><del>- m_style->setHasViewportUnits();
</del><ins>+ const_cast<RenderStyle*>(m_style)->setHasViewportUnits();
</ins><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> double CSSToLengthConversionData::viewportMinFactor() const
</span><span class="cx"> {
</span><span class="cx"> if (m_style && !m_computingFontSize)
</span><del>- m_style->setHasViewportUnits();
</del><ins>+ const_cast<RenderStyle*>(m_style)->setHasViewportUnits();
</ins><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><span class="cx"> return 0;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> double CSSToLengthConversionData::viewportMaxFactor() const
</span><span class="cx"> {
</span><span class="cx"> if (m_style && !m_computingFontSize)
</span><del>- m_style->setHasViewportUnits();
</del><ins>+ const_cast<RenderStyle*>(m_style)->setHasViewportUnits();
</ins><span class="cx">
</span><span class="cx"> if (!m_renderView)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToLengthConversionDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToLengthConversionData.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToLengthConversionData.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSToLengthConversionData.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class CSSToLengthConversionData {
</span><span class="cx"> public:
</span><del>- CSSToLengthConversionData(RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, float zoom, bool computingFontSize = false)
</del><ins>+ CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, float zoom, bool computingFontSize = false)
</ins><span class="cx"> : m_style(style)
</span><span class="cx"> , m_rootStyle(rootStyle)
</span><span class="cx"> , m_renderView(renderView)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> ASSERT(zoom > 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CSSToLengthConversionData(RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSize = false)
</del><ins>+ CSSToLengthConversionData(const RenderStyle* style, const RenderStyle* rootStyle, const RenderView* renderView, bool computingFontSize = false)
</ins><span class="cx"> : m_style(style)
</span><span class="cx"> , m_rootStyle(rootStyle)
</span><span class="cx"> , m_renderView(renderView)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderStyle* style() const { return m_style; }
</del><ins>+ const RenderStyle* style() const { return m_style; }
</ins><span class="cx"> const RenderStyle* rootStyle() const { return m_rootStyle; }
</span><span class="cx"> float zoom() const;
</span><span class="cx"> bool computingFontSize() const { return m_computingFontSize; }
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RenderStyle* m_style;
</del><ins>+ const RenderStyle* m_style;
</ins><span class="cx"> const RenderStyle* m_rootStyle;
</span><span class="cx"> const RenderView* m_renderView;
</span><span class="cx"> float m_zoom;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToStyleMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToStyleMap.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> return m_resolver->style();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* CSSToStyleMap::rootElementStyle() const
</del><ins>+const RenderStyle* CSSToStyleMap::rootElementStyle() const
</ins><span class="cx"> {
</span><span class="cx"> return m_resolver->rootElementStyle();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToStyleMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToStyleMap.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSToStyleMap.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/CSSToStyleMap.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> // similar to how PaintInfo/LayoutState cache values needed for
</span><span class="cx"> // the current paint/layout.
</span><span class="cx"> RenderStyle* style() const;
</span><del>- RenderStyle* rootElementStyle() const;
</del><ins>+ const RenderStyle* rootElementStyle() const;
</ins><span class="cx"> bool useSVGZoomRules() const;
</span><span class="cx">
</span><span class="cx"> // FIXME: This should be part of some sort of StyleImageCache object which
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -85,10 +85,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-MediaQueryEvaluator::MediaQueryEvaluator(const String& acceptedMediaType, Frame* frame, RenderStyle* style)
</del><ins>+MediaQueryEvaluator::MediaQueryEvaluator(const String& acceptedMediaType, Frame* frame, const RenderStyle* style)
</ins><span class="cx"> : m_mediaType(acceptedMediaType)
</span><span class="cx"> , m_frame(frame)
</span><del>- , m_style(WTFMove(style))
</del><ins>+ , m_style(style)
</ins><span class="cx"> , m_expResult(false) // doesn't matter when we have m_frame and m_style
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> /** Creates evaluator which evaluates full media queries
</span><span class="cx"> */
</span><del>- MediaQueryEvaluator(const String& acceptedMediaType, Frame*, RenderStyle*);
</del><ins>+ MediaQueryEvaluator(const String& acceptedMediaType, Frame*, const RenderStyle*);
</ins><span class="cx">
</span><span class="cx"> ~MediaQueryEvaluator();
</span><span class="cx">
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> private:
</span><span class="cx"> String m_mediaType;
</span><span class="cx"> Frame* m_frame { nullptr }; // not owned
</span><del>- RenderStyle* m_style { nullptr };
</del><ins>+ const RenderStyle* m_style { nullptr };
</ins><span class="cx"> bool m_expResult;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/SVGCSSComputedStyleDeclaration.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SVGPaint> ComputedStyleExtractor::adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint> newPaint, RenderStyle* style) const
</del><ins>+RefPtr<SVGPaint> ComputedStyleExtractor::adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint> newPaint, const RenderStyle* style) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SVGPaint> paint = newPaint;
</span><span class="cx"> if (paint->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR || paint->paintType() == SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> if (updateLayout)
</span><span class="cx"> node->document().updateLayout();
</span><span class="cx">
</span><del>- RenderStyle* style = node->computedStyle();
</del><ins>+ auto* style = node->computedStyle();
</ins><span class="cx"> if (!style)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssSourceSizeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SourceSizeList.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SourceSizeList.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/SourceSizeList.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool match(std::unique_ptr<MediaQueryExp>&& expression, RenderStyle& style, Frame* frame)
</del><ins>+static bool match(std::unique_ptr<MediaQueryExp>&& expression, const RenderStyle& style, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> if (expression->mediaFeature().isEmpty())
</span><span class="cx"> return true;
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> return mediaQueryEvaluator.eval(mediaQuerySet.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float defaultLength(RenderStyle& style, RenderView* view)
</del><ins>+static float defaultLength(const RenderStyle& style, RenderView* view)
</ins><span class="cx"> {
</span><span class="cx"> return clampTo<float>(CSSPrimitiveValue::computeNonCalcLengthDouble(CSSToLengthConversionData(&style, &style, view), CSSPrimitiveValue::CSS_VW, 100.0));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static float computeLength(CSSValue* value, RenderStyle& style, RenderView* view)
</del><ins>+static float computeLength(CSSValue* value, const RenderStyle& style, RenderView* view)
</ins><span class="cx"> {
</span><span class="cx"> CSSToLengthConversionData conversionData(&style, &style, view);
</span><span class="cx"> if (is<CSSPrimitiveValue>(value)) {
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!view)
</span><span class="cx"> return 0;
</span><del>- RenderStyle& style = view->style();
</del><ins>+ auto& style = view->style();
</ins><span class="cx"> for (auto& sourceSize : CSSParser(CSSStrictMode).parseSizesAttribute(sizesAttribute)) {
</span><span class="cx"> if (match(WTFMove(sourceSize.expression), style, frame))
</span><span class="cx"> return computeLength(sourceSize.length.get(), style, view);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static const NinePieceImage& getValue(RenderStyle* style)
</del><ins>+ static const NinePieceImage& getValue(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> return type == BorderImage ? style->borderImage() : style->maskBoxImage();
</span><span class="cx"> }
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyInheritClip(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><del>- RenderStyle* parentStyle = styleResolver.parentStyle();
</del><ins>+ auto* parentStyle = styleResolver.parentStyle();
</ins><span class="cx"> if (!parentStyle->hasClip())
</span><span class="cx"> return applyInitialClip(styleResolver);
</span><span class="cx"> styleResolver.style()->setClip(parentStyle->clipTop(), parentStyle->clipRight(), parentStyle->clipBottom(), parentStyle->clipLeft());
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx"> inline void StyleBuilderCustom::applyInheritCounter(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><span class="cx"> CounterDirectiveMap& map = styleResolver.style()->accessCounterDirectives();
</span><del>- for (auto& keyValue : styleResolver.parentStyle()->accessCounterDirectives()) {
</del><ins>+ for (auto& keyValue : const_cast<RenderStyle*>(styleResolver.parentStyle())->accessCounterDirectives()) {
</ins><span class="cx"> CounterDirectives& directives = map.add(keyValue.key, CounterDirectives()).iterator->value;
</span><span class="cx"> if (counterBehavior == Reset)
</span><span class="cx"> directives.inheritReset(keyValue.value);
</span><span class="lines">@@ -1337,7 +1337,7 @@
</span><span class="cx"> if (styleResolver.style()->styleType() == NOPSEUDO)
</span><span class="cx"> styleResolver.style()->setUnique();
</span><span class="cx"> else
</span><del>- styleResolver.parentStyle()->setUnique();
</del><ins>+ const_cast<RenderStyle*>(styleResolver.parentStyle())->setUnique();
</ins><span class="cx"> QualifiedName attr(nullAtom, contentValue.getStringValue().impl(), nullAtom);
</span><span class="cx"> const AtomicString& value = styleResolver.element()->getAttribute(attr);
</span><span class="cx"> styleResolver.style()->setContent(value.isNull() ? emptyAtom : value.impl(), didSet);
</span><span class="lines">@@ -1706,7 +1706,7 @@
</span><span class="cx"> if (styleResolver.style()->styleType() == NOPSEUDO)
</span><span class="cx"> styleResolver.style()->setUnique();
</span><span class="cx"> else
</span><del>- styleResolver.parentStyle()->setUnique();
</del><ins>+ const_cast<RenderStyle*>(styleResolver.parentStyle())->setUnique();
</ins><span class="cx">
</span><span class="cx"> QualifiedName attr(nullAtom, primitiveValue.getStringValue(), nullAtom);
</span><span class="cx"> const AtomicString& value = styleResolver.element()->getAttribute(attr);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> m_matchedPropertiesCacheAdditionsSinceLastSweep = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StyleResolver::State::State(const Element& element, RenderStyle* parentStyle, RenderStyle* documentElementStyle, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)
</del><ins>+StyleResolver::State::State(const Element& element, const RenderStyle* parentStyle, const RenderStyle* documentElementStyle, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)
</ins><span class="cx"> : m_element(&element)
</span><span class="cx"> , m_parentStyle(parentStyle)
</span><span class="cx"> , m_regionForStyling(regionForStyling)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> return parentNode && parentNode->isShadowRoot();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ElementStyle StyleResolver::styleForElement(const Element& element, RenderStyle* parentStyle, RuleMatchingBehavior matchingBehavior, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)
</del><ins>+ElementStyle StyleResolver::styleForElement(const Element& element, const RenderStyle* parentStyle, RuleMatchingBehavior matchingBehavior, const RenderRegion* regionForStyling, const SelectorFilter* selectorFilter)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!m_inLoadPendingImages);
</span><span class="cx">
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> StyleResolver::pseudoStyleForElement(const Element& element, const PseudoStyleRequest& pseudoStyleRequest, RenderStyle& parentStyle)
</del><ins>+std::unique_ptr<RenderStyle> StyleResolver::pseudoStyleForElement(const Element& element, const PseudoStyleRequest& pseudoStyleRequest, const RenderStyle& parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> m_state = State(element, &parentStyle);
</span><span class="cx">
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id))
</span><del>- state.parentStyle()->setHasExplicitlyInheritedProperties();
</del><ins>+ const_cast<RenderStyle*>(state.parentStyle())->setHasExplicitlyInheritedProperties();
</ins><span class="cx">
</span><span class="cx"> if (id == CSSPropertyCustom) {
</span><span class="cx"> CSSCustomPropertyValue* customProperty = &downcast<CSSCustomPropertyValue>(*valueToApply);
</span><span class="lines">@@ -1734,7 +1734,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void StyleResolver::checkForZoomChange(RenderStyle* style, RenderStyle* parentStyle)
</del><ins>+void StyleResolver::checkForZoomChange(RenderStyle* style, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (!parentStyle)
</span><span class="cx"> return;
</span><span class="lines">@@ -1748,7 +1748,7 @@
</span><span class="cx"> style->setFontDescription(newFontDescription);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyleResolver::checkForGenericFamilyChange(RenderStyle* style, RenderStyle* parentStyle)
</del><ins>+void StyleResolver::checkForGenericFamilyChange(RenderStyle* style, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> const auto& childFont = style->fontDescription();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -141,18 +141,18 @@
</span><span class="cx"> StyleResolver(Document&);
</span><span class="cx"> ~StyleResolver();
</span><span class="cx">
</span><del>- ElementStyle styleForElement(const Element&, RenderStyle* parentStyle, RuleMatchingBehavior = MatchAllRules, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);
</del><ins>+ ElementStyle styleForElement(const Element&, const RenderStyle* parentStyle, RuleMatchingBehavior = MatchAllRules, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);
</ins><span class="cx">
</span><span class="cx"> void keyframeStylesForAnimation(const Element&, const RenderStyle*, KeyframeList&);
</span><span class="cx">
</span><del>- std::unique_ptr<RenderStyle> pseudoStyleForElement(const Element&, const PseudoStyleRequest&, RenderStyle& parentStyle);
</del><ins>+ std::unique_ptr<RenderStyle> pseudoStyleForElement(const Element&, const PseudoStyleRequest&, const RenderStyle& parentStyle);
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<RenderStyle> styleForPage(int pageIndex);
</span><span class="cx"> std::unique_ptr<RenderStyle> defaultStyleForElement();
</span><span class="cx">
</span><span class="cx"> RenderStyle* style() const { return m_state.style(); }
</span><del>- RenderStyle* parentStyle() const { return m_state.parentStyle(); }
- RenderStyle* rootElementStyle() const { return m_state.rootElementStyle(); }
</del><ins>+ const RenderStyle* parentStyle() const { return m_state.parentStyle(); }
+ const RenderStyle* rootElementStyle() const { return m_state.rootElementStyle(); }
</ins><span class="cx"> const Element* element() { return m_state.element(); }
</span><span class="cx"> Document& document() { return m_document; }
</span><span class="cx"> Settings* documentSettings() { return m_document.settings(); }
</span><span class="lines">@@ -317,8 +317,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
</span><del>- void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
- void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
</del><ins>+ void checkForGenericFamilyChange(RenderStyle*, const RenderStyle* parentStyle);
+ void checkForZoomChange(RenderStyle*, const RenderStyle* parentStyle);
</ins><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> void checkForTextSizeAdjust(RenderStyle*);
</span><span class="cx"> #endif
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> class State {
</span><span class="cx"> public:
</span><span class="cx"> State() { }
</span><del>- State(const Element&, RenderStyle* parentStyle, RenderStyle* documentElementStyle = nullptr, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);
</del><ins>+ State(const Element&, const RenderStyle* parentStyle, const RenderStyle* documentElementStyle = nullptr, const RenderRegion* regionForStyling = nullptr, const SelectorFilter* = nullptr);
</ins><span class="cx">
</span><span class="cx"> public:
</span><span class="cx"> void clear();
</span><span class="lines">@@ -374,8 +374,8 @@
</span><span class="cx"> std::unique_ptr<RenderStyle> takeStyle() { return WTFMove(m_style); }
</span><span class="cx">
</span><span class="cx"> void setParentStyle(std::unique_ptr<RenderStyle>);
</span><del>- RenderStyle* parentStyle() const { return m_parentStyle; }
- RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
</del><ins>+ const RenderStyle* parentStyle() const { return m_parentStyle; }
+ const RenderStyle* rootElementStyle() const { return m_rootElementStyle; }
</ins><span class="cx">
</span><span class="cx"> const RenderRegion* regionForStyling() const { return m_regionForStyling; }
</span><span class="cx"> EInsideLink elementLinkState() const { return m_elementLinkState; }
</span><span class="lines">@@ -427,9 +427,9 @@
</span><span class="cx">
</span><span class="cx"> const Element* m_element { nullptr };
</span><span class="cx"> std::unique_ptr<RenderStyle> m_style;
</span><del>- RenderStyle* m_parentStyle { nullptr };
</del><ins>+ const RenderStyle* m_parentStyle { nullptr };
</ins><span class="cx"> std::unique_ptr<RenderStyle> m_ownedParentStyle;
</span><del>- RenderStyle* m_rootElementStyle { nullptr };
</del><ins>+ const RenderStyle* m_rootElementStyle { nullptr };
</ins><span class="cx">
</span><span class="cx"> const RenderRegion* m_regionForStyling { nullptr };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -2004,7 +2004,7 @@
</span><span class="cx"> m_ignorePendingStylesheets = oldIgnore;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> Document::styleForElementIgnoringPendingStylesheets(Element& element, RenderStyle* parentStyle)
</del><ins>+std::unique_ptr<RenderStyle> Document::styleForElementIgnoringPendingStylesheets(Element& element, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(&element.document() == this);
</span><span class="cx">
</span><span class="lines">@@ -2511,7 +2511,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_visuallyOrdered = true;
</span><span class="cx"> if (renderView())
</span><del>- renderView()->style().setRTLOrdering(VisualOrder);
</del><ins>+ renderView()->mutableStyle().setRTLOrdering(VisualOrder);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<DocumentParser> Document::createParser()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Document.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> };
</span><span class="cx"> WEBCORE_EXPORT void updateLayoutIgnorePendingStylesheets(RunPostLayoutTasks = RunPostLayoutTasks::Asynchronously);
</span><span class="cx">
</span><del>- std::unique_ptr<RenderStyle> styleForElementIgnoringPendingStylesheets(Element&, RenderStyle* parentStyle);
</del><ins>+ std::unique_ptr<RenderStyle> styleForElementIgnoringPendingStylesheets(Element&, const RenderStyle* parentStyle);
</ins><span class="cx">
</span><span class="cx"> // Returns true if page box (margin boxes and page borders) is visible.
</span><span class="cx"> WEBCORE_EXPORT bool isPageBoxVisible(int pageIndex);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> return document().ensureStyleResolver();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ElementStyle Element::resolveStyle(RenderStyle* parentStyle)
</del><ins>+ElementStyle Element::resolveStyle(const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> return styleResolver().styleForElement(*this, parentStyle);
</span><span class="cx"> }
</span><span class="lines">@@ -1758,7 +1758,7 @@
</span><span class="cx"> static void checkForEmptyStyleChange(Element& element)
</span><span class="cx"> {
</span><span class="cx"> if (element.styleAffectedByEmpty()) {
</span><del>- RenderStyle* style = element.renderStyle();
</del><ins>+ auto* style = element.renderStyle();
</ins><span class="cx"> if (!style || (!style->emptyState() || element.hasChildNodes()))
</span><span class="cx"> element.setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -1784,14 +1784,14 @@
</span><span class="cx">
</span><span class="cx"> // This is the insert/append case.
</span><span class="cx"> if (newFirstElement != elementAfterChange) {
</span><del>- RenderStyle* style = elementAfterChange->renderStyle();
</del><ins>+ auto* style = elementAfterChange->renderStyle();
</ins><span class="cx"> if (!style || style->firstChildState())
</span><span class="cx"> elementAfterChange->setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We also have to handle node removal.
</span><span class="cx"> if (checkType == SiblingElementRemoved && newFirstElement == elementAfterChange && newFirstElement) {
</span><del>- RenderStyle* style = newFirstElement->renderStyle();
</del><ins>+ auto* style = newFirstElement->renderStyle();
</ins><span class="cx"> if (!style || !style->firstChildState())
</span><span class="cx"> newFirstElement->setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -1804,7 +1804,7 @@
</span><span class="cx"> Element* newLastElement = ElementTraversal::lastChild(parent);
</span><span class="cx">
</span><span class="cx"> if (newLastElement != elementBeforeChange) {
</span><del>- RenderStyle* style = elementBeforeChange->renderStyle();
</del><ins>+ auto* style = elementBeforeChange->renderStyle();
</ins><span class="cx"> if (!style || style->lastChildState())
</span><span class="cx"> elementBeforeChange->setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -1812,7 +1812,7 @@
</span><span class="cx"> // We also have to handle node removal. The parser callback case is similar to node removal as well in that we need to change the last child
</span><span class="cx"> // to match now.
</span><span class="cx"> if ((checkType == SiblingElementRemoved || checkType == FinishedParsingChildren) && newLastElement == elementBeforeChange && newLastElement) {
</span><del>- RenderStyle* style = newLastElement->renderStyle();
</del><ins>+ auto* style = newLastElement->renderStyle();
</ins><span class="cx"> if (!style || !style->lastChildState())
</span><span class="cx"> newLastElement->setNeedsStyleRecalc();
</span><span class="cx"> }
</span><span class="lines">@@ -2459,7 +2459,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* Element::existingComputedStyle()
</del><ins>+const RenderStyle* Element::existingComputedStyle()
</ins><span class="cx"> {
</span><span class="cx"> if (auto* renderTreeStyle = renderStyle())
</span><span class="cx"> return renderTreeStyle;
</span><span class="lines">@@ -2470,13 +2470,13 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle& Element::resolveComputedStyle()
</del><ins>+const RenderStyle& Element::resolveComputedStyle()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(inDocument());
</span><span class="cx"> ASSERT(!existingComputedStyle());
</span><span class="cx">
</span><span class="cx"> Deque<Element*, 32> elementsRequiringComputedStyle({ this });
</span><del>- RenderStyle* computedStyle = nullptr;
</del><ins>+ const RenderStyle* computedStyle = nullptr;
</ins><span class="cx">
</span><span class="cx"> // Collect ancestors until we find one that has style.
</span><span class="cx"> auto composedAncestors = composedTreeAncestors(*this);
</span><span class="lines">@@ -2499,7 +2499,7 @@
</span><span class="cx"> return *computedStyle;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* Element::computedStyle(PseudoId pseudoElementSpecifier)
</del><ins>+const RenderStyle* Element::computedStyle(PseudoId pseudoElementSpecifier)
</ins><span class="cx"> {
</span><span class="cx"> if (PseudoElement* pseudoElement = beforeOrAfterPseudoElement(*this, pseudoElementSpecifier))
</span><span class="cx"> return pseudoElement->computedStyle();
</span><span class="lines">@@ -3293,7 +3293,7 @@
</span><span class="cx"> ASSERT(hasCustomStyleResolveCallbacks());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> Element::resolveCustomStyle(RenderStyle&, RenderStyle*)
</del><ins>+Optional<ElementStyle> Element::resolveCustomStyle(const RenderStyle&, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasCustomStyleResolveCallbacks());
</span><span class="cx"> return Nullopt;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Element.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> void setTabIndex(int);
</span><span class="cx"> virtual Element* focusDelegate();
</span><span class="cx">
</span><del>- RenderStyle* computedStyle(PseudoId = NOPSEUDO) override;
</del><ins>+ const RenderStyle* computedStyle(PseudoId = NOPSEUDO) override;
</ins><span class="cx">
</span><span class="cx"> bool needsStyleInvalidation() const;
</span><span class="cx">
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> virtual void didAttachRenderers();
</span><span class="cx"> virtual void willDetachRenderers();
</span><span class="cx"> virtual void didDetachRenderers();
</span><del>- virtual Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle);
</del><ins>+ virtual Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle);
</ins><span class="cx">
</span><span class="cx"> LayoutRect absoluteEventHandlerBounds(bool& includesFixedPositionElements) override;
</span><span class="cx">
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> StyleResolver& styleResolver();
</span><del>- ElementStyle resolveStyle(RenderStyle* parentStyle);
</del><ins>+ ElementStyle resolveStyle(const RenderStyle* parentStyle);
</ins><span class="cx">
</span><span class="cx"> bool hasDisplayContents() const;
</span><span class="cx"> void setHasDisplayContents(bool);
</span><span class="lines">@@ -592,8 +592,8 @@
</span><span class="cx">
</span><span class="cx"> void removeShadowRoot();
</span><span class="cx">
</span><del>- RenderStyle* existingComputedStyle();
- RenderStyle& resolveComputedStyle();
</del><ins>+ const RenderStyle* existingComputedStyle();
+ const RenderStyle& resolveComputedStyle();
</ins><span class="cx">
</span><span class="cx"> bool rareDataStyleAffectedByEmpty() const;
</span><span class="cx"> bool rareDataChildrenAffectedByHover() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Node.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -659,7 +659,7 @@
</span><span class="cx"> // would fire in the middle of Document::setFocusedElement().
</span><span class="cx">
</span><span class="cx"> for (const Node* node = &startNode; node; node = node->parentNode()) {
</span><del>- RenderStyle* style = node->isDocumentNode() ? node->renderStyle() : const_cast<Node*>(node)->computedStyle();
</del><ins>+ auto* style = node->isDocumentNode() ? node->renderStyle() : const_cast<Node*>(node)->computedStyle();
</ins><span class="cx"> if (!style)
</span><span class="cx"> continue;
</span><span class="cx"> if (style->display() == NONE)
</span><span class="lines">@@ -1006,7 +1006,7 @@
</span><span class="cx"> return lastChild();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* Node::computedStyle(PseudoId pseudoElementSpecifier)
</del><ins>+const RenderStyle* Node::computedStyle(PseudoId pseudoElementSpecifier)
</ins><span class="cx"> {
</span><span class="cx"> auto* composedParent = composedTreeAncestors(*this).first();
</span><span class="cx"> if (!composedParent)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/Node.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -443,9 +443,9 @@
</span><span class="cx"> RenderBoxModelObject* renderBoxModelObject() const;
</span><span class="cx">
</span><span class="cx"> // Wrapper for nodes that don't have a renderer, but still cache the style (like HTMLOptionElement).
</span><del>- RenderStyle* renderStyle() const;
</del><ins>+ const RenderStyle* renderStyle() const;
</ins><span class="cx">
</span><del>- virtual RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO);
</del><ins>+ virtual const RenderStyle* computedStyle(PseudoId pseudoElementSpecifier = NOPSEUDO);
</ins><span class="cx">
</span><span class="cx"> // -----------------------------------------------------------------------------
</span><span class="cx"> // Notification of document structure changes (see ContainerNode.h for more notification methods)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeRenderStyle.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeRenderStyle.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/NodeRenderStyle.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-inline RenderStyle* Node::renderStyle() const
</del><ins>+inline const RenderStyle* Node::renderStyle() const
</ins><span class="cx"> {
</span><span class="cx"> auto* renderer = this->renderer();
</span><span class="cx"> if (!renderer)
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> m_hostElement = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> PseudoElement::resolveCustomStyle(RenderStyle& parentStyle, RenderStyle*)
</del><ins>+Optional<ElementStyle> PseudoElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> auto* style = m_hostElement->renderer()->getCachedPseudoStyle(m_pseudoId, &parentStyle);
</span><span class="cx"> if (!style)
</span></span></pre></div>
<a id="trunkSourceWebCoredomPseudoElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/PseudoElement.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/PseudoElement.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/dom/PseudoElement.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> Element* hostElement() const { return m_hostElement; }
</span><span class="cx"> void clearHostElement();
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> void didAttachRenderers() override;
</span><span class="cx"> void didRecalcStyle(Style::Change) override;
</span><span class="cx"> bool rendererIsNeeded(const RenderStyle&) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyBlockElementCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -179,18 +179,18 @@
</span><span class="cx"> return textAtPosition[0] == '\n';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* ApplyBlockElementCommand::renderStyleOfEnclosingTextNode(const Position& position)
</del><ins>+const RenderStyle* ApplyBlockElementCommand::renderStyleOfEnclosingTextNode(const Position& position)
</ins><span class="cx"> {
</span><span class="cx"> if (position.anchorType() != Position::PositionIsOffsetInAnchor
</span><span class="cx"> || !position.containerNode()
</span><span class="cx"> || !position.containerNode()->isTextNode())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> document().updateStyleIfNeeded();
</span><span class="cx">
</span><span class="cx"> RenderObject* renderer = position.containerNode()->renderer();
</span><span class="cx"> if (!renderer)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return &renderer->style();
</span><span class="cx"> }
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> end = endOfCurrentParagraph.deepEquivalent();
</span><span class="cx">
</span><span class="cx"> bool isStartAndEndOnSameNode = false;
</span><del>- if (RenderStyle* startStyle = renderStyleOfEnclosingTextNode(start)) {
</del><ins>+ if (auto* startStyle = renderStyleOfEnclosingTextNode(start)) {
</ins><span class="cx"> isStartAndEndOnSameNode = renderStyleOfEnclosingTextNode(end) && start.containerNode() == end.containerNode();
</span><span class="cx"> bool isStartAndEndOfLastParagraphOnSameNode = renderStyleOfEnclosingTextNode(m_endOfLastParagraph) && start.containerNode() == m_endOfLastParagraph.containerNode();
</span><span class="cx">
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RenderStyle* endStyle = renderStyleOfEnclosingTextNode(end)) {
</del><ins>+ if (auto* endStyle = renderStyleOfEnclosingTextNode(end)) {
</ins><span class="cx"> bool isEndAndEndOfLastParagraphOnSameNode = renderStyleOfEnclosingTextNode(m_endOfLastParagraph) && end.deprecatedNode() == m_endOfLastParagraph.deprecatedNode();
</span><span class="cx"> // Include \n at the end of line if we're at an empty paragraph
</span><span class="cx"> if (endStyle->preserveNewline() && start == end && end.offsetInContainerNode() < end.containerNode()->maxCharacterOffset()) {
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> {
</span><span class="cx"> VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagraph.next());
</span><span class="cx"> Position position = endOfNextParagraph.deepEquivalent();
</span><del>- RenderStyle* style = renderStyleOfEnclosingTextNode(position);
</del><ins>+ auto* style = renderStyleOfEnclosingTextNode(position);
</ins><span class="cx"> if (!style)
</span><span class="cx"> return endOfNextParagraph;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyBlockElementCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyBlockElementCommand.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyBlockElementCommand.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/ApplyBlockElementCommand.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void doApply() override;
</span><span class="cx"> virtual void formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtr<Element>&) = 0;
</span><del>- RenderStyle* renderStyleOfEnclosingTextNode(const Position&);
</del><ins>+ const RenderStyle* renderStyleOfEnclosingTextNode(const Position&);
</ins><span class="cx"> void rangeForParagraphSplittingTextNodesIfNeeded(const VisiblePosition&, Position&, Position&);
</span><span class="cx"> VisiblePosition endOfNextParagraphSplittingTextNodesIfNeeded(VisiblePosition&, Position&, Position&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (node && node->computedStyle()) {
</span><del>- RenderStyle* renderStyle = node->computedStyle();
</del><ins>+ auto* renderStyle = node->computedStyle();
</ins><span class="cx"> removeTextFillAndStrokeColorsIfNeeded(renderStyle);
</span><span class="cx"> if (renderStyle->fontDescription().keywordSize())
</span><span class="cx"> m_mutableStyle->setProperty(CSSPropertyFontSize, computedStyleAtPosition.getFontSizeCSSValuePreferringKeyword()->cssText());
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> extractFontSizeDelta();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EditingStyle::removeTextFillAndStrokeColorsIfNeeded(RenderStyle* renderStyle)
</del><ins>+void EditingStyle::removeTextFillAndStrokeColorsIfNeeded(const RenderStyle* renderStyle)
</ins><span class="cx"> {
</span><span class="cx"> // If a node's text fill color is invalid, then its children use
</span><span class="cx"> // their font-color as their text fill color (they don't
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/EditingStyle.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> EditingStyle(CSSPropertyID, const String& value);
</span><span class="cx"> EditingStyle(CSSPropertyID, CSSValueID);
</span><span class="cx"> void init(Node*, PropertiesToInclude);
</span><del>- void removeTextFillAndStrokeColorsIfNeeded(RenderStyle*);
</del><ins>+ void removeTextFillAndStrokeColorsIfNeeded(const RenderStyle*);
</ins><span class="cx"> void setProperty(CSSPropertyID, const String& value, bool important = false);
</span><span class="cx"> void extractFontSizeDelta();
</span><span class="cx"> template<typename T> TriState triStateOfStyle(T& styleToCompare, ShouldIgnoreTextOnlyProperties) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/Editor.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -430,8 +430,8 @@
</span><span class="cx"> RefPtr<DocumentFragment> webContentFromPasteboard(Pasteboard&, Range& context, bool allowPlainText, bool& chosePlainText);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- WEBCORE_EXPORT static RenderStyle* styleForSelectionStart(Frame* , Node *&nodeToRemove);
- void getTextDecorationAttributesRespectingTypingStyle(RenderStyle&, NSMutableDictionary*) const;
</del><ins>+ WEBCORE_EXPORT static const RenderStyle* styleForSelectionStart(Frame* , Node *&nodeToRemove);
+ void getTextDecorationAttributesRespectingTypingStyle(const RenderStyle&, NSMutableDictionary*) const;
</ins><span class="cx"> WEBCORE_EXPORT const Font* fontForSelection(bool&) const;
</span><span class="cx"> WEBCORE_EXPORT NSDictionary *fontAttributesForSelectionStart() const;
</span><span class="cx"> WEBCORE_EXPORT String stringSelectionForPasteboard();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingSimplifyMarkupCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/SimplifyMarkupCommand.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> Node* startingNode = node->parentNode();
</span><del>- RenderStyle* startingStyle = startingNode->renderStyle();
</del><ins>+ auto* startingStyle = startingNode->renderStyle();
</ins><span class="cx"> if (!startingStyle)
</span><span class="cx"> continue;
</span><span class="cx"> Node* currentNode = startingNode;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // FIXME: This figures out the current style by inserting a <span>!
</span><del>-RenderStyle* Editor::styleForSelectionStart(Frame* frame, Node *&nodeToRemove)
</del><ins>+const RenderStyle* Editor::styleForSelectionStart(Frame* frame, Node *&nodeToRemove)
</ins><span class="cx"> {
</span><span class="cx"> nodeToRemove = nullptr;
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> return styleElement->renderer() ? &styleElement->renderer()->style() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Editor::getTextDecorationAttributesRespectingTypingStyle(RenderStyle& style, NSMutableDictionary* result) const
</del><ins>+void Editor::getTextDecorationAttributesRespectingTypingStyle(const RenderStyle& style, NSMutableDictionary* result) const
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<EditingStyle> typingStyle = m_frame.selection().typingStyle();
</span><span class="cx"> if (typingStyle && typingStyle->style()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_frame.selection().isRange()) {
</span><span class="cx"> Node* nodeToRemove;
</span><del>- RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
</del><ins>+ auto* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
</ins><span class="cx">
</span><span class="cx"> const Font* result = nullptr;
</span><span class="cx"> if (style) {
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> NSDictionary* Editor::fontAttributesForSelectionStart() const
</span><span class="cx"> {
</span><span class="cx"> Node* nodeToRemove;
</span><del>- RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove);
</del><ins>+ auto* style = styleForSelectionStart(&m_frame, nodeToRemove);
</ins><span class="cx"> if (!style)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_frame.selection().isRange()) {
</span><span class="cx"> Node* nodeToRemove;
</span><del>- RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
</del><ins>+ auto* style = styleForSelectionStart(&m_frame, nodeToRemove); // sets nodeToRemove
</ins><span class="cx">
</span><span class="cx"> const Font* result = nullptr;
</span><span class="cx"> if (style) {
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> NSDictionary* Editor::fontAttributesForSelectionStart() const
</span><span class="cx"> {
</span><span class="cx"> Node* nodeToRemove;
</span><del>- RenderStyle* style = styleForSelectionStart(&m_frame, nodeToRemove);
</del><ins>+ auto* style = styleForSelectionStart(&m_frame, nodeToRemove);
</ins><span class="cx"> if (!style)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTitleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTitleElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/HTMLTitleElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> StringWithDirection HTMLTitleElement::computedTextWithDirection()
</span><span class="cx"> {
</span><span class="cx"> TextDirection direction = LTR;
</span><del>- if (RenderStyle* computedStyle = this->computedStyle())
</del><ins>+ if (auto* computedStyle = this->computedStyle())
</ins><span class="cx"> direction = computedStyle->direction();
</span><span class="cx"> else {
</span><span class="cx"> auto style = styleResolver().styleForElement(*this, parentElement() ? parentElement()->renderStyle() : nullptr).renderStyle;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> update(selector);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void CanvasRenderingContext2D::FontProxy::initialize(FontSelector& fontSelector, RenderStyle& newStyle)
</del><ins>+inline void CanvasRenderingContext2D::FontProxy::initialize(FontSelector& fontSelector, const RenderStyle& newStyle)
</ins><span class="cx"> {
</span><span class="cx"> // Beware! m_font.fontSelector() might not point to document.fontSelector()!
</span><span class="cx"> ASSERT(newStyle.fontCascade().fontSelector() == &fontSelector);
</span><span class="lines">@@ -2196,7 +2196,7 @@
</span><span class="cx"> Document& document = canvas()->document();
</span><span class="cx"> document.updateStyleIfNeeded();
</span><span class="cx">
</span><del>- if (RenderStyle* computedStyle = canvas()->computedStyle())
</del><ins>+ if (auto* computedStyle = canvas()->computedStyle())
</ins><span class="cx"> newStyle->setFontDescription(computedStyle->fontDescription());
</span><span class="cx"> else {
</span><span class="cx"> FontCascadeDescription defaultFontDescription;
</span><span class="lines">@@ -2259,9 +2259,9 @@
</span><span class="cx"> modifiableState().textBaseline = baseline;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline TextDirection CanvasRenderingContext2D::toTextDirection(Direction direction, RenderStyle** computedStyle) const
</del><ins>+inline TextDirection CanvasRenderingContext2D::toTextDirection(Direction direction, const RenderStyle** computedStyle) const
</ins><span class="cx"> {
</span><del>- RenderStyle* style = (computedStyle || direction == Direction::Inherit) ? canvas()->computedStyle() : nullptr;
</del><ins>+ auto* style = (computedStyle || direction == Direction::Inherit) ? canvas()->computedStyle() : nullptr;
</ins><span class="cx"> if (computedStyle)
</span><span class="cx"> *computedStyle = style;
</span><span class="cx"> switch (direction) {
</span><span class="lines">@@ -2384,7 +2384,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Need to turn off font smoothing.
</span><span class="cx">
</span><del>- RenderStyle* computedStyle;
</del><ins>+ const RenderStyle* computedStyle;
</ins><span class="cx"> TextDirection direction = toTextDirection(state().direction, &computedStyle);
</span><span class="cx"> bool isRTL = direction == RTL;
</span><span class="cx"> bool override = computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> FontProxy& operator=(const FontProxy&);
</span><span class="cx">
</span><span class="cx"> bool realized() const { return m_font.fontSelector(); }
</span><del>- void initialize(FontSelector&, RenderStyle&);
</del><ins>+ void initialize(FontSelector&, const RenderStyle&);
</ins><span class="cx"> FontMetrics fontMetrics() const;
</span><span class="cx"> const FontCascadeDescription& fontDescription() const;
</span><span class="cx"> float width(const TextRun&) const;
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> bool isAccelerated() const override;
</span><span class="cx">
</span><span class="cx"> bool hasInvertibleTransform() const override { return state().hasInvertibleTransform; }
</span><del>- TextDirection toTextDirection(Direction, RenderStyle** computedStyle = nullptr) const;
</del><ins>+ TextDirection toTextDirection(Direction, const RenderStyle** computedStyle = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(ACCELERATED_2D_CANVAS)
</span><span class="cx"> PlatformLayer* platformLayer() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLResourcePreloadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> preload(WTFMove(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool mediaAttributeMatches(Frame* frame, RenderStyle* renderStyle, const String& attributeValue)
</del><ins>+static bool mediaAttributeMatches(Frame* frame, const RenderStyle* renderStyle, const String& attributeValue)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<MediaQuerySet> mediaQueries = MediaQuerySet::createAllowingDescriptionSyntax(attributeValue);
</span><span class="cx"> MediaQueryEvaluator mediaQueryEvaluator("screen", frame, renderStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -83,21 +83,21 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSliderThumb::updateAppearance(RenderStyle* parentStyle)
</del><ins>+void RenderSliderThumb::updateAppearance(const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (parentStyle->appearance() == SliderVerticalPart)
</span><del>- style().setAppearance(SliderThumbVerticalPart);
</del><ins>+ mutableStyle().setAppearance(SliderThumbVerticalPart);
</ins><span class="cx"> else if (parentStyle->appearance() == SliderHorizontalPart)
</span><del>- style().setAppearance(SliderThumbHorizontalPart);
</del><ins>+ mutableStyle().setAppearance(SliderThumbHorizontalPart);
</ins><span class="cx"> else if (parentStyle->appearance() == MediaSliderPart)
</span><del>- style().setAppearance(MediaSliderThumbPart);
</del><ins>+ mutableStyle().setAppearance(MediaSliderThumbPart);
</ins><span class="cx"> else if (parentStyle->appearance() == MediaVolumeSliderPart)
</span><del>- style().setAppearance(MediaVolumeSliderThumbPart);
</del><ins>+ mutableStyle().setAppearance(MediaVolumeSliderThumbPart);
</ins><span class="cx"> else if (parentStyle->appearance() == MediaFullScreenVolumeSliderPart)
</span><del>- style().setAppearance(MediaFullScreenVolumeSliderThumbPart);
</del><ins>+ mutableStyle().setAppearance(MediaFullScreenVolumeSliderThumbPart);
</ins><span class="cx"> if (style().hasAppearance()) {
</span><span class="cx"> ASSERT(element());
</span><del>- theme().adjustSliderThumbSize(style(), element());
</del><ins>+ theme().adjustSliderThumbSize(mutableStyle(), element());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -159,13 +159,13 @@
</span><span class="cx"> ASSERT(element()->shadowHost());
</span><span class="cx"> auto& input = downcast<HTMLInputElement>(*element()->shadowHost());
</span><span class="cx"> bool isVertical = hasVerticalAppearance(input);
</span><del>- style().setFlexDirection(isVertical ? FlowColumn : FlowRow);
</del><ins>+ mutableStyle().setFlexDirection(isVertical ? FlowColumn : FlowRow);
</ins><span class="cx"> TextDirection oldTextDirection = style().direction();
</span><span class="cx"> if (isVertical) {
</span><span class="cx"> // FIXME: Work around rounding issues in RTL vertical sliders. We want them to
</span><span class="cx"> // render identically to LTR vertical sliders. We can remove this work around when
</span><span class="cx"> // subpixel rendering is enabled on all ports.
</span><del>- style().setDirection(LTR);
</del><ins>+ mutableStyle().setDirection(LTR);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox* thumb = input.sliderThumbElement() ? input.sliderThumbElement()->renderBox() : nullptr;
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> RenderFlexibleBox::layout();
</span><span class="cx">
</span><del>- style().setDirection(oldTextDirection);
</del><ins>+ mutableStyle().setDirection(oldTextDirection);
</ins><span class="cx"> // These should always exist, unless someone mutates the shadow DOM (e.g., in the inspector).
</span><span class="cx"> if (!thumb || !track)
</span><span class="cx"> return;
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx"> return downcast<HTMLInputElement>(shadowHost());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SliderThumbElement::resolveCustomStyle(RenderStyle&, RenderStyle* hostStyle)
</del><ins>+Optional<ElementStyle> SliderThumbElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</ins><span class="cx"> {
</span><span class="cx"> // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known.
</span><span class="cx">
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> return createRenderer<RenderSliderContainer>(*this, WTFMove(style));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SliderContainerElement::resolveCustomStyle(RenderStyle&, RenderStyle* hostStyle)
</del><ins>+Optional<ElementStyle> SliderContainerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* hostStyle)
</ins><span class="cx"> {
</span><span class="cx"> // This doesn't actually compute style. This is just a hack to pick shadow pseudo id when host style is known.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSliderThumbElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SliderThumbElement.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/shadow/SliderThumbElement.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> void willDetachRenderers() override;
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle&, RenderStyle*) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</ins><span class="cx"> const AtomicString& shadowPseudoId() const override;
</span><span class="cx">
</span><span class="cx"> void startDragging();
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> class RenderSliderThumb final : public RenderBlockFlow {
</span><span class="cx"> public:
</span><span class="cx"> RenderSliderThumb(SliderThumbElement&, RenderStyle&&);
</span><del>- void updateAppearance(RenderStyle* parentStyle);
</del><ins>+ void updateAppearance(const RenderStyle* parentStyle);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isSliderThumb() const override;
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> private:
</span><span class="cx"> SliderContainerElement(Document&);
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle&, RenderStyle*) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle&, const RenderStyle*) override;
</ins><span class="cx"> const AtomicString& shadowPseudoId() const override;
</span><span class="cx">
</span><span class="cx"> AtomicString m_shadowPseudoId;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> return adoptRef(*new TextControlInnerElement(document));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlInnerElement::resolveCustomStyle(RenderStyle&, RenderStyle* shadowHostStyle)
</del><ins>+Optional<ElementStyle> TextControlInnerElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto innerContainerStyle = RenderStyle::createPtr();
</span><span class="cx"> innerContainerStyle->inheritFrom(shadowHostStyle);
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> return downcast<RenderTextControlInnerBlock>(HTMLDivElement::renderer());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlInnerTextElement::resolveCustomStyle(RenderStyle&, RenderStyle* shadowHostStyle)
</del><ins>+Optional<ElementStyle> TextControlInnerTextElement::resolveCustomStyle(const RenderStyle&, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto style = downcast<HTMLTextFormControlElement>(*shadowHost()).createInnerTextStyle(*shadowHostStyle);
</span><span class="cx"> return ElementStyle(std::make_unique<RenderStyle>(WTFMove(style)));
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> setHasCustomStyleResolveCallbacks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> TextControlPlaceholderElement::resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle)
</del><ins>+Optional<ElementStyle> TextControlPlaceholderElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto style = resolveStyle(&parentStyle);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowTextControlInnerElementsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> TextControlInnerElement(Document&);
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isMouseFocusable() const override { return false; }
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> private:
</span><span class="cx"> TextControlInnerTextElement(Document&);
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> bool isMouseFocusable() const override { return false; }
</span><span class="cx"> bool isTextControlInnerTextElement() const override { return true; }
</span><span class="cx"> };
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> private:
</span><span class="cx"> TextControlPlaceholderElement(Document&);
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SearchFieldResultsButtonElement final : public HTMLDivElement {
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1381,7 +1381,7 @@
</span><span class="cx"> return NoCursorChange;
</span><span class="cx">
</span><span class="cx"> auto renderer = node->renderer();
</span><del>- RenderStyle* style = renderer ? &renderer->style() : nullptr;
</del><ins>+ auto* style = renderer ? &renderer->style() : nullptr;
</ins><span class="cx"> bool horizontalText = !style || style->isHorizontalWritingMode();
</span><span class="cx"> const Cursor& iBeam = horizontalText ? iBeamCursor() : verticalTextCursor();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -70,10 +70,10 @@
</span><span class="cx"> return floor(numSteps * t) / numSteps;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AnimationBase::AnimationBase(Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation)
</del><ins>+AnimationBase::AnimationBase(const Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation)
</ins><span class="cx"> : m_object(renderer)
</span><span class="cx"> , m_compositeAnimation(compositeAnimation)
</span><del>- , m_animation(animation)
</del><ins>+ , m_animation(const_cast<Animation&>(animation))
</ins><span class="cx"> {
</span><span class="cx"> // Compute the total duration
</span><span class="cx"> if (m_animation->iterationCount() > 0)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/AnimationBase.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> friend class CSSPropertyAnimation;
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- AnimationBase(Animation& transition, RenderElement*, CompositeAnimation*);
</del><ins>+ AnimationBase(const Animation& transition, RenderElement*, CompositeAnimation*);
</ins><span class="cx"> virtual ~AnimationBase() { }
</span><span class="cx">
</span><span class="cx"> RenderElement* renderer() const { return m_object; }
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> double progress(double scale = 1, double offset = 0, const TimingFunction* = nullptr) const;
</span><span class="cx">
</span><span class="cx"> // Returns true if the animation state changed.
</span><del>- virtual bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* /*currentStyle*/, RenderStyle* /*targetStyle*/, std::unique_ptr<RenderStyle>& /*animatedStyle*/) = 0;
</del><ins>+ virtual bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* /*currentStyle*/, const RenderStyle* /*targetStyle*/, std::unique_ptr<RenderStyle>& /*animatedStyle*/) = 0;
</ins><span class="cx"> virtual void getAnimatedStyle(std::unique_ptr<RenderStyle>& /*animatedStyle*/) = 0;
</span><span class="cx">
</span><span class="cx"> virtual bool computeExtentOfTransformAnimation(LayoutRect&) const = 0;
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> bool animationsMatch(const Animation&) const;
</span><span class="cx">
</span><span class="cx"> const Animation& animation() const { return m_animation; }
</span><del>- void setAnimation(Animation& animation) { m_animation = animation; }
</del><ins>+ void setAnimation(const Animation& animation) { m_animation = const_cast<Animation&>(animation); }
</ins><span class="cx">
</span><span class="cx"> // Return true if this animation is overridden. This will only be the case for
</span><span class="cx"> // ImplicitAnimations and is used to determine whether or not we should force
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/AnimationController.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -593,9 +593,9 @@
</span><span class="cx"> element->setNeedsStyleRecalc(SyntheticStyleChange);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AnimationController::updateAnimations(RenderElement& renderer, RenderStyle& newStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</del><ins>+bool AnimationController::updateAnimations(RenderElement& renderer, const RenderStyle& newStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</ins><span class="cx"> {
</span><del>- RenderStyle* oldStyle = renderer.hasInitializedStyle() ? &renderer.style() : nullptr;
</del><ins>+ auto* oldStyle = renderer.hasInitializedStyle() ? &renderer.style() : nullptr;
</ins><span class="cx"> if ((!oldStyle || (!oldStyle->animations() && !oldStyle->transitions())) && (!newStyle.animations() && !newStyle.transitions()))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationController.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationController.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/AnimationController.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> ~AnimationController();
</span><span class="cx">
</span><span class="cx"> void cancelAnimations(RenderElement&);
</span><del>- bool updateAnimations(RenderElement&, RenderStyle& newStyle, std::unique_ptr<RenderStyle>& animatedStyle);
</del><ins>+ bool updateAnimations(RenderElement&, const RenderStyle& newStyle, std::unique_ptr<RenderStyle>& animatedStyle);
</ins><span class="cx"> std::unique_ptr<RenderStyle> getAnimatedStyleForRenderer(RenderElement&);
</span><span class="cx">
</span><span class="cx"> // If possible, compute the visual extent of any transform animation on the given renderer
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCompositeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CompositeAnimation.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/CompositeAnimation.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositeAnimation::updateTransitions(RenderElement* renderer, RenderStyle* currentStyle, RenderStyle* targetStyle)
</del><ins>+void CompositeAnimation::updateTransitions(RenderElement* renderer, const RenderStyle* currentStyle, const RenderStyle* targetStyle)
</ins><span class="cx"> {
</span><span class="cx"> // If currentStyle is null or there are no old or new transitions, just skip it
</span><span class="cx"> if (!currentStyle || (!targetStyle->transitions() && m_transitions.isEmpty()))
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> // Check to see if we need to update the active transitions
</span><span class="cx"> if (targetStyle->transitions()) {
</span><span class="cx"> for (size_t i = 0; i < targetStyle->transitions()->size(); ++i) {
</span><del>- Animation& animation = targetStyle->transitions()->animation(i);
</del><ins>+ auto& animation = targetStyle->transitions()->animation(i);
</ins><span class="cx"> bool isActiveTransition = !m_suspended && (animation.duration() || animation.delay() > 0);
</span><span class="cx">
</span><span class="cx"> Animation::AnimationMode mode = animation.animationMode();
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> // and we have to use the unanimatedStyle from the animation. We do the test
</span><span class="cx"> // against the unanimated style here, but we "override" the transition later.
</span><span class="cx"> RefPtr<KeyframeAnimation> keyframeAnim = getAnimationForProperty(prop);
</span><del>- RenderStyle* fromStyle = keyframeAnim ? keyframeAnim->unanimatedStyle() : currentStyle;
</del><ins>+ auto* fromStyle = keyframeAnim ? keyframeAnim->unanimatedStyle() : currentStyle;
</ins><span class="cx">
</span><span class="cx"> // See if there is a current transition for this prop
</span><span class="cx"> ImplicitAnimation* implAnim = m_transitions.get(prop);
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> m_transitions.remove(propertyToRemove);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CompositeAnimation::updateKeyframeAnimations(RenderElement* renderer, RenderStyle* currentStyle, RenderStyle* targetStyle)
</del><ins>+void CompositeAnimation::updateKeyframeAnimations(RenderElement* renderer, const RenderStyle* currentStyle, const RenderStyle* targetStyle)
</ins><span class="cx"> {
</span><span class="cx"> // Nothing to do if we don't have any animations, and didn't have any before
</span><span class="cx"> if (m_keyframeAnimations.isEmpty() && !targetStyle->hasAnimations())
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> if (targetStyle->animations()) {
</span><span class="cx"> int numAnims = targetStyle->animations()->size();
</span><span class="cx"> for (int i = 0; i < numAnims; ++i) {
</span><del>- Animation& animation = targetStyle->animations()->animation(i);
</del><ins>+ auto& animation = targetStyle->animations()->animation(i);
</ins><span class="cx"> AtomicString animationName(animation.name());
</span><span class="cx">
</span><span class="cx"> if (!animation.isValidAnimation())
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> std::swap(newAnimations, m_keyframeAnimations);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CompositeAnimation::animate(RenderElement& renderer, RenderStyle* currentStyle, RenderStyle& targetStyle, std::unique_ptr<RenderStyle>& blendedStyle)
</del><ins>+bool CompositeAnimation::animate(RenderElement& renderer, const RenderStyle* currentStyle, const RenderStyle& targetStyle, std::unique_ptr<RenderStyle>& blendedStyle)
</ins><span class="cx"> {
</span><span class="cx"> // We don't do any transitions if we don't have a currentStyle (on startup).
</span><span class="cx"> updateTransitions(&renderer, currentStyle, &targetStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCompositeAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CompositeAnimation.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CompositeAnimation.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/CompositeAnimation.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> void clearRenderer();
</span><span class="cx">
</span><del>- bool animate(RenderElement&, RenderStyle* currentStyle, RenderStyle& targetStyle, std::unique_ptr<RenderStyle>& blendedStyle);
</del><ins>+ bool animate(RenderElement&, const RenderStyle* currentStyle, const RenderStyle& targetStyle, std::unique_ptr<RenderStyle>& blendedStyle);
</ins><span class="cx"> std::unique_ptr<RenderStyle> getAnimatedStyle() const;
</span><span class="cx"> bool computeExtentOfTransformAnimation(LayoutRect&) const;
</span><span class="cx">
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> private:
</span><span class="cx"> CompositeAnimation(AnimationControllerPrivate&);
</span><span class="cx">
</span><del>- void updateTransitions(RenderElement*, RenderStyle* currentStyle, RenderStyle* targetStyle);
- void updateKeyframeAnimations(RenderElement*, RenderStyle* currentStyle, RenderStyle* targetStyle);
</del><ins>+ void updateTransitions(RenderElement*, const RenderStyle* currentStyle, const RenderStyle* targetStyle);
+ void updateKeyframeAnimations(RenderElement*, const RenderStyle* currentStyle, const RenderStyle* targetStyle);
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<int, RefPtr<ImplicitAnimation>> CSSPropertyTransitionsMap;
</span><span class="cx"> typedef HashMap<AtomicStringImpl*, RefPtr<KeyframeAnimation>> AnimationNameMap;
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ImplicitAnimation::ImplicitAnimation(Animation& transition, CSSPropertyID animatingProperty, RenderElement* renderer, CompositeAnimation* compAnim, RenderStyle* fromStyle)
</del><ins>+ImplicitAnimation::ImplicitAnimation(const Animation& transition, CSSPropertyID animatingProperty, RenderElement* renderer, CompositeAnimation* compAnim, const RenderStyle* fromStyle)
</ins><span class="cx"> : AnimationBase(transition, renderer, compAnim)
</span><span class="cx"> , m_fromStyle(RenderStyle::clonePtr(*fromStyle))
</span><span class="cx"> , m_transitionProperty(transition.property())
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> return m_object->document().hasListenerType(inListenerType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ImplicitAnimation::animate(CompositeAnimation*, RenderElement*, const RenderStyle*, RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</del><ins>+bool ImplicitAnimation::animate(CompositeAnimation*, RenderElement*, const RenderStyle*, const RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</ins><span class="cx"> {
</span><span class="cx"> // If we get this far and the animation is done, it means we are cleaning up a just finished animation.
</span><span class="cx"> // So just return. Everything is already all cleaned up.
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> return false; // Didn't dispatch an event
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ImplicitAnimation::reset(RenderStyle* to)
</del><ins>+void ImplicitAnimation::reset(const RenderStyle* to)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(to);
</span><span class="cx"> ASSERT(m_fromStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationImplicitAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/ImplicitAnimation.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/ImplicitAnimation.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/ImplicitAnimation.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> // for a single RenderElement.
</span><span class="cx"> class ImplicitAnimation : public AnimationBase {
</span><span class="cx"> public:
</span><del>- static Ref<ImplicitAnimation> create(Animation& animation, CSSPropertyID animatingProperty, RenderElement* renderer, CompositeAnimation* compositeAnimation, RenderStyle* fromStyle)
</del><ins>+ static Ref<ImplicitAnimation> create(const Animation& animation, CSSPropertyID animatingProperty, RenderElement* renderer, CompositeAnimation* compositeAnimation, const RenderStyle* fromStyle)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new ImplicitAnimation(animation, animatingProperty, renderer, compositeAnimation, fromStyle));
</span><span class="cx"> };
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> void pauseAnimation(double timeOffset) override;
</span><span class="cx"> void endAnimation() override;
</span><span class="cx">
</span><del>- bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* currentStyle, RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle) override;
</del><ins>+ bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* currentStyle, const RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle) override;
</ins><span class="cx"> void getAnimatedStyle(std::unique_ptr<RenderStyle>& animatedStyle) override;
</span><del>- virtual void reset(RenderStyle* to);
</del><ins>+ void reset(const RenderStyle* to);
</ins><span class="cx">
</span><span class="cx"> bool computeExtentOfTransformAnimation(LayoutRect&) const override;
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ImplicitAnimation(Animation&, CSSPropertyID, RenderElement*, CompositeAnimation*, RenderStyle*);
</del><ins>+ ImplicitAnimation(const Animation&, CSSPropertyID, RenderElement*, CompositeAnimation*, const RenderStyle*);
</ins><span class="cx"> virtual ~ImplicitAnimation();
</span><span class="cx">
</span><span class="cx"> // The two styles that we are blending.
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-KeyframeAnimation::KeyframeAnimation(Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation, RenderStyle* unanimatedStyle)
</del><ins>+KeyframeAnimation::KeyframeAnimation(const Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation, const RenderStyle* unanimatedStyle)
</ins><span class="cx"> : AnimationBase(animation, renderer, compositeAnimation)
</span><span class="cx"> , m_keyframes(animation.name())
</span><span class="cx"> , m_unanimatedStyle(RenderStyle::clonePtr(*unanimatedStyle))
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> prog = progress(scale, offset, prevKeyframe.timingFunction(name()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool KeyframeAnimation::animate(CompositeAnimation* compositeAnimation, RenderElement*, const RenderStyle*, RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</del><ins>+bool KeyframeAnimation::animate(CompositeAnimation* compositeAnimation, RenderElement*, const RenderStyle*, const RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle)
</ins><span class="cx"> {
</span><span class="cx"> // Fire the start timeout if needed
</span><span class="cx"> fireAnimationEventsIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> // A KeyframeAnimation tracks the state of an explicit animation for a single RenderElement.
</span><span class="cx"> class KeyframeAnimation final : public AnimationBase {
</span><span class="cx"> public:
</span><del>- static Ref<KeyframeAnimation> create(Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation, RenderStyle* unanimatedStyle)
</del><ins>+ static Ref<KeyframeAnimation> create(const Animation& animation, RenderElement* renderer, CompositeAnimation* compositeAnimation, const RenderStyle* unanimatedStyle)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new KeyframeAnimation(animation, renderer, compositeAnimation, unanimatedStyle));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* currentStyle, RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle) override;
</del><ins>+ bool animate(CompositeAnimation*, RenderElement*, const RenderStyle* currentStyle, const RenderStyle* targetStyle, std::unique_ptr<RenderStyle>& animatedStyle) override;
</ins><span class="cx"> void getAnimatedStyle(std::unique_ptr<RenderStyle>&) override;
</span><span class="cx">
</span><span class="cx"> bool computeExtentOfTransformAnimation(LayoutRect&) const override;
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- KeyframeAnimation(Animation&, RenderElement*, CompositeAnimation*, RenderStyle* unanimatedStyle);
</del><ins>+ KeyframeAnimation(const Animation&, RenderElement*, CompositeAnimation*, const RenderStyle* unanimatedStyle);
</ins><span class="cx"> virtual ~KeyframeAnimation();
</span><span class="cx">
</span><span class="cx"> // Get the styles for the given property surrounding the current animation time and the progress between them.
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx">
</span><span class="cx"> if (renderer->hasOverflowClip() &&
</span><span class="cx"> (style.overflowY() == OAUTO || style.overflowY() == OSCROLL || style.overflowY() == OOVERLAY ||
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFlowThreadControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FlowThreadController.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FlowThreadController.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/FlowThreadController.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> void FlowThreadController::styleDidChange()
</span><span class="cx"> {
</span><del>- RenderStyle& viewStyle = m_view->style();
</del><ins>+ auto& viewStyle = m_view->style();
</ins><span class="cx"> for (auto& flowRenderer : *m_renderNamedFlowThreadList)
</span><span class="cx"> flowRenderer->setStyle(RenderFlowThread::createFlowThreadStyle(&viewStyle));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1328,7 +1328,7 @@
</span><span class="cx"> static LayoutRect clipRectForNinePieceImageStrip(InlineFlowBox* box, const NinePieceImage& image, const LayoutRect& paintRect)
</span><span class="cx"> {
</span><span class="cx"> LayoutRect clipRect(paintRect);
</span><del>- RenderStyle& style = box->renderer().style();
</del><ins>+ auto& style = box->renderer().style();
</ins><span class="cx"> LayoutBoxExtent outsets = style.imageOutsets(image);
</span><span class="cx"> if (box->isHorizontal()) {
</span><span class="cx"> clipRect.setY(paintRect.y() - outsets.top());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span><span class="cx"> {
</span><del>- RenderStyle& newStyle = style();
</del><ins>+ auto& newStyle = style();
</ins><span class="cx">
</span><span class="cx"> bool hadTransform = hasTransform();
</span><span class="cx"> bool flowThreadContainingBlockInvalidated = false;
</span><span class="lines">@@ -2837,7 +2837,7 @@
</span><span class="cx"> return RenderBox::lineHeight(firstLine, direction, linePositionMode);
</span><span class="cx">
</span><span class="cx"> if (firstLine && view().usesFirstLineRules()) {
</span><del>- RenderStyle& s = firstLine ? firstLineStyle() : style();
</del><ins>+ auto& s = firstLine ? firstLineStyle() : style();
</ins><span class="cx"> if (&s != &style())
</span><span class="cx"> return s.computedLineHeight();
</span><span class="cx"> }
</span><span class="lines">@@ -2976,9 +2976,9 @@
</span><span class="cx"> return firstLineBlock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RenderStyle& styleForFirstLetter(RenderElement* firstLetterBlock, RenderObject* firstLetterContainer)
</del><ins>+static const RenderStyle& styleForFirstLetter(RenderElement* firstLetterBlock, RenderObject* firstLetterContainer)
</ins><span class="cx"> {
</span><del>- RenderStyle* pseudoStyle = firstLetterBlock->getCachedPseudoStyle(FIRST_LETTER, &firstLetterContainer->firstLineStyle());
</del><ins>+ auto* pseudoStyle = firstLetterBlock->getMutableCachedPseudoStyle(FIRST_LETTER, &firstLetterContainer->firstLineStyle());
</ins><span class="cx">
</span><span class="cx"> // If we have an initial letter drop that is >= 1, then we need to force floating to be on.
</span><span class="cx"> if (pseudoStyle->initialLetterDrop() >= 1 && !pseudoStyle->isFloating())
</span><span class="lines">@@ -3061,7 +3061,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetter = currentChild->parent();
</span><span class="cx"> RenderElement* firstLetterContainer = firstLetter->parent();
</span><del>- RenderStyle& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</del><ins>+ auto& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</ins><span class="cx"> ASSERT(firstLetter->isFloating() || firstLetter->isInline());
</span><span class="cx">
</span><span class="cx"> if (Style::determineChange(firstLetter->style(), pseudoStyle) == Style::Detach) {
</span><span class="lines">@@ -3102,7 +3102,7 @@
</span><span class="cx"> void RenderBlock::createFirstLetterRenderer(RenderElement* firstLetterBlock, RenderText* currentTextChild)
</span><span class="cx"> {
</span><span class="cx"> RenderElement* firstLetterContainer = currentTextChild->parent();
</span><del>- RenderStyle& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</del><ins>+ auto& pseudoStyle = styleForFirstLetter(firstLetterBlock, firstLetterContainer);
</ins><span class="cx"> RenderBoxModelObject* firstLetter = nullptr;
</span><span class="cx"> if (pseudoStyle.display() == INLINE)
</span><span class="cx"> firstLetter = new RenderInline(document(), RenderStyle::clone(pseudoStyle));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1615,7 +1615,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline LayoutUnit calculateMinimumPageHeight(RenderStyle& renderStyle, RootInlineBox& lastLine, LayoutUnit lineTop, LayoutUnit lineBottom)
</del><ins>+static inline LayoutUnit calculateMinimumPageHeight(const RenderStyle& renderStyle, RootInlineBox& lastLine, LayoutUnit lineTop, LayoutUnit lineBottom)
</ins><span class="cx"> {
</span><span class="cx"> // We may require a certain minimum number of lines per page in order to satisfy
</span><span class="cx"> // orphans and widows, and that may affect the minimum page height.
</span><span class="lines">@@ -3723,7 +3723,7 @@
</span><span class="cx"> for (RenderObject* descendent = traverseNext(this, isNonBlocksOrNonFixedHeightListItems); descendent; descendent = descendent->traverseNext(this, isNonBlocksOrNonFixedHeightListItems)) {
</span><span class="cx"> if (isVisibleRenderText(descendent) && resizeTextPermitted(descendent)) {
</span><span class="cx"> RenderText& text = downcast<RenderText>(*descendent);
</span><del>- RenderStyle& oldStyle = text.style();
</del><ins>+ auto& oldStyle = text.style();
</ins><span class="cx"> auto fontDescription = oldStyle.fontDescription();
</span><span class="cx"> float specifiedSize = fontDescription.specifiedSize();
</span><span class="cx"> float scaledSize = roundf(specifiedSize * scale);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> if (isDocElementRenderer || isBodyRenderer) {
</span><span class="cx"> // Propagate the new writing mode and direction up to the RenderView.
</span><span class="cx"> auto* documentElementRenderer = document().documentElement()->renderer();
</span><del>- RenderStyle& viewStyle = view().style();
</del><ins>+ auto& viewStyle = view().mutableStyle();
</ins><span class="cx"> bool viewChangedWritingMode = false;
</span><span class="cx"> bool rootStyleChanged = false;
</span><span class="cx"> bool viewStyleChanged = false;
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> viewStyle.setDirection(newStyle.direction());
</span><span class="cx"> viewStyleChanged = true;
</span><span class="cx"> if (isBodyRenderer) {
</span><del>- rootRenderer->style().setDirection(newStyle.direction());
</del><ins>+ rootRenderer->mutableStyle().setDirection(newStyle.direction());
</ins><span class="cx"> rootStyleChanged = true;
</span><span class="cx"> }
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> view().markAllDescendantsWithFloatsForLayout();
</span><span class="cx"> if (isBodyRenderer) {
</span><span class="cx"> rootStyleChanged = true;
</span><del>- rootRenderer->style().setWritingMode(newStyle.writingMode());
</del><ins>+ rootRenderer->mutableStyle().setWritingMode(newStyle.writingMode());
</ins><span class="cx"> rootRenderer->setHorizontalWritingMode(newStyle.isHorizontalWritingMode());
</span><span class="cx"> }
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="lines">@@ -432,8 +432,8 @@
</span><span class="cx"> // Propagate the body font back up to the RenderView and use it as
</span><span class="cx"> // the basis of the grid.
</span><span class="cx"> if (newStyle.fontDescription() != view().style().fontDescription()) {
</span><del>- view().style().setFontDescription(newStyle.fontDescription());
- view().style().fontCascade().update(&document().fontSelector());
</del><ins>+ view().mutableStyle().setFontDescription(newStyle.fontDescription());
+ view().mutableStyle().fontCascade().update(&document().fontSelector());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx">
</span><span class="cx"> RoundedRect::Radii RenderBox::borderRadii() const
</span><span class="cx"> {
</span><del>- RenderStyle& style = this->style();
</del><ins>+ auto& style = this->style();
</ins><span class="cx"> LayoutRect bounds = frameRect();
</span><span class="cx">
</span><span class="cx"> unsigned borderLeft = style.borderLeftWidth();
</span><span class="lines">@@ -4814,7 +4814,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect RenderBox::logicalVisualOverflowRectForPropagation(RenderStyle* parentStyle) const
</del><ins>+LayoutRect RenderBox::logicalVisualOverflowRectForPropagation(const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> LayoutRect rect = visualOverflowRectForPropagation(parentStyle);
</span><span class="cx"> if (!parentStyle->isHorizontalWritingMode())
</span><span class="lines">@@ -4822,7 +4822,7 @@
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect RenderBox::visualOverflowRectForPropagation(RenderStyle* parentStyle) const
</del><ins>+LayoutRect RenderBox::visualOverflowRectForPropagation(const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> // If the writing modes of the child and parent match, then we don't have to
</span><span class="cx"> // do anything fancy. Just return the result.
</span><span class="lines">@@ -4840,7 +4840,7 @@
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect RenderBox::logicalLayoutOverflowRectForPropagation(RenderStyle* parentStyle) const
</del><ins>+LayoutRect RenderBox::logicalLayoutOverflowRectForPropagation(const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> LayoutRect rect = layoutOverflowRectForPropagation(parentStyle);
</span><span class="cx"> if (!parentStyle->isHorizontalWritingMode())
</span><span class="lines">@@ -4848,7 +4848,7 @@
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutRect RenderBox::layoutOverflowRectForPropagation(RenderStyle* parentStyle) const
</del><ins>+LayoutRect RenderBox::layoutOverflowRectForPropagation(const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> // Only propagate interior layout overflow if we don't clip it.
</span><span class="cx"> LayoutRect rect = borderBoxRect();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -563,10 +563,10 @@
</span><span class="cx"> applyTopLeftLocationOffsetWithFlipping(point);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutRect logicalVisualOverflowRectForPropagation(RenderStyle*) const;
- LayoutRect visualOverflowRectForPropagation(RenderStyle*) const;
- LayoutRect logicalLayoutOverflowRectForPropagation(RenderStyle*) const;
- LayoutRect layoutOverflowRectForPropagation(RenderStyle*) const;
</del><ins>+ LayoutRect logicalVisualOverflowRectForPropagation(const RenderStyle*) const;
+ LayoutRect visualOverflowRectForPropagation(const RenderStyle*) const;
+ LayoutRect logicalLayoutOverflowRectForPropagation(const RenderStyle*) const;
+ LayoutRect layoutOverflowRectForPropagation(const RenderStyle*) const;
</ins><span class="cx">
</span><span class="cx"> bool hasRenderOverflow() const { return m_overflow; }
</span><span class="cx"> bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().contains(m_overflow->visualOverflowRect()); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> return getBackgroundRoundedRect(borderRect, box, boxSize.width(), boxSize.height(), includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void applyBoxShadowForBackground(GraphicsContext& context, RenderStyle* style)
</del><ins>+static void applyBoxShadowForBackground(GraphicsContext& context, const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> const ShadowData* boxShadow = style->boxShadow();
</span><span class="cx"> while (boxShadow->style() != Normal)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderButton.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> // Create an anonymous block.
</span><span class="cx"> ASSERT(!firstChild());
</span><span class="cx"> m_inner = createAnonymousBlock(style().display());
</span><del>- setupInnerStyle(&m_inner->style());
</del><ins>+ setupInnerStyle(&m_inner->mutableStyle());
</ins><span class="cx"> RenderFlexibleBox::addChild(m_inner);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> // it right below. Here we change it back to 0 to avoid getting a spurious layout hint
</span><span class="cx"> // because of the difference. Same goes for the other properties.
</span><span class="cx"> // FIXME: Make this hack unnecessary.
</span><del>- m_inner->style().setFlexGrow(newStyle.initialFlexGrow());
- m_inner->style().setMarginTop(newStyle.initialMargin());
- m_inner->style().setMarginBottom(newStyle.initialMargin());
</del><ins>+ m_inner->mutableStyle().setFlexGrow(newStyle.initialFlexGrow());
+ m_inner->mutableStyle().setMarginTop(newStyle.initialMargin());
+ m_inner->mutableStyle().setMarginBottom(newStyle.initialMargin());
</ins><span class="cx"> }
</span><span class="cx"> RenderBlock::styleWillChange(diff, newStyle);
</span><span class="cx"> }
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> RenderBlock::styleDidChange(diff, oldStyle);
</span><span class="cx">
</span><span class="cx"> if (m_inner) // RenderBlock handled updating the anonymous block's style.
</span><del>- setupInnerStyle(&m_inner->style());
</del><ins>+ setupInnerStyle(&m_inner->mutableStyle());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderButton::setupInnerStyle(RenderStyle* innerStyle)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> RenderFlexibleBox::layout();
</span><span class="cx">
</span><span class="cx"> // FIXME: We should not be adjusting styles during layout. See <rdar://problem/7675493>.
</span><del>- RenderThemeIOS::adjustRoundBorderRadius(style(), *this);
</del><ins>+ RenderThemeIOS::adjustRoundBorderRadius(mutableStyle(), *this);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderDeprecatedFlexibleBox::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
</span><span class="cx"> {
</span><del>- RenderStyle* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</del><ins>+ auto* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</ins><span class="cx"> if (oldStyle && !oldStyle->lineClamp().isNone() && newStyle.lineClamp().isNone())
</span><span class="cx"> clearLineClamp();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -205,11 +205,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-enum StyleCacheState {
- Cached,
- Uncached
-};
-
</del><span class="cx"> std::unique_ptr<RenderStyle> RenderElement::uncachedFirstLineStyle(RenderStyle* style) const
</span><span class="cx"> {
</span><span class="cx"> if (!view().usesFirstLineRules())
</span><span class="lines">@@ -221,14 +216,14 @@
</span><span class="cx"> if (RenderBlock* firstLineBlock = rendererForFirstLineStyle.firstLineBlock())
</span><span class="cx"> return firstLineBlock->getUncachedPseudoStyle(PseudoStyleRequest(FIRST_LINE), style, firstLineBlock == this ? style : nullptr);
</span><span class="cx"> } else if (!rendererForFirstLineStyle.isAnonymous() && rendererForFirstLineStyle.isRenderInline()) {
</span><del>- RenderStyle& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
</del><ins>+ auto& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
</ins><span class="cx"> if (&parentStyle != &rendererForFirstLineStyle.parent()->style())
</span><span class="cx"> return rendererForFirstLineStyle.getUncachedPseudoStyle(PseudoStyleRequest(FIRST_LINE_INHERITED), &parentStyle, style);
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* RenderElement::cachedFirstLineStyle() const
</del><ins>+const RenderStyle* RenderElement::cachedFirstLineStyle() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(view().usesFirstLineRules());
</span><span class="cx">
</span><span class="lines">@@ -238,10 +233,10 @@
</span><span class="cx"> if (RenderBlock* firstLineBlock = rendererForFirstLineStyle.firstLineBlock())
</span><span class="cx"> return firstLineBlock->getCachedPseudoStyle(FIRST_LINE, &style());
</span><span class="cx"> } else if (!rendererForFirstLineStyle.isAnonymous() && rendererForFirstLineStyle.isRenderInline()) {
</span><del>- RenderStyle& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
</del><ins>+ auto& parentStyle = rendererForFirstLineStyle.parent()->firstLineStyle();
</ins><span class="cx"> if (&parentStyle != &rendererForFirstLineStyle.parent()->style()) {
</span><span class="cx"> // A first-line style is in effect. Cache a first-line style for ourselves.
</span><del>- rendererForFirstLineStyle.style().setHasPseudoStyle(FIRST_LINE_INHERITED);
</del><ins>+ rendererForFirstLineStyle.m_style.setHasPseudoStyle(FIRST_LINE_INHERITED);
</ins><span class="cx"> return rendererForFirstLineStyle.getCachedPseudoStyle(FIRST_LINE_INHERITED, &parentStyle);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -249,7 +244,7 @@
</span><span class="cx"> return &style();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle& RenderElement::firstLineStyle() const
</del><ins>+const RenderStyle& RenderElement::firstLineStyle() const
</ins><span class="cx"> {
</span><span class="cx"> return view().usesFirstLineRules() ? *cachedFirstLineStyle() : style();
</span><span class="cx"> }
</span><span class="lines">@@ -806,7 +801,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderElement::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
</span><span class="cx"> {
</span><del>- RenderStyle* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</del><ins>+ auto* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</ins><span class="cx"> if (oldStyle) {
</span><span class="cx"> // If our z-index changes value or our visibility changes,
</span><span class="cx"> // we need to dirty our stacking context's z-order list.
</span><span class="lines">@@ -1535,7 +1530,7 @@
</span><span class="cx"> controlStatesRendererMap().add(o, states);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* RenderElement::getCachedPseudoStyle(PseudoId pseudo, RenderStyle* parentStyle) const
</del><ins>+const RenderStyle* RenderElement::getCachedPseudoStyle(PseudoId pseudo, const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> if (pseudo < FIRST_INTERNAL_PSEUDOID && !style().hasPseudoStyle(pseudo))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1546,12 +1541,27 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<RenderStyle> result = getUncachedPseudoStyle(PseudoStyleRequest(pseudo), parentStyle);
</span><span class="cx"> if (result)
</span><del>- return style().addCachedPseudoStyle(WTFMove(result));
</del><ins>+ return const_cast<RenderStyle&>(m_style).addCachedPseudoStyle(WTFMove(result));
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> RenderElement::getUncachedPseudoStyle(const PseudoStyleRequest& pseudoStyleRequest, RenderStyle* parentStyle, RenderStyle* ownStyle) const
</del><ins>+RenderStyle* RenderElement::getMutableCachedPseudoStyle(PseudoId pseudo, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><ins>+ if (pseudo < FIRST_INTERNAL_PSEUDOID && !style().hasPseudoStyle(pseudo))
+ return nullptr;
+
+ RenderStyle* cachedStyle = style().getCachedPseudoStyle(pseudo);
+ if (cachedStyle)
+ return cachedStyle;
+
+ std::unique_ptr<RenderStyle> result = getUncachedPseudoStyle(PseudoStyleRequest(pseudo), parentStyle);
+ if (result)
+ return m_style.addCachedPseudoStyle(WTFMove(result));
+ return nullptr;
+}
+
+std::unique_ptr<RenderStyle> RenderElement::getUncachedPseudoStyle(const PseudoStyleRequest& pseudoStyleRequest, const RenderStyle* parentStyle, const RenderStyle* ownStyle) const
+{
</ins><span class="cx"> if (pseudoStyleRequest.pseudoId < FIRST_INTERNAL_PSEUDOID && !ownStyle && !style().hasPseudoStyle(pseudoStyleRequest.pseudoId))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -2066,7 +2076,7 @@
</span><span class="cx"> if (!hasOutline())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& styleToUse = style();
</del><ins>+ auto& styleToUse = style();
</ins><span class="cx"> float outlineWidth = floorToDevicePixel(styleToUse.outlineWidth(), document().deviceScaleFactor());
</span><span class="cx"> float outlineOffset = floorToDevicePixel(styleToUse.outlineOffset(), document().deviceScaleFactor());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -40,9 +40,12 @@
</span><span class="cx">
</span><span class="cx"> bool hasInitializedStyle() const { return m_hasInitializedStyle; }
</span><span class="cx">
</span><del>- RenderStyle& style() const { return const_cast<RenderStyle&>(m_style); }
- RenderStyle& firstLineStyle() const;
</del><ins>+ const RenderStyle& style() const { return m_style; }
+ const RenderStyle& firstLineStyle() const;
</ins><span class="cx">
</span><ins>+ // FIXME: Style shouldn't be mutated.
+ RenderStyle& mutableStyle() { return m_style; }
+
</ins><span class="cx"> void initializeStyle();
</span><span class="cx">
</span><span class="cx"> // Calling with minimalStyleDifference > StyleDifferenceEqual indicates that
</span><span class="lines">@@ -52,8 +55,9 @@
</span><span class="cx">
</span><span class="cx"> // The pseudo element style can be cached or uncached. Use the cached method if the pseudo element doesn't respect
</span><span class="cx"> // any pseudo classes (and therefore has no concept of changing state).
</span><del>- RenderStyle* getCachedPseudoStyle(PseudoId, RenderStyle* parentStyle = nullptr) const;
- std::unique_ptr<RenderStyle> getUncachedPseudoStyle(const PseudoStyleRequest&, RenderStyle* parentStyle = nullptr, RenderStyle* ownStyle = nullptr) const;
</del><ins>+ const RenderStyle* getCachedPseudoStyle(PseudoId, const RenderStyle* parentStyle = nullptr) const;
+ RenderStyle* getMutableCachedPseudoStyle(PseudoId, const RenderStyle* parentStyle = nullptr);
+ std::unique_ptr<RenderStyle> getUncachedPseudoStyle(const PseudoStyleRequest&, const RenderStyle* parentStyle = nullptr, const RenderStyle* ownStyle = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> // This is null for anonymous renderers.
</span><span class="cx"> Element* element() const { return downcast<Element>(RenderObject::node()); }
</span><span class="lines">@@ -298,7 +302,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensitiveProperties) const;
</span><del>- RenderStyle* cachedFirstLineStyle() const;
</del><ins>+ const RenderStyle* cachedFirstLineStyle() const;
</ins><span class="cx">
</span><span class="cx"> void newImageAnimationFrameAvailable(CachedImage&) final;
</span><span class="cx">
</span><span class="lines">@@ -450,14 +454,14 @@
</span><span class="cx"> return is<RenderElement>(*this) && downcast<RenderElement>(*this).isRenderInline();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle& RenderObject::style() const
</del><ins>+inline const RenderStyle& RenderObject::style() const
</ins><span class="cx"> {
</span><span class="cx"> if (isText())
</span><span class="cx"> return m_parent->style();
</span><span class="cx"> return downcast<RenderElement>(*this).style();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle& RenderObject::firstLineStyle() const
</del><ins>+inline const RenderStyle& RenderObject::firstLineStyle() const
</ins><span class="cx"> {
</span><span class="cx"> if (isText())
</span><span class="cx"> return m_parent->firstLineStyle();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -522,8 +522,8 @@
</span><span class="cx"> LayoutStateMaintainer statePusher(view(), *this, locationOffset(), hasTransform() || hasReflection() || style().isFlippedBlocksWritingMode());
</span><span class="cx">
</span><span class="cx"> childBox.setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
</span><del>- childBox.style().setHeight(Length(newSize.height(), Fixed));
- childBox.style().setWidth(Length(newSize.width(), Fixed));
</del><ins>+ childBox.mutableStyle().setHeight(Length(newSize.height(), Fixed));
+ childBox.mutableStyle().setWidth(Length(newSize.width(), Fixed));
</ins><span class="cx"> childBox.setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> childBox.layout();
</span><span class="cx"> clearChildNeedsLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> setFlowThreadState(InsideOutOfFlowThread);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle RenderFlowThread::createFlowThreadStyle(RenderStyle* parentStyle)
</del><ins>+RenderStyle RenderFlowThread::createFlowThreadStyle(const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto newStyle = RenderStyle::create();
</span><span class="cx"> newStyle.inheritFrom(parentStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> // Called when a descendant box's layout is finished and it has been positioned within its container.
</span><span class="cx"> virtual void flowThreadDescendantBoxLaidOut(RenderBox*) { }
</span><span class="cx">
</span><del>- static RenderStyle createFlowThreadStyle(RenderStyle* parentStyle);
</del><ins>+ static RenderStyle createFlowThreadStyle(const RenderStyle* parentStyle);
</ins><span class="cx">
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -716,8 +716,8 @@
</span><span class="cx">
</span><span class="cx"> if (shadowControlsNeedCustomLayoutMetrics()) {
</span><span class="cx"> controlsRenderer->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(paddingLeft(), paddingTop()));
</span><del>- controlsRenderer->style().setHeight(Length(newSize.height(), Fixed));
- controlsRenderer->style().setWidth(Length(newSize.width(), Fixed));
</del><ins>+ controlsRenderer->mutableStyle().setHeight(Length(newSize.height(), Fixed));
+ controlsRenderer->mutableStyle().setWidth(Length(newSize.width(), Fixed));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> controlsRenderer->setNeedsLayout(MarkOnlyThis);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> // e.g., <font>foo <h4>goo</h4> moo</font>. The <font> inlines before
</span><span class="cx"> // and after the block share the same style, but the block doesn't
</span><span class="cx"> // need to pass its style on to anyone else.
</span><del>- RenderStyle& newStyle = style();
</del><ins>+ auto& newStyle = style();
</ins><span class="cx"> RenderInline* continuation = inlineElementContinuation();
</span><span class="cx"> if (continuation) {
</span><span class="cx"> for (RenderInline* currCont = continuation; currCont; currCont = currCont->inlineElementContinuation()) {
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> if (alwaysCreateLineBoxes())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle* parentStyle = &parent()->style();
</del><ins>+ auto* parentStyle = &parent()->style();
</ins><span class="cx"> RenderInline* parentRenderInline = is<RenderInline>(*parent()) ? downcast<RenderInline>(parent()) : nullptr;
</span><span class="cx"> bool checkFonts = document().inNoQuirksMode();
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> if (!alwaysCreateLineBoxes && checkFonts && view().usesFirstLineRules()) {
</span><span class="cx"> // Have to check the first line style as well.
</span><span class="cx"> parentStyle = &parent()->firstLineStyle();
</span><del>- RenderStyle& childStyle = firstLineStyle();
</del><ins>+ auto& childStyle = firstLineStyle();
</ins><span class="cx"> alwaysCreateLineBoxes = !parentStyle->fontCascade().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle.fontCascade().fontMetrics())
</span><span class="cx"> || childStyle.verticalAlign() != BASELINE
</span><span class="cx"> || parentStyle->lineHeight() != childStyle.lineHeight();
</span><span class="lines">@@ -1601,7 +1601,7 @@
</span><span class="cx"> if (!hasOutline())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& styleToUse = style();
</del><ins>+ auto& styleToUse = style();
</ins><span class="cx"> // Only paint the focus ring by hand if the theme isn't able to draw it.
</span><span class="cx"> if (styleToUse.outlineStyleIsAuto() && !theme().supportsFocusRing(styleToUse)) {
</span><span class="cx"> Vector<LayoutRect> focusRingRects;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -4111,7 +4111,7 @@
</span><span class="cx"> rootRelativeBoundsComputed = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderStyle& style = renderer().style();
</del><ins>+ auto& style = renderer().style();
</ins><span class="cx"> ASSERT(style.clipPath());
</span><span class="cx"> if (is<ShapeClipPathOperation>(*style.clipPath()) || (is<BoxClipPathOperation>(*style.clipPath()) && is<RenderBox>(renderer()))) {
</span><span class="cx"> WindRule windRule;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> m_vBar->paint(paintInfo.context(), snappedIntRect(paintInfo.rect));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static LayoutSize itemOffsetForAlignment(TextRun textRun, RenderStyle* itemStyle, FontCascade itemFont, LayoutRect itemBoudingBox)
</del><ins>+static LayoutSize itemOffsetForAlignment(TextRun textRun, const RenderStyle* itemStyle, FontCascade itemFont, LayoutRect itemBoudingBox)
</ins><span class="cx"> {
</span><span class="cx"> ETextAlign actualAlignment = itemStyle->textAlign();
</span><span class="cx"> // FIXME: Firefox doesn't respect JUSTIFY. Should we?
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> const Vector<HTMLElement*>& listItems = selectElement().listItems();
</span><span class="cx"> HTMLElement* listItemElement = listItems[listIndex];
</span><span class="cx">
</span><del>- RenderStyle& itemStyle = *listItemElement->computedStyle();
</del><ins>+ auto& itemStyle = *listItemElement->computedStyle();
</ins><span class="cx">
</span><span class="cx"> if (itemStyle.visibility() == HIDDEN)
</span><span class="cx"> return;
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> {
</span><span class="cx"> const Vector<HTMLElement*>& listItems = selectElement().listItems();
</span><span class="cx"> HTMLElement* listItemElement = listItems[listIndex];
</span><del>- RenderStyle& itemStyle = *listItemElement->computedStyle();
</del><ins>+ auto& itemStyle = *listItemElement->computedStyle();
</ins><span class="cx">
</span><span class="cx"> Color backColor;
</span><span class="cx"> if (is<HTMLOptionElement>(*listItemElement) && downcast<HTMLOptionElement>(*listItemElement).selected()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListMarker.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListMarker.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderListMarker.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1708,8 +1708,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- style().setMarginStart(Length(marginStart, Fixed));
- style().setMarginEnd(Length(marginEnd, Fixed));
</del><ins>+ mutableStyle().setMarginStart(Length(marginStart, Fixed));
+ mutableStyle().setMarginEnd(Length(marginEnd, Fixed));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderListMarker::lineHeight(bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderMarquee.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> {
</span><span class="cx"> RenderBox* box = m_layer->renderBox();
</span><span class="cx"> ASSERT(box);
</span><del>- RenderStyle& boxStyle = box->style();
</del><ins>+ auto& boxStyle = box->style();
</ins><span class="cx"> if (isHorizontal()) {
</span><span class="cx"> bool ltr = boxStyle.isLeftToRightDirection();
</span><span class="cx"> LayoutUnit clientWidth = box->clientWidth();
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderMarquee::updateMarqueeStyle()
</span><span class="cx"> {
</span><del>- RenderStyle& style = m_layer->renderer().style();
</del><ins>+ auto& style = m_layer->renderer().mutableStyle();
</ins><span class="cx">
</span><span class="cx"> if (m_direction != style.marqueeDirection() || (m_totalLoops != style.marqueeLoopCount() && m_currentLoop >= m_totalLoops))
</span><span class="cx"> m_currentLoop = 0; // When direction changes or our loopCount is a smaller number than our current loop, reset our loop.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderMenuList::adjustInnerStyle()
</span><span class="cx"> {
</span><del>- RenderStyle& innerStyle = m_innerBlock->style();
</del><ins>+ auto& innerStyle = m_innerBlock->mutableStyle();
</ins><span class="cx"> innerStyle.setFlexGrow(1);
</span><span class="cx"> innerStyle.setFlexShrink(1);
</span><span class="cx"> // min-width: 0; is needed for correct shrinking.
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> if (theme().popupOptionSupportsTextIndent()) {
</span><span class="cx"> // Add in the option's text indent. We can't calculate percentage values for now.
</span><span class="cx"> float optionWidth = 0;
</span><del>- if (RenderStyle* optionStyle = element->computedStyle())
</del><ins>+ if (auto* optionStyle = element->computedStyle())
</ins><span class="cx"> optionWidth += minimumValueForLength(optionStyle->textIndent(), 0);
</span><span class="cx"> if (!text.isEmpty()) {
</span><span class="cx"> const FontCascade& font = style().fontCascade();
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> bool itemHasCustomBackgroundColor;
</span><span class="cx"> getItemBackgroundColor(listIndex, itemBackgroundColor, itemHasCustomBackgroundColor);
</span><span class="cx">
</span><del>- RenderStyle& style = *element->computedStyle();
</del><ins>+ auto& style = *element->computedStyle();
</ins><span class="cx"> return PopupMenuStyle(style.visitedDependentColor(CSSPropertyColor), itemBackgroundColor, style.fontCascade(), style.visibility() == VISIBLE,
</span><span class="cx"> style.display() == NONE, true, style.textIndent(), style.direction(), isOverride(style.unicodeBidi()),
</span><span class="cx"> itemHasCustomBackgroundColor ? PopupMenuStyle::CustomBackgroundColor : PopupMenuStyle::DefaultBackgroundColor);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> ASSERT(descendant->isDescendantOf(flowThread));
</span><span class="cx">
</span><span class="cx"> // First make sure that the renderer itself has the right properties for becoming a spanner.
</span><del>- RenderStyle& style = descendant->style();
</del><ins>+ auto& style = descendant->style();
</ins><span class="cx"> if (style.columnSpan() != ColumnSpanAll || !is<RenderBox>(*descendant) || descendant->isFloatingOrOutOfFlowPositioned())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSpannerPlaceholdercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RenderMultiColumnSpannerPlaceholder* RenderMultiColumnSpannerPlaceholder::createAnonymous(RenderMultiColumnFlowThread* flowThread, RenderBox* spanner, RenderStyle* parentStyle)
</del><ins>+RenderMultiColumnSpannerPlaceholder* RenderMultiColumnSpannerPlaceholder::createAnonymous(RenderMultiColumnFlowThread* flowThread, RenderBox* spanner, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> auto newStyle = RenderStyle::createAnonymousStyleWithDisplay(*parentStyle, BLOCK);
</span><span class="cx"> newStyle.setClear(CBOTH); // We don't want floats in the row preceding the spanner to continue on the other side.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSpannerPlaceholderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSpannerPlaceholder.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class RenderMultiColumnSpannerPlaceholder final : public RenderBox {
</span><span class="cx"> public:
</span><del>- static RenderMultiColumnSpannerPlaceholder* createAnonymous(RenderMultiColumnFlowThread*, RenderBox* spanner, RenderStyle* parentStyle);
</del><ins>+ static RenderMultiColumnSpannerPlaceholder* createAnonymous(RenderMultiColumnFlowThread*, RenderBox* spanner, const RenderStyle* parentStyle);
</ins><span class="cx">
</span><span class="cx"> RenderBox* spanner() const { return m_spanner; }
</span><span class="cx"> RenderMultiColumnFlowThread* flowThread() const { return m_flowThread; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> downcast<RenderNamedFlowThread>(*m_flowThread).checkRegionsWithStyling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> RenderNamedFlowFragment::computeStyleInRegion(RenderElement& renderer, RenderStyle& parentStyle) const
</del><ins>+std::unique_ptr<RenderStyle> RenderNamedFlowFragment::computeStyleInRegion(RenderElement& renderer, const RenderStyle& parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!renderer.isAnonymous());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> bool isRenderNamedFlowFragment() const override { return true; }
</span><span class="cx"> const char* renderName() const override { return "RenderNamedFlowFragment"; }
</span><span class="cx">
</span><del>- std::unique_ptr<RenderStyle> computeStyleInRegion(RenderElement&, RenderStyle& parentStyle) const;
</del><ins>+ std::unique_ptr<RenderStyle> computeStyleInRegion(RenderElement&, const RenderStyle& parentStyle) const;
</ins><span class="cx"> void computeChildrenStyleInRegion(RenderElement&);
</span><span class="cx"> void setObjectStyleInRegion(RenderObject*, std::unique_ptr<RenderStyle>, bool objectRegionStyleCached);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1822,7 +1822,7 @@
</span><span class="cx"> return style().computedLineHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Color decorationColor(RenderStyle* style)
</del><ins>+static Color decorationColor(const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> Color result;
</span><span class="cx"> // Check for text decoration color first.
</span><span class="lines">@@ -1844,7 +1844,7 @@
</span><span class="cx"> TextDecorationStyle& underlineStyle, TextDecorationStyle& overlineStyle, TextDecorationStyle& linethroughStyle, bool firstlineStyle) const
</span><span class="cx"> {
</span><span class="cx"> const RenderObject* current = this;
</span><del>- RenderStyle* styleToUse = nullptr;
</del><ins>+ const RenderStyle* styleToUse = nullptr;
</ins><span class="cx"> TextDecoration currDecs = TextDecorationNone;
</span><span class="cx"> Color resultColor;
</span><span class="cx"> do {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -697,8 +697,8 @@
</span><span class="cx"> virtual LayoutUnit minPreferredLogicalWidth() const { return 0; }
</span><span class="cx"> virtual LayoutUnit maxPreferredLogicalWidth() const { return 0; }
</span><span class="cx">
</span><del>- RenderStyle& style() const;
- RenderStyle& firstLineStyle() const;
</del><ins>+ const RenderStyle& style() const;
+ const RenderStyle& firstLineStyle() const;
</ins><span class="cx">
</span><span class="cx"> // Anonymous blocks that are part of of a continuation chain will return their inline continuation's outline style instead.
</span><span class="cx"> // This is typically only relevant when repainting.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> for (unsigned i = 0; i < m_captions.size(); i++)
</span><span class="cx"> m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, m_captions[i]->minPreferredLogicalWidth());
</span><span class="cx">
</span><del>- RenderStyle& styleToUse = style();
</del><ins>+ auto& styleToUse = style();
</ins><span class="cx"> // FIXME: This should probably be checking for isSpecified since you should be able to use percentage or calc values for min-width.
</span><span class="cx"> if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
</span><span class="cx"> m_maxPreferredLogicalWidth = std::max(m_maxPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(styleToUse.logicalMinWidth().value()));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static BoxSide physicalBorderForDirection(RenderStyle* styleForCellFlow, CollapsedBorderSide side)
</del><ins>+static BoxSide physicalBorderForDirection(const RenderStyle* styleForCellFlow, CollapsedBorderSide side)
</ins><span class="cx"> {
</span><span class="cx">
</span><span class="cx"> switch (side) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderText.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isTextFragment() const;
</span><span class="cx">
</span><del>- RenderStyle& style() const;
- RenderStyle& firstLineStyle() const;
- RenderStyle* getCachedPseudoStyle(PseudoId, RenderStyle* parentStyle = nullptr) const;
</del><ins>+ const RenderStyle& style() const;
+ const RenderStyle& firstLineStyle() const;
+ const RenderStyle* getCachedPseudoStyle(PseudoId, const RenderStyle* parentStyle = nullptr) const;
</ins><span class="cx">
</span><span class="cx"> Color selectionBackgroundColor() const;
</span><span class="cx"> Color selectionForegroundColor() const;
</span><span class="lines">@@ -251,17 +251,17 @@
</span><span class="cx"> return uncheckedCharacterAt(i);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle& RenderText::style() const
</del><ins>+inline const RenderStyle& RenderText::style() const
</ins><span class="cx"> {
</span><span class="cx"> return parent()->style();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle& RenderText::firstLineStyle() const
</del><ins>+inline const RenderStyle& RenderText::firstLineStyle() const
</ins><span class="cx"> {
</span><span class="cx"> return parent()->firstLineStyle();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline RenderStyle* RenderText::getCachedPseudoStyle(PseudoId pseudoId, RenderStyle* parentStyle) const
</del><ins>+inline const RenderStyle* RenderText::getCachedPseudoStyle(PseudoId pseudoId, const RenderStyle* parentStyle) const
</ins><span class="cx"> {
</span><span class="cx"> return parent()->getCachedPseudoStyle(pseudoId, parentStyle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> if (innerTextRenderer) {
</span><span class="cx"> // We may have set the width and the height in the old style in layout().
</span><span class="cx"> // Reset them now to avoid getting a spurious layout hint.
</span><del>- innerTextRenderer->style().setHeight(Length());
- innerTextRenderer->style().setWidth(Length());
</del><ins>+ innerTextRenderer->mutableStyle().setHeight(Length());
+ innerTextRenderer->mutableStyle().setWidth(Length());
</ins><span class="cx"> innerTextRenderer->setStyle(textFormControlElement().createInnerTextStyle(style()));
</span><span class="cx"> }
</span><span class="cx"> textFormControlElement().updatePlaceholderVisibility();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlMultiLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> RenderObject* placeholderRenderer = RenderTextControl::layoutSpecialExcludedChild(relayoutChildren);
</span><span class="cx"> if (is<RenderBox>(placeholderRenderer)) {
</span><span class="cx"> auto& placeholderBox = downcast<RenderBox>(*placeholderRenderer);
</span><del>- placeholderBox.style().setLogicalWidth(Length(contentLogicalWidth() - placeholderBox.borderAndPaddingLogicalWidth(), Fixed));
</del><ins>+ placeholderBox.mutableStyle().setLogicalWidth(Length(contentLogicalWidth() - placeholderBox.borderAndPaddingLogicalWidth(), Fixed));
</ins><span class="cx"> placeholderBox.layoutIfNeeded();
</span><span class="cx"> placeholderBox.setX(borderLeft() + paddingLeft());
</span><span class="cx"> placeholderBox.setY(borderTop() + paddingTop());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -108,11 +108,11 @@
</span><span class="cx">
</span><span class="cx"> // To ensure consistency between layouts, we need to reset any conditionally overriden height.
</span><span class="cx"> if (innerTextRenderer && !innerTextRenderer->style().logicalHeight().isAuto()) {
</span><del>- innerTextRenderer->style().setLogicalHeight(Length(Auto));
</del><ins>+ innerTextRenderer->mutableStyle().setLogicalHeight(Length(Auto));
</ins><span class="cx"> setNeedsLayoutOnAncestors(innerTextRenderer, this);
</span><span class="cx"> }
</span><span class="cx"> if (innerBlockRenderer && !innerBlockRenderer->style().logicalHeight().isAuto()) {
</span><del>- innerBlockRenderer->style().setLogicalHeight(Length(Auto));
</del><ins>+ innerBlockRenderer->mutableStyle().setLogicalHeight(Length(Auto));
</ins><span class="cx"> setNeedsLayoutOnAncestors(innerBlockRenderer, this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,10 +128,10 @@
</span><span class="cx"> if (desiredLogicalHeight != innerTextRenderer->logicalHeight())
</span><span class="cx"> setNeedsLayout(MarkOnlyThis);
</span><span class="cx">
</span><del>- innerTextRenderer->style().setLogicalHeight(Length(desiredLogicalHeight, Fixed));
</del><ins>+ innerTextRenderer->mutableStyle().setLogicalHeight(Length(desiredLogicalHeight, Fixed));
</ins><span class="cx"> innerTextRenderer->setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> if (innerBlockRenderer) {
</span><del>- innerBlockRenderer->style().setLogicalHeight(Length(desiredLogicalHeight, Fixed));
</del><ins>+ innerBlockRenderer->mutableStyle().setLogicalHeight(Length(desiredLogicalHeight, Fixed));
</ins><span class="cx"> innerBlockRenderer->setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -140,13 +140,13 @@
</span><span class="cx"> containerRenderer->layoutIfNeeded();
</span><span class="cx"> LayoutUnit containerLogicalHeight = containerRenderer->logicalHeight();
</span><span class="cx"> if (containerLogicalHeight > logicalHeightLimit) {
</span><del>- containerRenderer->style().setLogicalHeight(Length(logicalHeightLimit, Fixed));
</del><ins>+ containerRenderer->mutableStyle().setLogicalHeight(Length(logicalHeightLimit, Fixed));
</ins><span class="cx"> setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> } else if (containerRenderer->logicalHeight() < contentLogicalHeight()) {
</span><del>- containerRenderer->style().setLogicalHeight(Length(contentLogicalHeight(), Fixed));
</del><ins>+ containerRenderer->mutableStyle().setLogicalHeight(Length(contentLogicalHeight(), Fixed));
</ins><span class="cx"> setNeedsLayout(MarkOnlyThis);
</span><span class="cx"> } else
</span><del>- containerRenderer->style().setLogicalHeight(Length(containerLogicalHeight, Fixed));
</del><ins>+ containerRenderer->mutableStyle().setLogicalHeight(Length(containerLogicalHeight, Fixed));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we need another layout pass, we have changed one of children's height so we need to relayout them.
</span><span class="lines">@@ -174,8 +174,8 @@
</span><span class="cx"> LayoutSize innerTextSize;
</span><span class="cx"> if (innerTextRenderer)
</span><span class="cx"> innerTextSize = innerTextRenderer->size();
</span><del>- placeholderBox->style().setWidth(Length(innerTextSize.width() - placeholderBox->horizontalBorderAndPaddingExtent(), Fixed));
- placeholderBox->style().setHeight(Length(innerTextSize.height() - placeholderBox->verticalBorderAndPaddingExtent(), Fixed));
</del><ins>+ placeholderBox->mutableStyle().setWidth(Length(innerTextSize.width() - placeholderBox->horizontalBorderAndPaddingExtent(), Fixed));
+ placeholderBox->mutableStyle().setHeight(Length(innerTextSize.height() - placeholderBox->verticalBorderAndPaddingExtent(), Fixed));
</ins><span class="cx"> bool neededLayout = placeholderBox->needsLayout();
</span><span class="cx"> bool placeholderBoxHadLayout = placeholderBox->everHadLayout();
</span><span class="cx"> placeholderBox->layoutIfNeeded();
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: We should not be adjusting styles during layout. <rdar://problem/7675493>
</span><span class="cx"> if (inputElement().isSearchField())
</span><del>- RenderThemeIOS::adjustRoundBorderRadius(style(), *this);
</del><ins>+ RenderThemeIOS::adjustRoundBorderRadius(mutableStyle(), *this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,14 +236,14 @@
</span><span class="cx"> // We may have set the width and the height in the old style in layout().
</span><span class="cx"> // Reset them now to avoid getting a spurious layout hint.
</span><span class="cx"> HTMLElement* innerBlock = innerBlockElement();
</span><del>- if (RenderObject* innerBlockRenderer = innerBlock ? innerBlock->renderer() : 0) {
- innerBlockRenderer->style().setHeight(Length());
- innerBlockRenderer->style().setWidth(Length());
</del><ins>+ if (auto* innerBlockRenderer = innerBlock ? innerBlock->renderer() : nullptr) {
+ innerBlockRenderer->mutableStyle().setHeight(Length());
+ innerBlockRenderer->mutableStyle().setWidth(Length());
</ins><span class="cx"> }
</span><span class="cx"> HTMLElement* container = containerElement();
</span><del>- if (RenderObject* containerRenderer = container ? container->renderer() : 0) {
- containerRenderer->style().setHeight(Length());
- containerRenderer->style().setWidth(Length());
</del><ins>+ if (auto* containerRenderer = container ? container->renderer() : nullptr) {
+ containerRenderer->mutableStyle().setHeight(Length());
+ containerRenderer->mutableStyle().setWidth(Length());
</ins><span class="cx"> }
</span><span class="cx"> if (diff == StyleDifferenceLayout) {
</span><span class="cx"> if (auto* innerTextRenderer = innerTextElement()->renderer())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextFragment.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextFragment.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderTextFragment.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> RenderText::styleDidChange(diff, oldStyle);
</span><span class="cx">
</span><span class="cx"> if (RenderBlock* block = blockForAccompanyingFirstLetter()) {
</span><del>- block->style().removeCachedPseudoStyle(FIRST_LETTER);
</del><ins>+ block->mutableStyle().removeCachedPseudoStyle(FIRST_LETTER);
</ins><span class="cx"> block->updateFirstLetter();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -2015,7 +2015,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static FloatRoundedRect::Radii borderRadiiFromStyle(RenderStyle& style)
</del><ins>+static FloatRoundedRect::Radii borderRadiiFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><span class="cx"> return FloatRoundedRect::Radii(
</span><span class="cx"> IntSize(style.borderTopLeftRadius().width().intValue(), style.borderTopLeftRadius().height().intValue()),
</span><span class="lines">@@ -2036,7 +2036,7 @@
</span><span class="cx">
</span><span class="cx"> float mediaDuration = mediaElement->duration();
</span><span class="cx"> float totalTrackWidth = r.width();
</span><del>- RenderStyle& style = o.style();
</del><ins>+ auto& style = o.style();
</ins><span class="cx"> RefPtr<TimeRanges> timeRanges = mediaElement->buffered();
</span><span class="cx"> for (unsigned index = 0; index < timeRanges->length(); ++index) {
</span><span class="cx"> float start = timeRanges->start(index, IGNORE_EXCEPTION);
</span><span class="lines">@@ -2059,7 +2059,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeGtk::paintMediaSliderThumb(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</span><span class="cx"> {
</span><del>- RenderStyle& style = o.style();
</del><ins>+ auto& style = o.style();
</ins><span class="cx"> paintInfo.context().fillRoundedRect(FloatRoundedRect(r, borderRadiiFromStyle(style)), style.visitedDependentColor(CSSPropertyColor));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -2080,7 +2080,7 @@
</span><span class="cx">
</span><span class="cx"> int rectHeight = rect.height();
</span><span class="cx"> float trackHeight = rectHeight * volume;
</span><del>- RenderStyle& style = renderObject.style();
</del><ins>+ auto& style = renderObject.style();
</ins><span class="cx"> IntRect volumeRect(rect);
</span><span class="cx"> volumeRect.move(0, rectHeight - trackHeight);
</span><span class="cx"> volumeRect.setHeight(ceil(trackHeight));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> {
</span><span class="cx"> // To fix inner border bleeding issues <rdar://problem/9812507>, we clip to the outer border and assert that
</span><span class="cx"> // the border is opaque or transparent, unless we're checked because checked radio/checkboxes show no bleeding.
</span><del>- RenderStyle& style = box.style();
</del><ins>+ auto& style = box.style();
</ins><span class="cx"> RoundedRect border = isChecked(box) ? style.getRoundedInnerBorderFor(rect) : style.getRoundedBorderFor(rect);
</span><span class="cx">
</span><span class="cx"> if (border.isRounded())
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeIOS::paintTextFieldDecorations(const RenderObject& box, const PaintInfo& paintInfo, const FloatRect& rect)
</span><span class="cx"> {
</span><del>- RenderStyle& style = box.style();
</del><ins>+ auto& style = box.style();
</ins><span class="cx"> FloatPoint point(rect.x() + style.borderLeftWidth(), rect.y() + style.borderTopWidth());
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(paintInfo.context());
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeIOS::paintMenuListButtonDecorations(const RenderBox& box, const PaintInfo& paintInfo, const FloatRect& rect)
</span><span class="cx"> {
</span><del>- RenderStyle& style = box.style();
</del><ins>+ auto& style = box.style();
</ins><span class="cx"> float borderTopWidth = style.borderTopWidth();
</span><span class="cx"> FloatRect clip(rect.x() + style.borderLeftWidth(), rect.y() + style.borderTopWidth(), rect.width() - style.borderLeftWidth() - style.borderRightWidth(), rect.height() - style.borderTopWidth() - style.borderBottomWidth());
</span><span class="cx"> CGContextRef cgContext = paintInfo.context().platformContext();
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> bool RenderThemeIOS::paintSliderTrack(const RenderObject& box, const PaintInfo& paintInfo, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> IntRect trackClip = rect;
</span><del>- RenderStyle& style = box.style();
</del><ins>+ auto& style = box.style();
</ins><span class="cx">
</span><span class="cx"> bool isHorizontal = true;
</span><span class="cx"> switch (style.appearance()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> if (paintInfo.phase != PaintPhaseForeground)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& style = flow.style();
</del><ins>+ auto& style = flow.style();
</ins><span class="cx"> if (style.visibility() != VISIBLE)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> if (!layout.runCount())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RenderStyle& style = flow.style();
</del><ins>+ auto& style = flow.style();
</ins><span class="cx"> if (style.visibility() != VISIBLE || style.pointerEvents() == PE_NONE)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutoSizingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutoSizing.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextAutoSizingKey::TextAutoSizingKey(RenderStyle* style)
</del><ins>+TextAutoSizingKey::TextAutoSizingKey(const RenderStyle* style)
</ins><span class="cx"> : m_style(style ? RenderStyle::clonePtr(*style) : nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextAutoSizingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextAutoSizing.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextAutoSizing.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/TextAutoSizing.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -43,12 +43,12 @@
</span><span class="cx"> TextAutoSizingKey() = default;
</span><span class="cx"> enum DeletedTag { Deleted };
</span><span class="cx"> explicit TextAutoSizingKey(DeletedTag);
</span><del>- explicit TextAutoSizingKey(RenderStyle*);
</del><ins>+ explicit TextAutoSizingKey(const RenderStyle*);
</ins><span class="cx"> TextAutoSizingKey(TextAutoSizingKey&&) = default;
</span><span class="cx">
</span><span class="cx"> TextAutoSizingKey& operator=(TextAutoSizingKey&&) = default;
</span><span class="cx">
</span><del>- RenderStyle* style() const { return m_style.get(); }
</del><ins>+ const RenderStyle* style() const { return m_style.get(); }
</ins><span class="cx"> inline bool isDeleted() const { return m_isDeleted; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> selectionPaintStyle.emphasisMarkColor = emphasisMarkForeground;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (RenderStyle* pseudoStyle = renderer.getCachedPseudoStyle(SELECTION)) {
</del><ins>+ if (auto* pseudoStyle = renderer.getCachedPseudoStyle(SELECTION)) {
</ins><span class="cx"> const ShadowData* shadow = paintInfo.forceTextColor() ? nullptr : pseudoStyle->textShadow();
</span><span class="cx"> if (shadow != selectionShadow) {
</span><span class="cx"> if (!paintSelectedTextOnly)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContext.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/line/BreakingContext.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> // Firefox and Opera will allow a table cell to grow to fit an image inside it under
</span><span class="cx"> // very specific circumstances (in order to match common WinIE renderings).
</span><span class="cx"> // Not supporting the quirk has caused us to mis-render some real sites. (See Bugzilla 10517.)
</span><del>- RenderStyle& m_blockStyle;
</del><ins>+ const RenderStyle& m_blockStyle;
</ins><span class="cx">
</span><span class="cx"> LineInfo& m_lineInfo;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -301,10 +301,10 @@
</span><span class="cx"> baseTopMargin -= indexTopMargin;
</span><span class="cx"> indexTopMargin = 0;
</span><span class="cx"> }
</span><del>- index->style().setMarginTop(Length(indexTopMargin, Fixed));
</del><ins>+ index->mutableStyle().setMarginTop(Length(indexTopMargin, Fixed));
</ins><span class="cx"> }
</span><del>- radical->style().setMarginTop(Length(radicalTopMargin, Fixed));
- base->style().setMarginTop(Length(baseTopMargin, Fixed));
</del><ins>+ radical->mutableStyle().setMarginTop(Length(radicalTopMargin, Fixed));
+ base->mutableStyle().setMarginTop(Length(baseTopMargin, Fixed));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderMathMLBlock::layout();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> void setColumnRuleWidth(unsigned short w) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_rule.m_width, w); }
</span><span class="cx"> void resetColumnRule() { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_rule, BorderValue()); }
</span><span class="cx"> void setColumnSpan(ColumnSpan columnSpan) { SET_NESTED_VAR(rareNonInheritedData, m_multiCol, m_columnSpan, columnSpan); }
</span><del>- void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData.access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
</del><ins>+ void inheritColumnPropertiesFrom(const RenderStyle* parent) { rareNonInheritedData.access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
</ins><span class="cx"> void setTransform(const TransformOperations& ops) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_operations, ops); }
</span><span class="cx"> void setTransformOriginX(Length length) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_x, WTFMove(length)); }
</span><span class="cx"> void setTransformOriginY(Length length) { SET_NESTED_VAR(rareNonInheritedData, m_transform, m_y, WTFMove(length)); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, RenderStyle* style) const
</del><ins>+FloatRect SVGInlineTextBox::selectionRectForTextFragment(const SVGTextFragment& fragment, int startPosition, int endPosition, const RenderStyle* style) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(startPosition < endPosition);
</span><span class="cx"> ASSERT(style);
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> if (startPosition >= endPosition)
</span><span class="cx"> return LayoutRect();
</span><span class="cx">
</span><del>- RenderStyle& style = renderer().style();
</del><ins>+ auto& style = renderer().style();
</ins><span class="cx">
</span><span class="cx"> AffineTransform fragmentTransform;
</span><span class="cx"> FloatRect selectionRect;
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> if (!textShouldBePainted(renderer()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& style = parentRenderer.style();
</del><ins>+ auto& style = parentRenderer.style();
</ins><span class="cx">
</span><span class="cx"> int startPosition;
</span><span class="cx"> int endPosition;
</span><span class="lines">@@ -256,14 +256,14 @@
</span><span class="cx"> if (!textShouldBePainted(renderer()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& style = parentRenderer.style();
</del><ins>+ auto& style = parentRenderer.style();
</ins><span class="cx">
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><span class="cx">
</span><span class="cx"> bool hasFill = svgStyle.hasFill();
</span><span class="cx"> bool hasVisibleStroke = svgStyle.hasVisibleStroke();
</span><span class="cx">
</span><del>- RenderStyle* selectionStyle = &style;
</del><ins>+ const RenderStyle* selectionStyle = &style;
</ins><span class="cx"> if (hasSelection) {
</span><span class="cx"> selectionStyle = parentRenderer.getCachedPseudoStyle(SELECTION);
</span><span class="cx"> if (selectionStyle) {
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> ASSERT(!m_paintingResource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGInlineTextBox::acquirePaintingResource(GraphicsContext*& context, float scalingFactor, RenderBoxModelObject& renderer, RenderStyle* style)
</del><ins>+bool SVGInlineTextBox::acquirePaintingResource(GraphicsContext*& context, float scalingFactor, RenderBoxModelObject& renderer, const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(scalingFactor);
</span><span class="cx"> ASSERT(style);
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> m_paintingResource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGInlineTextBox::prepareGraphicsContextForTextPainting(GraphicsContext*& context, float scalingFactor, RenderStyle* style)
</del><ins>+bool SVGInlineTextBox::prepareGraphicsContextForTextPainting(GraphicsContext*& context, float scalingFactor, const RenderStyle* style)
</ins><span class="cx"> {
</span><span class="cx"> return acquirePaintingResource(context, scalingFactor, parent()->renderer(), style);
</span><span class="cx"> }
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> releasePaintingResource(context, /* path */nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TextRun SVGInlineTextBox::constructTextRun(RenderStyle* style, const SVGTextFragment& fragment) const
</del><ins>+TextRun SVGInlineTextBox::constructTextRun(const RenderStyle* style, const SVGTextFragment& fragment) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(style);
</span><span class="cx">
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> ASSERT(!m_paintingResource);
</span><span class="cx"> ASSERT(m_paintingResourceMode != ApplyToDefaultMode);
</span><span class="cx">
</span><del>- RenderStyle& decorationStyle = decorationRenderer.style();
</del><ins>+ auto& decorationStyle = decorationRenderer.style();
</ins><span class="cx">
</span><span class="cx"> float scalingFactor = 1;
</span><span class="cx"> FontCascade scaledFont;
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> releasePaintingResource(contextPtr, &path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGInlineTextBox::paintTextWithShadows(GraphicsContext& context, RenderStyle* style, TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition)
</del><ins>+void SVGInlineTextBox::paintTextWithShadows(GraphicsContext& context, const RenderStyle* style, TextRun& textRun, const SVGTextFragment& fragment, int startPosition, int endPosition)
</ins><span class="cx"> {
</span><span class="cx"> float scalingFactor = renderer().scalingFactor();
</span><span class="cx"> ASSERT(scalingFactor);
</span><span class="lines">@@ -585,7 +585,7 @@
</span><span class="cx"> } while (shadow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGInlineTextBox::paintText(GraphicsContext& context, RenderStyle* style, RenderStyle* selectionStyle, const SVGTextFragment& fragment, bool hasSelection, bool paintSelectedTextOnly)
</del><ins>+void SVGInlineTextBox::paintText(GraphicsContext& context, const RenderStyle* style, const RenderStyle* selectionStyle, const SVGTextFragment& fragment, bool hasSelection, bool paintSelectedTextOnly)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(style);
</span><span class="cx"> ASSERT(selectionStyle);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -64,23 +64,23 @@
</span><span class="cx"> void setStartsNewTextChunk(bool newTextChunk) { m_startsNewTextChunk = newTextChunk; }
</span><span class="cx">
</span><span class="cx"> int offsetForPositionInFragment(const SVGTextFragment&, float position, bool includePartialGlyphs) const;
</span><del>- FloatRect selectionRectForTextFragment(const SVGTextFragment&, int fragmentStartPosition, int fragmentEndPosition, RenderStyle*) const;
</del><ins>+ FloatRect selectionRectForTextFragment(const SVGTextFragment&, int fragmentStartPosition, int fragmentEndPosition, const RenderStyle*) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool isSVGInlineTextBox() const override { return true; }
</span><span class="cx">
</span><del>- TextRun constructTextRun(RenderStyle*, const SVGTextFragment&) const;
</del><ins>+ TextRun constructTextRun(const RenderStyle*, const SVGTextFragment&) const;
</ins><span class="cx">
</span><del>- bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderBoxModelObject&, RenderStyle*);
</del><ins>+ bool acquirePaintingResource(GraphicsContext*&, float scalingFactor, RenderBoxModelObject&, const RenderStyle*);
</ins><span class="cx"> void releasePaintingResource(GraphicsContext*&, const Path*);
</span><span class="cx">
</span><del>- bool prepareGraphicsContextForTextPainting(GraphicsContext*&, float scalingFactor, RenderStyle*);
</del><ins>+ bool prepareGraphicsContextForTextPainting(GraphicsContext*&, float scalingFactor, const RenderStyle*);
</ins><span class="cx"> void restoreGraphicsContextAfterTextPainting(GraphicsContext*&);
</span><span class="cx">
</span><span class="cx"> void paintDecoration(GraphicsContext&, TextDecoration, const SVGTextFragment&);
</span><span class="cx"> void paintDecorationWithStyle(GraphicsContext&, TextDecoration, const SVGTextFragment&, RenderBoxModelObject& decorationRenderer);
</span><del>- void paintTextWithShadows(GraphicsContext&, RenderStyle*, TextRun&, const SVGTextFragment&, int startPosition, int endPosition);
- void paintText(GraphicsContext&, RenderStyle*, RenderStyle* selectionStyle, const SVGTextFragment&, bool hasSelection, bool paintSelectedTextOnly);
</del><ins>+ void paintTextWithShadows(GraphicsContext&, const RenderStyle*, TextRun&, const SVGTextFragment&, int startPosition, int endPosition);
+ void paintText(GraphicsContext&, const RenderStyle*, const RenderStyle* selectionStyle, const SVGTextFragment&, bool hasSelection, bool paintSelectedTextOnly);
</ins><span class="cx">
</span><span class="cx"> bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGPathDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGPathData.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGPathData.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/svg/SVGPathData.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> RenderElement* renderer = element->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx"> float r = lengthContext.valueForLength(style.svgStyle().r());
</span><span class="cx"> if (r > 0) {
</span><span class="cx"> float cx = lengthContext.valueForLength(style.svgStyle().cx(), LengthModeWidth);
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> RenderElement* renderer = element->renderer();
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx"> SVGLengthContext lengthContext(element);
</span><span class="cx"> float rx = lengthContext.valueForLength(style.svgStyle().rx(), LengthModeWidth);
</span><span class="cx"> if (rx <= 0)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx"> SVGLengthContext lengthContext(element);
</span><span class="cx"> float width = lengthContext.valueForLength(style.width(), LengthModeWidth);
</span><span class="cx"> if (width <= 0)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_renderingFlags |= RestoreGraphicsContext;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderStyle& style = m_renderer->style();
</del><ins>+ auto& style = m_renderer->style();
</ins><span class="cx">
</span><span class="cx"> const SVGRenderStyle& svgStyle = style.svgStyle();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TreeResolver::Parent::Parent(Element& element, RenderStyle& style, Change change)
</del><ins>+TreeResolver::Parent::Parent(Element& element, const RenderStyle& style, Change change)
</ins><span class="cx"> : element(&element)
</span><span class="cx"> , style(style)
</span><span class="cx"> , change(change)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> return m_scopeStack.removeLast();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<RenderStyle> TreeResolver::styleForElement(Element& element, RenderStyle& inheritedStyle)
</del><ins>+std::unique_ptr<RenderStyle> TreeResolver::styleForElement(Element& element, const RenderStyle& inheritedStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_document.haveStylesheetsLoaded() && !element.renderer()) {
</span><span class="cx"> m_document.setHasNodesWithPlaceholderStyle();
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return VISIBLE;
</span><span class="cx">
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx">
</span><span class="cx"> Length width(style.width());
</span><span class="cx"> Length height(style.height());
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">
</span><span class="cx"> class CheckForVisibilityChangeOnRecalcStyle {
</span><span class="cx"> public:
</span><del>- CheckForVisibilityChangeOnRecalcStyle(Element* element, RenderStyle* currentStyle)
</del><ins>+ CheckForVisibilityChangeOnRecalcStyle(Element* element, const RenderStyle* currentStyle)
</ins><span class="cx"> : m_element(element)
</span><span class="cx"> , m_previousDisplay(currentStyle ? currentStyle->display() : NONE)
</span><span class="cx"> , m_previousVisibility(currentStyle ? currentStyle->visibility() : HIDDEN)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> return;
</span><span class="cx"> if (m_element->isInUserAgentShadowTree())
</span><span class="cx"> return;
</span><del>- RenderStyle* style = m_element->renderStyle();
</del><ins>+ auto* style = m_element->renderStyle();
</ins><span class="cx"> if (!style)
</span><span class="cx"> return;
</span><span class="cx"> if ((m_previousDisplay == NONE && style->display() != NONE) || (m_previousVisibility == HIDDEN && style->visibility() != HIDDEN)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><del>-void TreeResolver::pushParent(Element& element, RenderStyle& style, Change change)
</del><ins>+void TreeResolver::pushParent(Element& element, const RenderStyle& style, Change change)
</ins><span class="cx"> {
</span><span class="cx"> scope().selectorFilter.pushParent(&element);
</span><span class="cx">
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldResolveForPseudoElement = shouldResolvePseudoElement(element.beforePseudoElement()) || shouldResolvePseudoElement(element.afterPseudoElement());
</span><span class="cx">
</span><del>- RenderStyle* style;
</del><ins>+ const RenderStyle* style;
</ins><span class="cx"> Change change;
</span><span class="cx">
</span><span class="cx"> bool shouldResolve = parent.change >= Inherit || element.needsStyleRecalc() || shouldResolveForPseudoElement || affectedByPreviousSibling || element.hasDisplayContents();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/style/StyleTreeResolver.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> std::unique_ptr<Update> resolve(Change);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- std::unique_ptr<RenderStyle> styleForElement(Element&, RenderStyle& inheritedStyle);
</del><ins>+ std::unique_ptr<RenderStyle> styleForElement(Element&, const RenderStyle& inheritedStyle);
</ins><span class="cx">
</span><span class="cx"> void resolveComposedTree();
</span><span class="cx"> ElementUpdate resolveElement(Element&);
</span><span class="lines">@@ -79,13 +79,13 @@
</span><span class="cx">
</span><span class="cx"> struct Parent {
</span><span class="cx"> Element* element;
</span><del>- RenderStyle& style;
</del><ins>+ const RenderStyle& style;
</ins><span class="cx"> Change change;
</span><span class="cx"> bool didPushScope { false };
</span><span class="cx"> bool elementNeedingStyleRecalcAffectsNextSiblingElementStyle { false };
</span><span class="cx">
</span><span class="cx"> Parent(Document&, Change);
</span><del>- Parent(Element&, RenderStyle&, Change);
</del><ins>+ Parent(Element&, const RenderStyle&, Change);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Scope& scope() { return m_scopeStack.last(); }
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void pushEnclosingScope();
</span><span class="cx"> void popScope();
</span><span class="cx">
</span><del>- void pushParent(Element&, RenderStyle&, Change);
</del><ins>+ void pushParent(Element&, const RenderStyle&, Change);
</ins><span class="cx"> void popParent();
</span><span class="cx"> void popParentsToDepth(unsigned depth);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleUpdatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleUpdate.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleUpdate.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/style/StyleUpdate.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -61,13 +61,26 @@
</span><span class="cx"> return m_texts.contains(&text);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* Update::elementStyle(const Element& element) const
</del><ins>+const RenderStyle* Update::elementStyle(const Element& element) const
</ins><span class="cx"> {
</span><span class="cx"> if (auto* update = elementUpdate(element))
</span><span class="cx"> return update->style.get();
</span><del>- return element.renderStyle();
</del><ins>+ auto* renderer = element.renderer();
+ if (!renderer)
+ return nullptr;
+ return &renderer->style();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+RenderStyle* Update::elementStyle(const Element& element)
+{
+ if (auto* update = elementUpdate(element))
+ return update->style.get();
+ auto* renderer = element.renderer();
+ if (!renderer)
+ return nullptr;
+ return &renderer->mutableStyle();
+}
+
</ins><span class="cx"> void Update::addElement(Element& element, Element* parent, ElementUpdate&& elementUpdate)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_elements.contains(&element));
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleUpdateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleUpdate.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleUpdate.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/style/StyleUpdate.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -63,7 +63,8 @@
</span><span class="cx">
</span><span class="cx"> bool textUpdate(const Text&) const;
</span><span class="cx">
</span><del>- RenderStyle* elementStyle(const Element&) const;
</del><ins>+ const RenderStyle* elementStyle(const Element&) const;
+ RenderStyle* elementStyle(const Element&);
</ins><span class="cx">
</span><span class="cx"> const Document& document() const { return m_document; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> contextElement->synchronizeSystemLanguage();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Optional<ElementStyle> SVGElement::resolveCustomStyle(RenderStyle& parentStyle, RenderStyle*)
</del><ins>+Optional<ElementStyle> SVGElement::resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle*)
</ins><span class="cx"> {
</span><span class="cx"> // If the element is in a <use> tree we get the style from the definition tree.
</span><span class="cx"> if (auto* styleElement = this->correspondingElement())
</span><span class="lines">@@ -773,12 +773,12 @@
</span><span class="cx"> m_svgRareData->setUseOverrideComputedStyle(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderStyle* SVGElement::computedStyle(PseudoId pseudoElementSpecifier)
</del><ins>+const RenderStyle* SVGElement::computedStyle(PseudoId pseudoElementSpecifier)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_svgRareData || !m_svgRareData->useOverrideComputedStyle())
</span><span class="cx"> return Element::computedStyle(pseudoElementSpecifier);
</span><span class="cx">
</span><del>- RenderStyle* parentStyle = nullptr;
</del><ins>+ const RenderStyle* parentStyle = nullptr;
</ins><span class="cx"> if (Element* parent = parentOrShadowHostElement()) {
</span><span class="cx"> if (auto renderer = parent->renderer())
</span><span class="cx"> parentStyle = &renderer->style();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGElement.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> void synchronizeAnimatedSVGAttribute(const QualifiedName&) const;
</span><span class="cx"> static void synchronizeAllAnimatedSVGAttribute(SVGElement*);
</span><span class="cx">
</span><del>- Optional<ElementStyle> resolveCustomStyle(RenderStyle& parentStyle, RenderStyle* shadowHostStyle) override;
</del><ins>+ Optional<ElementStyle> resolveCustomStyle(const RenderStyle& parentStyle, const RenderStyle* shadowHostStyle) override;
</ins><span class="cx">
</span><span class="cx"> static void synchronizeRequiredFeatures(SVGElement* contextElement);
</span><span class="cx"> static void synchronizeRequiredExtensions(SVGElement* contextElement);
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> class InstanceInvalidationGuard;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RenderStyle* computedStyle(PseudoId = NOPSEUDO) final;
</del><ins>+ const RenderStyle* computedStyle(PseudoId = NOPSEUDO) final;
</ins><span class="cx">
</span><span class="cx"> virtual bool isSupported(StringImpl* feature, StringImpl* version) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElementRareData.h (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElementRareData.h 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGElementRareData.h 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> return *m_animatedSMILStyleProperties;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RenderStyle* overrideComputedStyle(Element& element, RenderStyle* parentStyle)
</del><ins>+ const RenderStyle* overrideComputedStyle(Element& element, const RenderStyle* parentStyle)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_useOverrideComputedStyle)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> if (!m_overrideComputedStyle || m_needsOverrideComputedStyleUpdate) {
</span><span class="cx"> // The style computed here contains no CSS Animations/Transitions or SMIL induced rules - this is needed to compute the "base value" for the SMIL animation sandwhich model.
</span><span class="cx"> m_overrideComputedStyle = element.styleResolver().styleForElement(element, parentStyle, MatchAllRulesExcludingSMIL).renderStyle;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGGraphicsElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGGraphicsElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGGraphicsElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGGraphicsElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> AffineTransform SVGGraphicsElement::animatedLocalTransform() const
</span><span class="cx"> {
</span><span class="cx"> AffineTransform matrix;
</span><del>- RenderStyle* style = renderer() ? &renderer()->style() : nullptr;
</del><ins>+ auto* style = renderer() ? &renderer()->style() : nullptr;
</ins><span class="cx">
</span><span class="cx"> // If CSS property was set, use that, otherwise fallback to attribute (if set).
</span><span class="cx"> if (style && style->hasTransform()) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGLengthContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGLengthContext.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGLengthContext.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGLengthContext.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RenderStyle* renderStyleForLengthResolving(const SVGElement* context)
</del><ins>+static inline const RenderStyle* renderStyleForLengthResolving(const SVGElement* context)
</ins><span class="cx"> {
</span><span class="cx"> if (!context)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -236,12 +236,12 @@
</span><span class="cx">
</span><span class="cx"> // There must be at least a RenderSVGRoot renderer, carrying a style.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float SVGLengthContext::convertValueFromUserUnitsToEMS(float value, ExceptionCode& ec) const
</span><span class="cx"> {
</span><del>- RenderStyle* style = renderStyleForLengthResolving(m_context);
</del><ins>+ auto* style = renderStyleForLengthResolving(m_context);
</ins><span class="cx"> if (!style) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> float SVGLengthContext::convertValueFromEMSToUserUnits(float value, ExceptionCode& ec) const
</span><span class="cx"> {
</span><del>- RenderStyle* style = renderStyleForLengthResolving(m_context);
</del><ins>+ auto* style = renderStyleForLengthResolving(m_context);
</ins><span class="cx"> if (!style) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> float SVGLengthContext::convertValueFromUserUnitsToEXS(float value, ExceptionCode& ec) const
</span><span class="cx"> {
</span><del>- RenderStyle* style = renderStyleForLengthResolving(m_context);
</del><ins>+ auto* style = renderStyleForLengthResolving(m_context);
</ins><span class="cx"> if (!style) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return 0;
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx">
</span><span class="cx"> float SVGLengthContext::convertValueFromEXSToUserUnits(float value, ExceptionCode& ec) const
</span><span class="cx"> {
</span><del>- RenderStyle* style = renderStyleForLengthResolving(m_context);
</del><ins>+ auto* style = renderStyleForLengthResolving(m_context);
</ins><span class="cx"> if (!style) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGStopElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGStopElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGStopElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGStopElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> Color SVGStopElement::stopColorIncludingOpacity() const
</span><span class="cx"> {
</span><del>- RenderStyle* style = renderer() ? &renderer()->style() : nullptr;
</del><ins>+ auto* style = renderer() ? &renderer()->style() : nullptr;
</ins><span class="cx"> // FIXME: This check for null style exists to address Bug WK 90814, a rare crash condition in
</span><span class="cx"> // which the renderer or style is null. This entire class is scheduled for removal (Bug WK 86941)
</span><span class="cx"> // and we will tolerate this null check until then.
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTextElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTextElement.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTextElement.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebCore/svg/SVGTextElement.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> AffineTransform SVGTextElement::animatedLocalTransform() const
</span><span class="cx"> {
</span><span class="cx"> AffineTransform matrix;
</span><del>- RenderStyle* style = renderer() ? &renderer()->style() : nullptr;
</del><ins>+ auto* style = renderer() ? &renderer()->style() : nullptr;
</ins><span class="cx">
</span><span class="cx"> // if CSS property was set, use that, otherwise fallback to attribute (if set)
</span><span class="cx"> if (style && style->hasTransform()) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> auto& postLayoutData = result.postLayoutData();
</span><span class="cx"> if (!selection.isNone()) {
</span><span class="cx"> Node* nodeToRemove;
</span><del>- if (RenderStyle* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) {
</del><ins>+ if (auto* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) {
</ins><span class="cx"> if (style->fontCascade().weight() >= FontWeightBold)
</span><span class="cx"> postLayoutData.typingAttributes |= AttributeBold;
</span><span class="cx"> if (style->fontCascade().italic() == FontItalicOn)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (200097 => 200098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-26 17:46:23 UTC (rev 200097)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-04-26 18:20:09 UTC (rev 200098)
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx"> if (!renderer)
</span><span class="cx"> return FloatQuad();
</span><span class="cx">
</span><del>- RenderStyle& style = renderer->style();
</del><ins>+ auto& style = renderer->style();
</ins><span class="cx"> IntRect boundingBox = renderer->absoluteBoundingBoxRect(true /* use transforms*/);
</span><span class="cx">
</span><span class="cx"> boundingBox.move(style.borderLeftWidth(), style.borderTopWidth());
</span></span></pre>
</div>
</div>
</body>
</html>