<!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>[209438] 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/209438">209438</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-06 17:15:42 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move RenderElement::rendererForRootBackground to RenderView.
https://bugs.webkit.org/show_bug.cgi?id=165454
Reviewed by Simon Fraser.
Currently RenderElement::rendererForRootBackground can only be called on document element's renderer.
This patch removes this limitation and moves the functionality from RenderElement to RenderView.
No change in functionality.
* page/FrameView.cpp:
(WebCore::FrameView::calculateExtendedBackgroundMode):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::paintRootBoxFillLayers):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::rendererForRootBackground): Deleted.
* rendering/RenderElement.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::rendererBackgroundColor):
* rendering/RenderView.cpp:
(WebCore::RenderView::rendererForRootBackground):
(WebCore::rendererObscuresBackground):
(WebCore::RenderView::paintBoxDecorations):
(WebCore::RenderView::rootBackgroundIsEntirelyFixed):
* rendering/RenderView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-12-06 Zalan Bujtas <zalan@apple.com>
+
+ Move RenderElement::rendererForRootBackground to RenderView.
+ https://bugs.webkit.org/show_bug.cgi?id=165454
+
+ Reviewed by Simon Fraser.
+
+ Currently RenderElement::rendererForRootBackground can only be called on document element's renderer.
+ This patch removes this limitation and moves the functionality from RenderElement to RenderView.
+
+ No change in functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::calculateExtendedBackgroundMode):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::paintRootBoxFillLayers):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::rendererForRootBackground): Deleted.
+ * rendering/RenderElement.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::rendererBackgroundColor):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::rendererForRootBackground):
+ (WebCore::rendererObscuresBackground):
+ (WebCore::RenderView::paintBoxDecorations):
+ (WebCore::RenderView::rootBackgroundIsEntirelyFixed):
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2016-12-05 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Part 1 of 2] Add support for SPKI format while doing SubtleCrypto.importKey/exportKey
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -3180,20 +3180,20 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return ExtendedBackgroundModeNone;
</span><span class="cx">
</span><del>- auto* documentElement = document->documentElement();
- auto* documentElementRenderer = documentElement ? documentElement->renderer() : nullptr;
- if (!documentElementRenderer)
</del><ins>+ if (!renderView())
</ins><span class="cx"> return ExtendedBackgroundModeNone;
</span><ins>+
+ auto* rootBackgroundRenderer = renderView()->rendererForRootBackground();
+ if (!rootBackgroundRenderer)
+ return ExtendedBackgroundModeNone;
</ins><span class="cx">
</span><del>- auto& renderer = documentElementRenderer->rendererForRootBackground();
- if (!renderer.style().hasBackgroundImage())
</del><ins>+ if (!rootBackgroundRenderer->style().hasBackgroundImage())
</ins><span class="cx"> return ExtendedBackgroundModeNone;
</span><span class="cx">
</span><span class="cx"> ExtendedBackgroundMode mode = ExtendedBackgroundModeNone;
</span><del>-
- if (renderer.style().backgroundRepeatX() == RepeatFill)
</del><ins>+ if (rootBackgroundRenderer->style().backgroundRepeatX() == RepeatFill)
</ins><span class="cx"> mode |= ExtendedBackgroundModeHorizontal;
</span><del>- if (renderer.style().backgroundRepeatY() == RepeatFill)
</del><ins>+ if (rootBackgroundRenderer->style().backgroundRepeatY() == RepeatFill)
</ins><span class="cx"> mode |= ExtendedBackgroundModeVertical;
</span><span class="cx">
</span><span class="cx"> return mode;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -1264,15 +1264,18 @@
</span><span class="cx">
</span><span class="cx"> void RenderBox::paintRootBoxFillLayers(const PaintInfo& paintInfo)
</span><span class="cx"> {
</span><ins>+ ASSERT(isDocumentElementRenderer());
</ins><span class="cx"> if (paintInfo.skipRootBackground())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto& rootBackgroundRenderer = rendererForRootBackground();
-
- const FillLayer* bgLayer = rootBackgroundRenderer.style().backgroundLayers();
- Color bgColor = rootBackgroundRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ auto* rootBackgroundRenderer = view().rendererForRootBackground();
+ if (!rootBackgroundRenderer)
+ return;
</ins><span class="cx">
</span><del>- paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(), BackgroundBleedNone, CompositeSourceOver, &rootBackgroundRenderer);
</del><ins>+ const FillLayer* bgLayer = rootBackgroundRenderer->style().backgroundLayers();
+ Color bgColor = rootBackgroundRenderer->style().visitedDependentColor(CSSPropertyBackgroundColor);
+
+ paintFillLayers(paintInfo, bgColor, bgLayer, view().backgroundRect(), BackgroundBleedNone, CompositeSourceOver, rootBackgroundRenderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BackgroundBleedAvoidance RenderBox::determineBackgroundBleedAvoidance(GraphicsContext& context) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -1167,22 +1167,6 @@
</span><span class="cx"> setLayerNeedsFullRepaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderElement& RenderElement::rendererForRootBackground()
-{
- ASSERT(isDocumentElementRenderer());
- if (!hasBackground() && is<HTMLHtmlElement>(element())) {
- // Locate the <body> element using the DOM. This is easier than trying
- // to crawl around a render tree with potential :before/:after content and
- // anonymous blocks created by inline <body> tags etc. We can locate the <body>
- // render object very easily via the DOM.
- if (auto* body = document().body()) {
- if (auto* renderer = body->renderer())
- return *renderer;
- }
- }
- return *this;
-}
-
</del><span class="cx"> RenderElement* RenderElement::hoverAncestor() const
</span><span class="cx"> {
</span><span class="cx"> // When searching for the hover ancestor and encountering a named flow thread,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -128,9 +128,6 @@
</span><span class="cx"> /* This function performs a layout only if one is needed. */
</span><span class="cx"> void layoutIfNeeded() { if (needsLayout()) layout(); }
</span><span class="cx">
</span><del>- // Return the renderer whose background style is used to paint the root background. Should only be called on the renderer for which isDocumentElementRenderer() is true.
- RenderElement& rendererForRootBackground();
-
</del><span class="cx"> // Updates only the local style ptr of the object. Does not update the state of the object,
</span><span class="cx"> // and so only should be called when the style is known not to have changed (or from setStyle).
</span><span class="cx"> void setStyleInternal(RenderStyle&& style) { m_style = WTFMove(style); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -1792,8 +1792,14 @@
</span><span class="cx">
</span><span class="cx"> Color RenderLayerBacking::rendererBackgroundColor() const
</span><span class="cx"> {
</span><del>- const auto& backgroundRenderer = renderer().isDocumentElementRenderer() ? renderer().rendererForRootBackground() : renderer();
- return backgroundRenderer.style().visitedDependentColor(CSSPropertyBackgroundColor);
</del><ins>+ RenderElement* backgroundRenderer = nullptr;
+ if (renderer().isDocumentElementRenderer())
+ backgroundRenderer = renderer().view().rendererForRootBackground();
+
+ if (!backgroundRenderer)
+ backgroundRenderer = &renderer();
+
+ return backgroundRenderer->style().visitedDependentColor(CSSPropertyBackgroundColor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::updateDirectlyCompositedBackgroundColor(bool isSimpleContainer, bool& didUpdateContentsRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -30,7 +30,9 @@
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "HTMLBodyElement.h"
</ins><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><ins>+#include "HTMLHtmlElement.h"
</ins><span class="cx"> #include "HTMLIFrameElement.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "ImageQualityController.h"
</span><span class="lines">@@ -506,24 +508,45 @@
</span><span class="cx"> paintObject(paintInfo, paintOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool rendererObscuresBackground(RenderElement* rootObject)
</del><ins>+RenderElement* RenderView::rendererForRootBackground() const
</ins><span class="cx"> {
</span><del>- if (!rootObject)
</del><ins>+ auto* firstChild = this->firstChild();
+ if (!firstChild)
+ return nullptr;
+ ASSERT(is<RenderElement>(*firstChild));
+ auto& documentRenderer = downcast<RenderElement>(*firstChild);
+
+ if (documentRenderer.hasBackground())
+ return &documentRenderer;
+
+ // We propagate the background only for HTML content.
+ if (!is<HTMLHtmlElement>(documentRenderer.element()))
+ return &documentRenderer;
+
+ if (auto* body = document().body()) {
+ if (auto* renderer = body->renderer())
+ return renderer;
+ }
+ return &documentRenderer;
+}
+
+static inline bool rendererObscuresBackground(const RenderElement& rootElement)
+{
+ auto& style = rootElement.style();
+ if (style.visibility() != VISIBLE || style.opacity() != 1 || style.hasTransform())
</ins><span class="cx"> return false;
</span><del>-
- const RenderStyle& style = rootObject->style();
- if (style.visibility() != VISIBLE
- || style.opacity() != 1
- || style.hasTransform())
</del><ins>+
+ if (style.hasBorderRadius())
</ins><span class="cx"> return false;
</span><del>-
- if (rootObject->isComposited())
</del><ins>+
+ if (rootElement.isComposited())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (rootObject->rendererForRootBackground().style().backgroundClip() == TextFillBox)
</del><ins>+ auto* rendererForBackground = rootElement.view().rendererForRootBackground();
+ if (!rendererForBackground)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (style.hasBorderRadius())
</del><ins>+ if (rendererForBackground->style().backgroundClip() == TextFillBox)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -567,7 +590,7 @@
</span><span class="cx"> // The document element's renderer is currently forced to be a block, but may not always be.
</span><span class="cx"> RenderBox* rootBox = is<RenderBox>(*rootRenderer) ? downcast<RenderBox>(rootRenderer) : nullptr;
</span><span class="cx"> rootFillsViewport = rootBox && !rootBox->x() && !rootBox->y() && rootBox->width() >= width() && rootBox->height() >= height();
</span><del>- rootObscuresBackground = rendererObscuresBackground(rootRenderer);
</del><ins>+ rootObscuresBackground = rendererObscuresBackground(*rootRenderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool backgroundShouldExtendBeyondPage = frameView().frame().settings().backgroundShouldExtendBeyondPage();
</span><span class="lines">@@ -1144,11 +1167,9 @@
</span><span class="cx">
</span><span class="cx"> bool RenderView::rootBackgroundIsEntirelyFixed() const
</span><span class="cx"> {
</span><del>- RenderElement* rootObject = document().documentElement() ? document().documentElement()->renderer() : nullptr;
- if (!rootObject)
- return false;
-
- return rootObject->rendererForRootBackground().style().hasEntirelyFixedBackground();
</del><ins>+ if (auto* rootBackgroundRenderer = rendererForRootBackground())
+ return rootBackgroundRenderer->style().hasEntirelyFixedBackground();
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderView::unextendedBackgroundRect() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (209437 => 209438)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2016-12-07 01:15:20 UTC (rev 209437)
+++ trunk/Source/WebCore/rendering/RenderView.h 2016-12-07 01:15:42 UTC (rev 209438)
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx">
</span><span class="cx"> void paint(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx"> void paintBoxDecorations(PaintInfo&, const LayoutPoint&) override;
</span><ins>+ // Return the renderer whose background style is used to paint the root background.
+ RenderElement* rendererForRootBackground() const;
</ins><span class="cx">
</span><span class="cx"> enum SelectionRepaintMode { RepaintNewXOROld, RepaintNewMinusOld, RepaintNothing };
</span><span class="cx"> void setSelection(RenderObject* start, std::optional<unsigned> startPos, RenderObject* endObject, std::optional<unsigned> endPos, SelectionRepaintMode = RepaintNewXOROld);
</span></span></pre>
</div>
</div>
</body>
</html>