<!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>[188305] 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/188305">188305</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-11 16:00:00 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use more references in FrameView.
https://bugs.webkit.org/show_bug.cgi?id=147899
Reviewed by Simon Fraser.
No change in functionality.
* page/FrameView.cpp:
(WebCore::FrameView::flushCompositingStateForThisFrame):
(WebCore::FrameView::flushCompositingStateIncludingSubframes):
(WebCore::FrameView::addSlowRepaintObject):
(WebCore::FrameView::scrollElementToRect):
* page/FrameView.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::willBeDestroyed):
* rendering/RenderScrollbarPart.cpp:
(WebCore::RenderScrollbarPart::imageChanged):
* testing/Internals.cpp:
(WebCore::Internals::scrollElementToRect):</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="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarPartcpp">trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/ChangeLog 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-08-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Use more references in FrameView.
+ https://bugs.webkit.org/show_bug.cgi?id=147899
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::flushCompositingStateForThisFrame):
+ (WebCore::FrameView::flushCompositingStateIncludingSubframes):
+ (WebCore::FrameView::addSlowRepaintObject):
+ (WebCore::FrameView::scrollElementToRect):
+ * page/FrameView.h:
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::willBeDestroyed):
+ * rendering/RenderScrollbarPart.cpp:
+ (WebCore::RenderScrollbarPart::imageChanged):
+ * testing/Internals.cpp:
+ (WebCore::Internals::scrollElementToRect):
+
+2015-08-11 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Invalid FrameView::m_viewportRenderer after layout is finished.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=147848
</span><span class="cx"> rdar://problem/22205197
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -980,7 +980,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool FrameView::flushCompositingStateForThisFrame(Frame* rootFrameForFlush)
</del><ins>+bool FrameView::flushCompositingStateForThisFrame(const Frame& rootFrameForFlush)
</ins><span class="cx"> {
</span><span class="cx"> RenderView* renderView = this->renderView();
</span><span class="cx"> if (!renderView)
</span><span class="lines">@@ -998,8 +998,7 @@
</span><span class="cx"> tileCache->doPendingRepaints();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- renderView->compositor().flushPendingLayerChanges(rootFrameForFlush == m_frame.ptr());
-
</del><ins>+ renderView->compositor().flushPendingLayerChanges(&rootFrameForFlush == m_frame.ptr());
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1126,12 +1125,12 @@
</span><span class="cx"> {
</span><span class="cx"> InspectorInstrumentation::willComposite(frame());
</span><span class="cx">
</span><del>- bool allFramesFlushed = flushCompositingStateForThisFrame(&frame());
</del><ins>+ bool allFramesFlushed = flushCompositingStateForThisFrame(frame());
</ins><span class="cx">
</span><span class="cx"> for (Frame* child = frame().tree().firstRenderedChild(); child; child = child->tree().traverseNextRendered(m_frame.ptr())) {
</span><span class="cx"> if (!child->view())
</span><span class="cx"> continue;
</span><del>- bool flushed = child->view()->flushCompositingStateForThisFrame(&frame());
</del><ins>+ bool flushed = child->view()->flushCompositingStateForThisFrame(frame());
</ins><span class="cx"> allFramesFlushed &= flushed;
</span><span class="cx"> }
</span><span class="cx"> return allFramesFlushed;
</span><span class="lines">@@ -1625,7 +1624,7 @@
</span><span class="cx"> bool hadSlowRepaintObjects = hasSlowRepaintObjects();
</span><span class="cx">
</span><span class="cx"> if (!m_slowRepaintObjects)
</span><del>- m_slowRepaintObjects = std::make_unique<HashSet<RenderElement*>>();
</del><ins>+ m_slowRepaintObjects = std::make_unique<HashSet<const RenderElement*>>();
</ins><span class="cx">
</span><span class="cx"> m_slowRepaintObjects->add(o);
</span><span class="cx">
</span><span class="lines">@@ -2079,12 +2078,12 @@
</span><span class="cx"> scrollToAnchor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameView::scrollElementToRect(Element* element, const IntRect& rect)
</del><ins>+void FrameView::scrollElementToRect(const Element& element, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> frame().document()->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><span class="cx"> LayoutRect bounds;
</span><del>- if (RenderElement* renderer = element->renderer())
</del><ins>+ if (RenderElement* renderer = element.renderer())
</ins><span class="cx"> bounds = renderer->anchorRect();
</span><span class="cx"> int centeringOffsetX = (rect.width() - bounds.width()) / 2;
</span><span class="cx"> int centeringOffsetY = (rect.height() - bounds.height()) / 2;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/page/FrameView.h 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -155,7 +155,6 @@
</span><span class="cx"> void willRecalcStyle();
</span><span class="cx"> bool updateCompositingLayersAfterStyleChange();
</span><span class="cx"> void updateCompositingLayersAfterLayout();
</span><del>- bool flushCompositingStateForThisFrame(Frame* rootFrameForFlush);
</del><span class="cx">
</span><span class="cx"> void clearBackingStores();
</span><span class="cx"> void restoreBackingStores();
</span><span class="lines">@@ -265,7 +264,7 @@
</span><span class="cx">
</span><span class="cx"> void addSlowRepaintObject(RenderElement*);
</span><span class="cx"> void removeSlowRepaintObject(RenderElement*);
</span><del>- bool hasSlowRepaintObject(RenderElement* o) const { return m_slowRepaintObjects && m_slowRepaintObjects->contains(o); }
</del><ins>+ bool hasSlowRepaintObject(const RenderElement& renderer) const { return m_slowRepaintObjects && m_slowRepaintObjects->contains(&renderer); }
</ins><span class="cx"> bool hasSlowRepaintObjects() const { return m_slowRepaintObjects && m_slowRepaintObjects->size(); }
</span><span class="cx">
</span><span class="cx"> // Includes fixed- and sticky-position objects.
</span><span class="lines">@@ -404,7 +403,7 @@
</span><span class="cx"> bool scrollToFragment(const URL&);
</span><span class="cx"> bool scrollToAnchor(const String&);
</span><span class="cx"> void maintainScrollPositionAtAnchor(ContainerNode*);
</span><del>- WEBCORE_EXPORT void scrollElementToRect(Element*, const IntRect&);
</del><ins>+ WEBCORE_EXPORT void scrollElementToRect(const Element&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> // Methods to convert points and rects between the coordinate space of the renderer, and this view.
</span><span class="cx"> WEBCORE_EXPORT IntRect convertFromRendererToContainingView(const RenderElement*, const IntRect&) const;
</span><span class="lines">@@ -418,7 +417,7 @@
</span><span class="cx"> virtual IntPoint convertToContainingView(const IntPoint&) const override;
</span><span class="cx"> virtual IntPoint convertFromContainingView(const IntPoint&) const override;
</span><span class="cx">
</span><del>- bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
</del><ins>+ bool isFrameViewScrollCorner(const RenderScrollbarPart& scrollCorner) const { return m_scrollCorner == &scrollCorner; }
</ins><span class="cx">
</span><span class="cx"> // isScrollable() takes an optional Scrollability parameter that allows the caller to define what they mean by 'scrollable.'
</span><span class="cx"> // Most callers are interested in the default value, Scrollability::Scrollable, which means that there is actually content
</span><span class="lines">@@ -589,6 +588,7 @@
</span><span class="cx"> bool shouldLayoutAfterContentsResized() const;
</span><span class="cx">
</span><span class="cx"> bool shouldUpdateCompositingLayersAfterScrolling() const;
</span><ins>+ bool flushCompositingStateForThisFrame(const Frame& rootFrameForFlush);
</ins><span class="cx">
</span><span class="cx"> virtual bool shouldDeferScrollUpdateAfterContentSizeChange() override;
</span><span class="cx">
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> std::unique_ptr<ListHashSet<RenderEmbeddedObject*>> m_embeddedObjectsToUpdate;
</span><span class="cx"> const Ref<Frame> m_frame;
</span><span class="cx">
</span><del>- std::unique_ptr<HashSet<RenderElement*>> m_slowRepaintObjects;
</del><ins>+ std::unique_ptr<HashSet<const RenderElement*>> m_slowRepaintObjects;
</ins><span class="cx">
</span><span class="cx"> bool m_needsFullRepaint;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -1539,7 +1539,7 @@
</span><span class="cx">
</span><span class="cx"> removeFromParent();
</span><span class="cx">
</span><del>- ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(this)));
</del><ins>+ ASSERT(documentBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
</ins><span class="cx">
</span><span class="cx"> // The remove() call above may invoke axObjectCache()->childrenChanged() on the parent, which may require the AX render
</span><span class="cx"> // object for this renderer. So we remove the AX render object now, after the renderer is removed.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarPartcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/rendering/RenderScrollbarPart.cpp 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> if (m_scrollbar && m_part != NoPart)
</span><span class="cx"> m_scrollbar->theme()->invalidatePart(*m_scrollbar, m_part);
</span><span class="cx"> else {
</span><del>- if (view().frameView().isFrameViewScrollCorner(this)) {
</del><ins>+ if (view().frameView().isFrameViewScrollCorner(*this)) {
</ins><span class="cx"> view().frameView().invalidateScrollCorner(view().frameView().scrollCornerRect());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (188304 => 188305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-08-11 22:47:30 UTC (rev 188304)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-08-11 23:00:00 UTC (rev 188305)
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> FrameView* frameView = element->document().view();
</span><del>- frameView->scrollElementToRect(element, IntRect(x, y, w, h));
</del><ins>+ frameView->scrollElementToRect(*element, IntRect(x, y, w, h));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::paintControlTints(ExceptionCode& ec)
</span></span></pre>
</div>
</div>
</body>
</html>