<!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>[177513] 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/177513">177513</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 12:21:24 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ref-ify ClientRectList.
<https://webkit.org/b/139780>
Reviewed by Anders Carlsson.
Make the ClientRectList::create() helpers return Ref, along with a bunch
of other functions that always return non-null ClientRectLists.
Also make ClientRectList store a Vector<Ref<ClientRect>> internally since
entries in the Vector are never null.
* dom/ClientRectList.cpp:
(WebCore::ClientRectList::item):
* dom/ClientRectList.h:
(WebCore::ClientRectList::create):
* dom/Element.cpp:
(WebCore::Element::getClientRects):
* dom/Element.h:
* dom/Range.cpp:
(WebCore::Range::getClientRects):
* dom/Range.h:
* page/Page.cpp:
(WebCore::Page::nonFastScrollableRects):
* page/Page.h:
* testing/Internals.cpp:
(WebCore::Internals::inspectorHighlightRects):
(WebCore::Internals::nonFastScrollableRects):
* testing/Internals.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomClientRectListcpp">trunk/Source/WebCore/dom/ClientRectList.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClientRectListh">trunk/Source/WebCore/dom/ClientRectList.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="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2014-12-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Ref-ify ClientRectList.
+ <https://webkit.org/b/139780>
+
+ Reviewed by Anders Carlsson.
+
+ Make the ClientRectList::create() helpers return Ref, along with a bunch
+ of other functions that always return non-null ClientRectLists.
+
+ Also make ClientRectList store a Vector<Ref<ClientRect>> internally since
+ entries in the Vector are never null.
+
+ * dom/ClientRectList.cpp:
+ (WebCore::ClientRectList::item):
+ * dom/ClientRectList.h:
+ (WebCore::ClientRectList::create):
+ * dom/Element.cpp:
+ (WebCore::Element::getClientRects):
+ * dom/Element.h:
+ * dom/Range.cpp:
+ (WebCore::Range::getClientRects):
+ * dom/Range.h:
+ * page/Page.cpp:
+ (WebCore::Page::nonFastScrollableRects):
+ * page/Page.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::inspectorHighlightRects):
+ (WebCore::Internals::nonFastScrollableRects):
+ * testing/Internals.h:
+
+2014-12-18 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Ref-ify ClientRect.
</span><span class="cx"> <https://webkit.org/b/139777>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomClientRectListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClientRectList.cpp (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClientRectList.cpp 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/ClientRectList.cpp 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -57,10 +57,10 @@
</span><span class="cx"> if (index >= m_list.size()) {
</span><span class="cx"> // FIXME: this should throw an exception.
</span><span class="cx"> // ec = INDEX_SIZE_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return m_list[index].get();
</del><ins>+ return m_list[index].ptr();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomClientRectListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClientRectList.h (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClientRectList.h 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/ClientRectList.h 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #define ClientRectList_h
</span><span class="cx">
</span><span class="cx"> #include "FloatQuad.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> class ClientRectList : public RefCounted<ClientRectList> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<ClientRectList> create() { return adoptRef(new ClientRectList); }
- static PassRefPtr<ClientRectList> create(const Vector<FloatQuad>& quads) { return adoptRef(new ClientRectList(quads)); }
</del><ins>+ static Ref<ClientRectList> create() { return adoptRef(*new ClientRectList); }
+ static Ref<ClientRectList> create(const Vector<FloatQuad>& quads) { return adoptRef(*new ClientRectList(quads)); }
</ins><span class="cx"> WEBCORE_EXPORT ~ClientRectList();
</span><span class="cx">
</span><span class="cx"> unsigned length() const;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> WEBCORE_EXPORT ClientRectList();
</span><span class="cx"> WEBCORE_EXPORT explicit ClientRectList(const Vector<FloatQuad>&);
</span><span class="cx">
</span><del>- Vector<RefPtr<ClientRect>> m_list;
</del><ins>+ Vector<Ref<ClientRect>> m_list;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<ClientRectList> Element::getClientRects()
</del><ins>+Ref<ClientRectList> Element::getClientRects()
</ins><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/Element.h 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT IntRect boundsInRootViewSpace();
</span><span class="cx">
</span><del>- RefPtr<ClientRectList> getClientRects();
</del><ins>+ Ref<ClientRectList> getClientRects();
</ins><span class="cx"> Ref<ClientRect> getBoundingClientRect();
</span><span class="cx">
</span><span class="cx"> // Returns the absolute bounding box translated into client coordinates.
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/Range.cpp 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -2177,7 +2177,7 @@
</span><span class="cx"> setEnd(end.deepEquivalent().containerNode(), end.deepEquivalent().computeOffsetInContainerNode(), ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ClientRectList> Range::getClientRects() const
</del><ins>+Ref<ClientRectList> Range::getClientRects() const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_start.container())
</span><span class="cx"> return ClientRectList::create();
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/dom/Range.h 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> // for details.
</span><span class="cx"> void expand(const String&, ExceptionCode&);
</span><span class="cx">
</span><del>- PassRefPtr<ClientRectList> getClientRects() const;
</del><ins>+ Ref<ClientRectList> getClientRects() const;
</ins><span class="cx"> Ref<ClientRect> getBoundingClientRect() const;
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/page/Page.cpp 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
</del><ins>+Ref<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> if (Document* document = m_mainFrame->document())
</span><span class="cx"> document->updateLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/page/Page.h 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String scrollingStateTreeAsText();
</span><span class="cx"> WEBCORE_EXPORT String synchronousScrollingReasonsAsText();
</span><del>- WEBCORE_EXPORT PassRefPtr<ClientRectList> nonFastScrollableRects(const Frame*);
</del><ins>+ WEBCORE_EXPORT Ref<ClientRectList> nonFastScrollableRects(const Frame*);
</ins><span class="cx">
</span><span class="cx"> Settings& settings() const { return *m_settings; }
</span><span class="cx"> ProgressTracker& progress() const { return *m_progress; }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> return ClientRect::create(renderer->absoluteBoundingBoxRectIgnoringTransforms());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ClientRectList> Internals::inspectorHighlightRects(ExceptionCode& ec)
</del><ins>+Ref<ClientRectList> Internals::inspectorHighlightRects(ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> Document* document = contextDocument();
</span><span class="lines">@@ -1668,17 +1668,17 @@
</span><span class="cx"> return page->synchronousScrollingReasonsAsText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<ClientRectList> Internals::nonFastScrollableRects(ExceptionCode& ec) const
</del><ins>+RefPtr<ClientRectList> Internals::nonFastScrollableRects(ExceptionCode& ec) const
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->frame()) {
</span><span class="cx"> ec = INVALID_ACCESS_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page* page = document->page();
</span><span class="cx"> if (!page)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return page->nonFastScrollableRects(document->frame());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (177512 => 177513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-12-18 19:56:46 UTC (rev 177512)
+++ trunk/Source/WebCore/testing/Internals.h 2014-12-18 20:21:24 UTC (rev 177513)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<ClientRect> boundingBox(Element*, ExceptionCode&);
</span><span class="cx">
</span><del>- PassRefPtr<ClientRectList> inspectorHighlightRects(ExceptionCode&);
</del><ins>+ Ref<ClientRectList> inspectorHighlightRects(ExceptionCode&);
</ins><span class="cx"> String inspectorHighlightObject(ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> unsigned markerCountForNode(Node*, const String&, ExceptionCode&);
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> String repaintRectsAsText(ExceptionCode&) const;
</span><span class="cx"> String scrollingStateTreeAsText(ExceptionCode&) const;
</span><span class="cx"> String mainThreadScrollingReasons(ExceptionCode&) const;
</span><del>- PassRefPtr<ClientRectList> nonFastScrollableRects(ExceptionCode&) const;
</del><ins>+ RefPtr<ClientRectList> nonFastScrollableRects(ExceptionCode&) const;
</ins><span class="cx">
</span><span class="cx"> void garbageCollectDocumentResources(ExceptionCode&) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>