<!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>[177929] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177929">177929</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-05 13:48:31 -0800 (Mon, 05 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr from Page.
<https://webkit.org/b/140089>
Reviewed by Anders Carlsson.
Source/WebCore:
Use Ref or RefPtr instead of PassRefPtr as appropriate in WebCore::Page.
* page/Page.cpp:
(WebCore::Page::rangeOfString):
(WebCore::Page::setSessionStorage):
* page/Page.h:
* page/mac/PageMac.cpp:
(WebCore::Page::addSchedulePair):
(WebCore::Page::removeSchedulePair):
Source/WTF:
Make SchedulePair::create() return Ref since it never fails.
* wtf/SchedulePair.h:
(WTF::SchedulePair::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfSchedulePairh">trunk/Source/WTF/wtf/SchedulePair.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCorepagemacPageMaccpp">trunk/Source/WebCore/page/mac/PageMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WTF/ChangeLog 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-05 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from Page.
+ <https://webkit.org/b/140089>
+
+ Reviewed by Anders Carlsson.
+
+ Make SchedulePair::create() return Ref since it never fails.
+
+ * wtf/SchedulePair.h:
+ (WTF::SchedulePair::create):
+
</ins><span class="cx"> 2015-01-01 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Rework code that hides characters in password fields to streamline a little
</span></span></pre></div>
<a id="trunkSourceWTFwtfSchedulePairh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SchedulePair.h (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SchedulePair.h 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WTF/wtf/SchedulePair.h 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx">
</span><span class="cx"> class SchedulePair : public RefCounted<SchedulePair> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
</del><ins>+ static Ref<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
</ins><span class="cx">
</span><span class="cx"> #if USE(FOUNDATION) && !USE(CFNETWORK)
</span><del>- static PassRefPtr<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
</del><ins>+ static Ref<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(*new SchedulePair(runLoop, mode)); }
</ins><span class="cx"> NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WebCore/ChangeLog 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-05 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from Page.
+ <https://webkit.org/b/140089>
+
+ Reviewed by Anders Carlsson.
+
+ Use Ref or RefPtr instead of PassRefPtr as appropriate in WebCore::Page.
+
+ * page/Page.cpp:
+ (WebCore::Page::rangeOfString):
+ (WebCore::Page::setSessionStorage):
+ * page/Page.h:
+ * page/mac/PageMac.cpp:
+ (WebCore::Page::addSchedulePair):
+ (WebCore::Page::removeSchedulePair):
+
</ins><span class="cx"> 2015-01-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r163928): Animated images are not resumed on window resizing
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -1154,11 +1154,11 @@
</span><span class="cx"> __ZN7WebCore4Page13setPaginationERKNS_10PaginationE
</span><span class="cx"> __ZN7WebCore4Page14setIsPrerenderEv
</span><span class="cx"> __ZN7WebCore4Page14setMediaVolumeEf
</span><del>-__ZN7WebCore4Page15addSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
</del><ins>+__ZN7WebCore4Page15addSchedulePairEON3WTF3RefINS1_12SchedulePairEEE
</ins><span class="cx"> __ZN7WebCore4Page16countFindMatchesERKN3WTF6StringEhj
</span><span class="cx"> __ZN7WebCore4Page16setCanStartMediaEb
</span><span class="cx"> __ZN7WebCore4Page16setDefersLoadingEb
</span><del>-__ZN7WebCore4Page18removeSchedulePairEN3WTF10PassRefPtrINS1_12SchedulePairEEE
</del><ins>+__ZN7WebCore4Page18removeSchedulePairEON3WTF3RefINS1_12SchedulePairEEE
</ins><span class="cx"> __ZN7WebCore4Page18setPageScaleFactorEfRKNS_8IntPointEb
</span><span class="cx"> __ZN7WebCore4Page18setTopContentInsetEf
</span><span class="cx"> __ZN7WebCore4Page19addLayoutMilestonesEj
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WebCore/page/Page.cpp 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -635,20 +635,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> Page::rangeOfString(const String& target, Range* referenceRange, FindOptions options)
</del><ins>+RefPtr<Range> Page::rangeOfString(const String& target, Range* referenceRange, FindOptions options)
</ins><span class="cx"> {
</span><span class="cx"> if (target.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (referenceRange && referenceRange->ownerDocument().page() != this)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> bool shouldWrap = options & WrapAround;
</span><span class="cx"> Frame* frame = referenceRange ? referenceRange->ownerDocument().frame() : &mainFrame();
</span><span class="cx"> Frame* startFrame = frame;
</span><span class="cx"> do {
</span><span class="cx"> if (RefPtr<Range> resultRange = frame->editor().rangeOfString(target, frame == startFrame ? referenceRange : 0, options & ~WrapAround))
</span><del>- return resultRange.release();
</del><ins>+ return resultRange;
</ins><span class="cx">
</span><span class="cx"> frame = incrementFrame(frame, !(options & Backwards), shouldWrap);
</span><span class="cx"> } while (frame && frame != startFrame);
</span><span class="lines">@@ -657,10 +657,10 @@
</span><span class="cx"> // We cheat a bit and just search again with wrap on.
</span><span class="cx"> if (shouldWrap && referenceRange) {
</span><span class="cx"> if (RefPtr<Range> resultRange = startFrame->editor().rangeOfString(target, referenceRange, options | WrapAround | StartInSelection))
</span><del>- return resultRange.release();
</del><ins>+ return resultRange;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned Page::findMatchesForText(const String& target, FindOptions options, unsigned maxMatchCount, ShouldHighlightMatches shouldHighlightMatches, ShouldMarkMatches shouldMarkMatches)
</span><span class="lines">@@ -1096,9 +1096,9 @@
</span><span class="cx"> return m_sessionStorage.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setSessionStorage(PassRefPtr<StorageNamespace> newStorage)
</del><ins>+void Page::setSessionStorage(RefPtr<StorageNamespace>&& newStorage)
</ins><span class="cx"> {
</span><del>- m_sessionStorage = newStorage;
</del><ins>+ m_sessionStorage = WTF::move(newStorage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Page::hasCustomHTMLTokenizerTimeDelay() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WebCore/page/Page.h 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool findString(const String&, FindOptions);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);
</del><ins>+ WEBCORE_EXPORT RefPtr<Range> rangeOfString(const String&, Range*, FindOptions);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT unsigned countFindMatches(const String&, FindOptions, unsigned maxMatchCount);
</span><span class="cx"> WEBCORE_EXPORT unsigned markAllMatchesForText(const String&, FindOptions, bool shouldHighlight, unsigned maxMatchCount);
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> enum { NoMatchAfterUserSelection = -1 };
</span><span class="cx"> WEBCORE_EXPORT void findStringMatchingRanges(const String&, FindOptions, int maxCount, Vector<RefPtr<Range>>&, int& indexForSelection);
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- WEBCORE_EXPORT void addSchedulePair(PassRefPtr<SchedulePair>);
- WEBCORE_EXPORT void removeSchedulePair(PassRefPtr<SchedulePair>);
</del><ins>+ WEBCORE_EXPORT void addSchedulePair(Ref<SchedulePair>&&);
+ WEBCORE_EXPORT void removeSchedulePair(Ref<SchedulePair>&&);
</ins><span class="cx"> SchedulePairHashSet* scheduledRunLoopPairs() { return m_scheduledRunLoopPairs.get(); }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SchedulePairHashSet> m_scheduledRunLoopPairs;
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> WEBCORE_EXPORT void invalidateStylesForLink(LinkHash);
</span><span class="cx">
</span><span class="cx"> StorageNamespace* sessionStorage(bool optionalCreate = true);
</span><del>- void setSessionStorage(PassRefPtr<StorageNamespace>);
</del><ins>+ void setSessionStorage(RefPtr<StorageNamespace>&&);
</ins><span class="cx">
</span><span class="cx"> bool hasCustomHTMLTokenizerTimeDelay() const;
</span><span class="cx"> double customHTMLTokenizerTimeDelay() const;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacPageMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/PageMac.cpp (177928 => 177929)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/PageMac.cpp 2015-01-05 21:47:14 UTC (rev 177928)
+++ trunk/Source/WebCore/page/mac/PageMac.cpp 2015-01-05 21:48:31 UTC (rev 177929)
</span><span class="lines">@@ -36,41 +36,38 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void Page::addSchedulePair(PassRefPtr<SchedulePair> prpPair)
</del><ins>+void Page::addSchedulePair(Ref<SchedulePair>&& pair)
</ins><span class="cx"> {
</span><del>- RefPtr<SchedulePair> pair = prpPair;
-
</del><span class="cx"> if (!m_scheduledRunLoopPairs)
</span><span class="cx"> m_scheduledRunLoopPairs = std::make_unique<SchedulePairHashSet>();
</span><del>- m_scheduledRunLoopPairs->add(pair);
</del><ins>+ m_scheduledRunLoopPairs->add(pair.ptr());
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().documentLoader())
</span><del>- documentLoader->schedule(*pair);
</del><ins>+ documentLoader->schedule(pair);
</ins><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().provisionalDocumentLoader())
</span><del>- documentLoader->schedule(*pair);
</del><ins>+ documentLoader->schedule(pair);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: make SharedTimerMac use these SchedulePairs.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::removeSchedulePair(PassRefPtr<SchedulePair> prpPair)
</del><ins>+void Page::removeSchedulePair(Ref<SchedulePair>&& pair)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_scheduledRunLoopPairs);
</span><span class="cx"> if (!m_scheduledRunLoopPairs)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<SchedulePair> pair = prpPair;
- m_scheduledRunLoopPairs->remove(pair);
</del><ins>+ m_scheduledRunLoopPairs->remove(pair.ptr());
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> for (Frame* frame = m_mainFrame.get(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().documentLoader())
</span><del>- documentLoader->unschedule(*pair);
</del><ins>+ documentLoader->unschedule(pair);
</ins><span class="cx"> if (DocumentLoader* documentLoader = frame->loader().provisionalDocumentLoader())
</span><del>- documentLoader->unschedule(*pair);
</del><ins>+ documentLoader->unschedule(pair);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>