<!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>[210768] trunk/Source/WebCore</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/210768">210768</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-14 10:45:20 -0800 (Sat, 14 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Renderers should have a simple way to access Settings.
https://bugs.webkit.org/show_bug.cgi?id=167048
Now that RenderObjects can never outlive the Page, we can just access the Settings
through Page instead of Document::settings/Frame::settings.
Reviewed by Andreas Kling.
No change in functionality.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintCaret):
(WebCore::RenderBlock::shouldPaintSelectionGaps):
* rendering/RenderBlockFlow.cpp:
(WebCore::needsAppleMailPaginationQuirk):
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::startAlignedOffsetForLine):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::willBeRemovedFromTree):
(WebCore::RenderElement::shouldRespectImageOrientation):
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::flattenFrameSet):
* rendering/RenderIFrame.cpp:
(WebCore::RenderIFrame::flattenFrame):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::paintIntoRect):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::addChildIgnoringContinuation):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::acceleratedCompositingForOverflowScrollEnabled):
(WebCore::RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
(WebCore::RenderLayer::hasAcceleratedTouchScrolling):
(WebCore::RenderLayer::getRectToExpose):
(WebCore::RenderLayer::overhangAmount):
(WebCore::RenderLayer::setHasHorizontalScrollbar):
(WebCore::RenderLayer::setHasVerticalScrollbar):
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::RenderLayerBacking):
(WebCore::RenderLayerBacking::shouldAggressivelyRetainTiles):
(WebCore::RenderLayerBacking::shouldTemporarilyRetainTileCohorts):
(WebCore::RenderLayerBacking::useGiantTiles):
(WebCore::RenderLayerBacking::startAnimation):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
(WebCore::RenderLayerCompositor::updateBacking):
(WebCore::RenderLayerCompositor::addToOverlapMap):
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
(WebCore::RenderLayerCompositor::needsFixedRootBackgroundLayer):
(WebCore::RenderLayerCompositor::requiresContentShadowLayer):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::shouldPlaceBlockDirectionScrollbarOnLeft):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
* rendering/RenderObject.h:
(WebCore::RenderObject::settings):
* rendering/RenderText.cpp:
(WebCore::SecureTextTimer::restart):
* rendering/RenderView.cpp:
(WebCore::RenderView::clientLogicalWidthForFixedPosition):
(WebCore::RenderView::clientLogicalHeightForFixedPosition):
(WebCore::RenderView::paintBoxDecorations):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForWithReason):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::applyResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameSetcpp">trunk/Source/WebCore/rendering/RenderFrameSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderIFramecpp">trunk/Source/WebCore/rendering/RenderIFrame.cpp</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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/ChangeLog 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -1,3 +1,83 @@
</span><ins>+2017-01-14 Zalan Bujtas <zalan@apple.com>
+
+ Renderers should have a simple way to access Settings.
+ https://bugs.webkit.org/show_bug.cgi?id=167048
+
+ Now that RenderObjects can never outlive the Page, we can just access the Settings
+ through Page instead of Document::settings/Frame::settings.
+
+ Reviewed by Andreas Kling.
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintCaret):
+ (WebCore::RenderBlock::shouldPaintSelectionGaps):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::needsAppleMailPaginationQuirk):
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::startAlignedOffsetForLine):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleWillChange):
+ (WebCore::RenderElement::willBeRemovedFromTree):
+ (WebCore::RenderElement::shouldRespectImageOrientation):
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
+ * rendering/RenderFrameSet.cpp:
+ (WebCore::RenderFrameSet::flattenFrameSet):
+ * rendering/RenderIFrame.cpp:
+ (WebCore::RenderIFrame::flattenFrame):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::paintIntoRect):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::addChildIgnoringContinuation):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::acceleratedCompositingForOverflowScrollEnabled):
+ (WebCore::RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+ (WebCore::RenderLayer::hasAcceleratedTouchScrolling):
+ (WebCore::RenderLayer::getRectToExpose):
+ (WebCore::RenderLayer::overhangAmount):
+ (WebCore::RenderLayer::setHasHorizontalScrollbar):
+ (WebCore::RenderLayer::setHasVerticalScrollbar):
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::RenderLayerBacking):
+ (WebCore::RenderLayerBacking::shouldAggressivelyRetainTiles):
+ (WebCore::RenderLayerBacking::shouldTemporarilyRetainTileCohorts):
+ (WebCore::RenderLayerBacking::useGiantTiles):
+ (WebCore::RenderLayerBacking::startAnimation):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
+ (WebCore::RenderLayerCompositor::updateBacking):
+ (WebCore::RenderLayerCompositor::addToOverlapMap):
+ (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+ (WebCore::RenderLayerCompositor::needsFixedRootBackgroundLayer):
+ (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::shouldPlaceBlockDirectionScrollbarOnLeft):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::settings):
+ * rendering/RenderText.cpp:
+ (WebCore::SecureTextTimer::restart):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::clientLogicalWidthForFixedPosition):
+ (WebCore::RenderView::clientLogicalHeightForFixedPosition):
+ (WebCore::RenderView::paintBoxDecorations):
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForWithReason):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::applyResource):
+
</ins><span class="cx"> 2017-01-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align the innerText setter with the HTML spec and Gecko
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -1636,7 +1636,6 @@
</span><span class="cx"> void RenderBlock::paintCaret(PaintInfo& paintInfo, const LayoutPoint& paintOffset, CaretType type)
</span><span class="cx"> {
</span><span class="cx"> // Paint the caret if the FrameSelection says so or if caret browsing is enabled
</span><del>- bool caretBrowsing = frame().settings().caretBrowsingEnabled();
</del><span class="cx"> RenderBlock* caretPainter;
</span><span class="cx"> bool isContentEditable;
</span><span class="cx"> if (type == CursorCaret) {
</span><span class="lines">@@ -1647,7 +1646,7 @@
</span><span class="cx"> isContentEditable = page().dragCaretController().isContentEditable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (caretPainter == this && (isContentEditable || caretBrowsing)) {
</del><ins>+ if (caretPainter == this && (isContentEditable || settings().caretBrowsingEnabled())) {
</ins><span class="cx"> if (type == CursorCaret)
</span><span class="cx"> frame().selection().paintCaret(paintInfo.context(), paintOffset, paintInfo.rect);
</span><span class="cx"> else
</span><span class="lines">@@ -1843,7 +1842,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBlock::shouldPaintSelectionGaps() const
</span><span class="cx"> {
</span><del>- if (frame().settings().selectionPaintingWithoutSelectionGapsEnabled())
</del><ins>+ if (settings().selectionPaintingWithoutSelectionGapsEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return selectionState() != SelectionNone && style().visibility() == VISIBLE && isSelectionRoot();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -1672,14 +1672,11 @@
</span><span class="cx">
</span><span class="cx"> static inline bool needsAppleMailPaginationQuirk(RootInlineBox& lineBox)
</span><span class="cx"> {
</span><del>- const auto& renderer = lineBox.renderer();
</del><ins>+ auto& renderer = lineBox.renderer();
</ins><span class="cx">
</span><del>- if (!renderer.document().settings())
</del><ins>+ if (!renderer.settings().appleMailPaginationQuirkEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!renderer.document().settings()->appleMailPaginationQuirkEnabled())
- return false;
-
</del><span class="cx"> if (renderer.element() && renderer.element()->idForStyleResolution() == "messageContentContainer")
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -2263,7 +2263,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=124522
</span><span class="cx"> // This quirk is for legacy content that doesn't work properly with the center positioning scheme
</span><span class="cx"> // being honored (e.g., epubs).
</span><del>- if (shouldApplyIndentText || document().settings()->useLegacyTextAlignPositionedElementBehavior()) // FIXME: Handle TAEND here
</del><ins>+ if (shouldApplyIndentText || settings().useLegacyTextAlignPositionedElementBehavior()) // FIXME: Handle TAEND here
</ins><span class="cx"> return startOffsetForLine(position, shouldIndentText);
</span><span class="cx">
</span><span class="cx"> // updateLogicalWidthForAlignment() handles the direction of the block so no need to consider it here
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -4918,7 +4918,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasTransform = this->hasTransform();
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- if (isInFlowPositioned() || (hasTransform && document().settings()->shouldTransformsAffectOverflow())) {
</del><ins>+ if (isInFlowPositioned() || (hasTransform && settings().shouldTransformsAffectOverflow())) {
</ins><span class="cx"> #else
</span><span class="cx"> if (isInFlowPositioned() || hasTransform) {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> if (document().printing()) {
</span><span class="cx"> if (style().printColorAdjust() == PrintColorAdjustEconomy)
</span><span class="cx"> forceBackgroundToWhite = true;
</span><del>- if (frame().settings().shouldPrintBackgrounds())
</del><ins>+ if (settings().shouldPrintBackgrounds())
</ins><span class="cx"> forceBackgroundToWhite = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1110,7 +1110,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> LayoutRect viewportRect;
</span><span class="cx"> float topContentInset = 0;
</span><del>- if (frame().settings().fixedBackgroundsPaintRelativeToDocument())
</del><ins>+ if (settings().fixedBackgroundsPaintRelativeToDocument())
</ins><span class="cx"> viewportRect = view().unscaledDocumentRect();
</span><span class="cx"> else {
</span><span class="cx"> FrameView& frameView = view().frameView();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -905,8 +905,7 @@
</span><span class="cx"> bool newStyleUsesFixedBackgrounds = newStyle.hasFixedBackgroundImage();
</span><span class="cx"> bool oldStyleUsesFixedBackgrounds = m_style.hasFixedBackgroundImage();
</span><span class="cx"> if (newStyleUsesFixedBackgrounds || oldStyleUsesFixedBackgrounds) {
</span><del>- bool repaintFixedBackgroundsOnScroll = !frame().settings().fixedBackgroundsPaintRelativeToDocument();
-
</del><ins>+ bool repaintFixedBackgroundsOnScroll = !settings().fixedBackgroundsPaintRelativeToDocument();
</ins><span class="cx"> bool newStyleSlowScroll = repaintFixedBackgroundsOnScroll && newStyleUsesFixedBackgrounds;
</span><span class="cx"> bool oldStyleSlowScroll = oldStyle && repaintFixedBackgroundsOnScroll && oldStyleUsesFixedBackgrounds;
</span><span class="cx"> bool drawsRootBackground = isDocumentElementRenderer() || (isBody() && !rendererHasBackground(document().documentElement()->renderer()));
</span><span class="lines">@@ -1088,7 +1087,7 @@
</span><span class="cx"> removeLayers(layer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_style.hasFixedBackgroundImage() && !frame().settings().fixedBackgroundsPaintRelativeToDocument())
</del><ins>+ if (m_style.hasFixedBackgroundImage() && !settings().fixedBackgroundsPaintRelativeToDocument())
</ins><span class="cx"> view().frameView().removeSlowRepaintObject(this);
</span><span class="cx">
</span><span class="cx"> if (isOutOfFlowPositioned() && parent()->childrenInline())
</span><span class="lines">@@ -2163,7 +2162,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> // Respect the image's orientation if it's being used as a full-page image or it's
</span><span class="cx"> // an <img> and the setting to respect it everywhere is set.
</span><del>- return (frame().settings().shouldRespectImageOrientation() && is<HTMLImageElement>(element())) ? RespectImageOrientation : DoNotRespectImageOrientation;
</del><ins>+ return settings().shouldRespectImageOrientation() && is<HTMLImageElement>(element()) ? RespectImageOrientation : DoNotRespectImageOrientation;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderElement::adjustFlowThreadStateOnContainingBlockChangeIfNeeded()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -354,7 +354,7 @@
</span><span class="cx"> FontCascadeDescription fontDescription;
</span><span class="cx"> RenderTheme::defaultTheme()->systemFont(CSSValueWebkitSmallControl, fontDescription);
</span><span class="cx"> fontDescription.setWeight(FontWeightBold);
</span><del>- fontDescription.setRenderingMode(frame().settings().fontRenderingMode());
</del><ins>+ fontDescription.setRenderingMode(settings().fontRenderingMode());
</ins><span class="cx"> fontDescription.setComputedSize(12);
</span><span class="cx"> font = FontCascade(fontDescription, 0, 0);
</span><span class="cx"> font.update(0);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderFrameSet::flattenFrameSet() const
</span><span class="cx"> {
</span><del>- return frame().settings().frameFlatteningEnabled();
</del><ins>+ return settings().frameFlatteningEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFrameSet::startResizing(GridAxis& axis, int position)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderIFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderIFrame.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderIFrame.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderIFrame.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -71,9 +71,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderIFrame::flattenFrame() const
</span><span class="cx"> {
</span><del>- bool enabled = frame().settings().frameFlatteningEnabled();
-
- if (!enabled)
</del><ins>+ if (!settings().frameFlatteningEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (style().width().isFixed() && style().height().isFixed()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> if (is<PDFDocumentImage>(image))
</span><del>- downcast<PDFDocumentImage>(*image).setPdfImageCachingPolicy(frame().settings().pdfImageCachingPolicy());
</del><ins>+ downcast<PDFDocumentImage>(*image).setPdfImageCachingPolicy(settings().pdfImageCachingPolicy());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ImageOrientationDescription orientationDescription(shouldRespectImageOrientation(), style().imageOrientation());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> if (!beforeChild && isAfterContent(lastChild()))
</span><span class="cx"> beforeChild = lastChild();
</span><span class="cx">
</span><del>- bool useNewBlockInsideInlineModel = document().settings()->newBlockInsideInlineModelEnabled();
</del><ins>+ bool useNewBlockInsideInlineModel = settings().newBlockInsideInlineModelEnabled();
</ins><span class="cx"> bool childInline = newChildIsInline(*newChild, *this);
</span><span class="cx"> // This code is for the old block-inside-inline model that uses continuations.
</span><span class="cx"> if (!useNewBlockInsideInlineModel && !childInline && !newChild->isFloatingOrOutOfFlowPositioned()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::acceleratedCompositingForOverflowScrollEnabled() const
</span><span class="cx"> {
</span><del>- return renderer().frame().settings().acceleratedCompositingForOverflowScrollEnabled();
</del><ins>+ return renderer().settings().acceleratedCompositingForOverflowScrollEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we are a stacking container, then this function will determine if our
</span><span class="lines">@@ -1523,7 +1523,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
</span><span class="cx"> {
</span><del>- return renderer().frame().settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
</del><ins>+ return renderer().settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderLayer* RenderLayer::enclosingTransformedAncestor() const
</span><span class="lines">@@ -2163,13 +2163,7 @@
</span><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx"> if (!scrollsOverflow())
</span><span class="cx"> return false;
</span><del>-
- Settings* settings = renderer().document().settings();
- // FIXME: settings should not be null at this point. If you find a reliable way to hit this assertion, please file a bug.
- // See <rdar://problem/10266101>.
- ASSERT(settings);
-
- return renderer().style().useTouchOverflowScrolling() || (settings && settings->alwaysUseAcceleratedOverflowScroll());
</del><ins>+ return renderer().style().useTouchOverflowScrolling() || renderer().settings().alwaysUseAcceleratedOverflowScroll();
</ins><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -2613,7 +2607,7 @@
</span><span class="cx"> if (frameView.frameScaleFactor() == 1)
</span><span class="cx"> return visibleRect;
</span><span class="cx">
</span><del>- if (frameView.frame().settings().visualViewportEnabled()) {
</del><ins>+ if (renderer().settings().visualViewportEnabled()) {
</ins><span class="cx"> // exposeRect is in absolute coords, affected by page scale. Unscale it.
</span><span class="cx"> LayoutRect unscaledExposeRect = exposeRect;
</span><span class="cx"> unscaledExposeRect.scale(1 / frameView.frameScaleFactor());
</span><span class="lines">@@ -2821,7 +2815,7 @@
</span><span class="cx"> IntSize RenderLayer::overhangAmount() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (!renderer().frame().settings().rubberBandingForSubScrollableRegionsEnabled())
</del><ins>+ if (!renderer().settings().rubberBandingForSubScrollableRegionsEnabled())
</ins><span class="cx"> return IntSize();
</span><span class="cx">
</span><span class="cx"> IntSize stretch;
</span><span class="lines">@@ -3187,7 +3181,7 @@
</span><span class="cx"> if (hasScrollbar) {
</span><span class="cx"> m_hBar = createScrollbar(HorizontalScrollbar);
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- ScrollElasticity elasticity = scrollsOverflow() && renderer().frame().settings().rubberBandingForSubScrollableRegionsEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone;
</del><ins>+ ScrollElasticity elasticity = scrollsOverflow() && renderer().settings().rubberBandingForSubScrollableRegionsEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone;
</ins><span class="cx"> ScrollableArea::setHorizontalScrollElasticity(elasticity);
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="lines">@@ -3218,7 +3212,7 @@
</span><span class="cx"> if (hasScrollbar) {
</span><span class="cx"> m_vBar = createScrollbar(VerticalScrollbar);
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- ScrollElasticity elasticity = scrollsOverflow() && renderer().frame().settings().rubberBandingForSubScrollableRegionsEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone;
</del><ins>+ ScrollElasticity elasticity = scrollsOverflow() && renderer().settings().rubberBandingForSubScrollableRegionsEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone;
</ins><span class="cx"> ScrollableArea::setVerticalScrollElasticity(elasticity);
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="lines">@@ -6998,11 +6992,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FilterInfo& filterInfo = FilterInfo::get(*this);
</span><del>- Frame& frame = renderer().frame();
</del><span class="cx"> if (!filterInfo.renderer()) {
</span><span class="cx"> RefPtr<FilterEffectRenderer> filterRenderer = FilterEffectRenderer::create();
</span><span class="cx"> filterRenderer->setFilterScale(page().deviceScaleFactor());
</span><del>- filterRenderer->setRenderingMode(frame.settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated);
</del><ins>+ filterRenderer->setRenderingMode(renderer().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated);
</ins><span class="cx"> filterInfo.setRenderer(WTFMove(filterRenderer));
</span><span class="cx">
</span><span class="cx"> // We can optimize away code paths in other places if we know that there are no software filters.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> if (m_isMainFrameRenderViewLayer)
</span><span class="cx"> tiledBacking->setUnparentsOffscreenTiles(true);
</span><span class="cx">
</span><del>- tiledBacking->setScrollingPerformanceLoggingEnabled(renderer().page().settings().scrollingPerformanceLoggingEnabled());
</del><ins>+ tiledBacking->setScrollingPerformanceLoggingEnabled(renderer().settings().scrollingPerformanceLoggingEnabled());
</ins><span class="cx"> adjustTiledBackingCoverage();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2518,17 +2518,17 @@
</span><span class="cx"> if (!m_isMainFrameRenderViewLayer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return renderer().frame().settings().aggressiveTileRetentionEnabled();
</del><ins>+ return renderer().settings().aggressiveTileRetentionEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerBacking::shouldTemporarilyRetainTileCohorts(const GraphicsLayer*) const
</span><span class="cx"> {
</span><del>- return renderer().frame().settings().temporaryTileCohortRetentionEnabled();
</del><ins>+ return renderer().settings().temporaryTileCohortRetentionEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayerBacking::useGiantTiles() const
</span><span class="cx"> {
</span><del>- return renderer().frame().settings().useGiantTiles();
</del><ins>+ return renderer().settings().useGiantTiles();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -2586,7 +2586,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!renderer().frame().settings().acceleratedCompositedAnimationsEnabled())
</del><ins>+ if (!renderer().settings().acceleratedCompositedAnimationsEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool didAnimate = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> bool acceleratedDrawingEnabled = false;
</span><span class="cx"> bool displayListDrawingEnabled = false;
</span><span class="cx">
</span><del>- const Settings& settings = m_renderView.frameView().frame().settings();
</del><ins>+ auto& settings = m_renderView.settings();
</ins><span class="cx"> hasAcceleratedCompositing = settings.acceleratedCompositingEnabled();
</span><span class="cx">
</span><span class="cx"> // We allow the chrome to override the settings, in case the page is rendered
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> updateLayerForHeader(page().headerHeight());
</span><span class="cx"> updateLayerForFooter(page().footerHeight());
</span><span class="cx"> #endif
</span><del>- if (m_renderView.frameView().frame().settings().backgroundShouldExtendBeyondPage())
</del><ins>+ if (m_renderView.settings().backgroundShouldExtendBeyondPage())
</ins><span class="cx"> m_rootContentLayer->setMasksToBounds(false);
</span><span class="cx">
</span><span class="cx"> if (TiledBacking* tiledBacking = layer.backing()->tiledBacking())
</span><span class="lines">@@ -1180,8 +1180,7 @@
</span><span class="cx"> LayoutRect clipRect = layer.backgroundClipRect(RenderLayer::ClipRectsContext(&rootRenderLayer(), AbsoluteClipRects)).rect(); // FIXME: Incorrect for CSS regions.
</span><span class="cx">
</span><span class="cx"> // On iOS, pageScaleFactor() is not applied by RenderView, so we should not scale here.
</span><del>- const Settings& settings = m_renderView.frameView().frame().settings();
- if (!settings.delegatesPageScaling())
</del><ins>+ if (!m_renderView.settings().delegatesPageScaling())
</ins><span class="cx"> clipRect.scale(pageScaleFactor());
</span><span class="cx"> clipRect.intersect(extent.bounds);
</span><span class="cx"> overlapMap.add(clipRect);
</span><span class="lines">@@ -2703,8 +2702,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // FIXME: acceleratedCompositingForFixedPositionEnabled should probably be renamed acceleratedCompositingForViewportConstrainedPositionEnabled().
</span><del>- const Settings& settings = m_renderView.frameView().frame().settings();
- if (!settings.acceleratedCompositingForFixedPositionEnabled())
</del><ins>+ if (!m_renderView.settings().acceleratedCompositingForFixedPositionEnabled())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (isSticky)
</span><span class="lines">@@ -2851,7 +2849,7 @@
</span><span class="cx"> if (&layer != m_renderView.layer())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (m_renderView.frameView().frame().settings().fixedBackgroundsPaintRelativeToDocument())
</del><ins>+ if (m_renderView.settings().fixedBackgroundsPaintRelativeToDocument())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> LOG(Compositing, "RenderLayerCompositor %p needsFixedRootBackgroundLayer returning %d", this, supportsFixedRootBackgroundCompositing() && m_renderView.rootBackgroundIsEntirelyFixed());
</span><span class="lines">@@ -3015,7 +3013,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // If the background is going to extend, then it doesn't make sense to have a shadow layer.
</span><del>- if (m_renderView.frameView().frame().settings().backgroundShouldExtendBeyondPage())
</del><ins>+ if (m_renderView.settings().backgroundShouldExtendBeyondPage())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // On Mac, we want a content shadow layer if we're using tiled drawing and can scroll.
</span><span class="lines">@@ -3243,7 +3241,7 @@
</span><span class="cx"> m_layerForOverhangAreas->setPosition(FloatPoint(0, topContentInset));
</span><span class="cx"> m_layerForOverhangAreas->setAnchorPoint(FloatPoint3D());
</span><span class="cx">
</span><del>- if (m_renderView.frameView().frame().settings().backgroundShouldExtendBeyondPage())
</del><ins>+ if (m_renderView.settings().backgroundShouldExtendBeyondPage())
</ins><span class="cx"> m_layerForOverhangAreas->setBackgroundColor(m_renderView.frameView().documentBackgroundColor());
</span><span class="cx"> else
</span><span class="cx"> m_layerForOverhangAreas->setCustomAppearance(GraphicsLayer::ScrollingOverhang);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -217,11 +217,11 @@
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
</span><span class="cx"> return false;
</span><span class="cx"> #else
</span><del>- switch (frame().settings().userInterfaceDirectionPolicy()) {
</del><ins>+ switch (settings().userInterfaceDirectionPolicy()) {
</ins><span class="cx"> case UserInterfaceDirectionPolicy::Content:
</span><span class="cx"> return style().shouldPlaceBlockDirectionScrollbarOnLeft();
</span><span class="cx"> case UserInterfaceDirectionPolicy::System:
</span><del>- return frame().settings().systemLayoutDirection() == RTL;
</del><ins>+ return settings().systemLayoutDirection() == RTL;
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return style().shouldPlaceBlockDirectionScrollbarOnLeft();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
</span><span class="cx"> {
</span><del>- return frame().settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
</del><ins>+ return settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollableArea* RenderListBox::enclosingScrollableArea() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "FloatQuad.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PaintPhase.h"
</span><span class="cx"> #include "RenderObjectEnums.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="lines">@@ -514,6 +515,7 @@
</span><span class="cx"> Document& document() const { return m_node.document(); }
</span><span class="cx"> Frame& frame() const;
</span><span class="cx"> Page& page() const;
</span><ins>+ Settings& settings() const { return page().settings(); }
</ins><span class="cx">
</span><span class="cx"> // Returns the object containing this one. Can be different from parent for positioned elements.
</span><span class="cx"> // If repaintContainer and repaintContainerSkipped are not null, on return *repaintContainerSkipped
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> inline void SecureTextTimer::restart(unsigned offsetAfterLastTypedCharacter)
</span><span class="cx"> {
</span><span class="cx"> m_offsetAfterLastTypedCharacter = offsetAfterLastTypedCharacter;
</span><del>- startOneShot(m_renderer.frame().settings().passwordEchoDurationInSeconds());
</del><ins>+ startOneShot(m_renderer.settings().passwordEchoDurationInSeconds());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline unsigned SecureTextTimer::takeOffsetAfterLastTypedCharacter()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx"> return isHorizontalWritingMode() ? frameView().customFixedPositionLayoutRect().width() : frameView().customFixedPositionLayoutRect().height();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (frameView().frame().settings().visualViewportEnabled())
</del><ins>+ if (settings().visualViewportEnabled())
</ins><span class="cx"> return isHorizontalWritingMode() ? frameView().layoutViewportRect().width() : frameView().layoutViewportRect().height();
</span><span class="cx">
</span><span class="cx"> return clientLogicalWidth();
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> return isHorizontalWritingMode() ? frameView().customFixedPositionLayoutRect().height() : frameView().customFixedPositionLayoutRect().width();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (frameView().frame().settings().visualViewportEnabled())
</del><ins>+ if (settings().visualViewportEnabled())
</ins><span class="cx"> return isHorizontalWritingMode() ? frameView().layoutViewportRect().height() : frameView().layoutViewportRect().width();
</span><span class="cx">
</span><span class="cx"> return clientLogicalHeight();
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> rootObscuresBackground = rendererObscuresBackground(*rootRenderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool backgroundShouldExtendBeyondPage = frameView().frame().settings().backgroundShouldExtendBeyondPage();
</del><ins>+ bool backgroundShouldExtendBeyondPage = settings().backgroundShouldExtendBeyondPage();
</ins><span class="cx"> compositor().setRootExtendedBackgroundColor(backgroundShouldExtendBeyondPage ? frameView().documentBackgroundColor() : Color());
</span><span class="cx">
</span><span class="cx"> Page* page = document().page();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> });
</span><span class="cx"> #endif
</span><span class="cx"> AvoidanceReasonFlags reasons = { };
</span><del>- if (!flow.frame().settings().simpleLineLayoutEnabled())
</del><ins>+ if (!flow.settings().simpleLineLayoutEnabled())
</ins><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FeatureIsDisabled, reasons, includeReasons);
</span><span class="cx"> if (!flow.parent())
</span><span class="cx"> SET_REASON_AND_RETURN_IF_NEEDED(FlowHasNoParent, reasons, includeReasons);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> if (style.visibility() != VISIBLE)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool debugBordersEnabled = flow.frame().settings().simpleLineLayoutDebugBordersEnabled();
</del><ins>+ bool debugBordersEnabled = flow.settings().simpleLineLayoutDebugBordersEnabled();
</ins><span class="cx">
</span><span class="cx"> TextPainter textPainter(paintInfo.context());
</span><span class="cx"> textPainter.setFont(style.fontCascade());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (210767 => 210768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2017-01-14 17:35:56 UTC (rev 210767)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2017-01-14 18:45:20 UTC (rev 210768)
</span><span class="lines">@@ -185,8 +185,7 @@
</span><span class="cx"> effectiveTransform.scale(scale.width(), scale.height());
</span><span class="cx"> effectiveTransform.multiply(filterData->shearFreeAbsoluteTransform);
</span><span class="cx">
</span><del>- RenderingMode renderingMode = renderer.frame().settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
-
</del><ins>+ RenderingMode renderingMode = renderer.settings().acceleratedFiltersEnabled() ? Accelerated : Unaccelerated;
</ins><span class="cx"> auto sourceGraphic = SVGRenderingContext::createImageBuffer(filterData->drawingRegion, effectiveTransform, ColorSpaceLinearRGB, renderingMode);
</span><span class="cx"> if (!sourceGraphic) {
</span><span class="cx"> ASSERT(!m_filter.contains(&renderer));
</span></span></pre>
</div>
</div>
</body>
</html>