<!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>[177293] 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/177293">177293</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-15 11:17:04 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Purge PassRefPtr from FocusEvent code.
<https://webkit.org/b/139647>
Reviewed by Anders Carlsson.
Source/WebCore:
Convert FocusEvent-related code from using PassRefPtr to using RefPtr&& instead.
* dom/Document.cpp:
(WebCore::Document::setFocusedElement):
* dom/Element.cpp:
(WebCore::Element::dispatchFocusInEvent):
(WebCore::Element::dispatchFocusOutEvent):
(WebCore::Element::dispatchFocusEvent):
(WebCore::Element::dispatchBlurEvent):
* dom/Element.h:
* dom/FocusEvent.cpp:
(WebCore::FocusEvent::FocusEvent):
* dom/FocusEvent.h:
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::dispatchBlurEvent):
* html/HTMLFormControlElement.h:
* html/HTMLSelectElement.cpp:
(WebCore::HTMLSelectElement::dispatchFocusEvent):
(WebCore::HTMLSelectElement::dispatchBlurEvent):
* html/HTMLSelectElement.h:
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::dispatchFocusEvent):
(WebCore::HTMLTextFormControlElement::dispatchBlurEvent):
* html/HTMLTextFormControlElement.h:
* page/FocusController.cpp:
(WebCore::dispatchEventsOnWindowAndFocusedElement):
Source/WTF:
Add a RefPtr::copyRef() to use when passing a RefPtr to a RefPtr&& without
transferring the ownership.
* wtf/RefPtr.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfRefPtrh">trunk/Source/WTF/wtf/RefPtr.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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="#trunkSourceWebCoredomFocusEventcpp">trunk/Source/WebCore/dom/FocusEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomFocusEventh">trunk/Source/WebCore/dom/FocusEvent.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementh">trunk/Source/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementcpp">trunk/Source/WebCore/html/HTMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLSelectElementh">trunk/Source/WebCore/html/HTMLSelectElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementh">trunk/Source/WebCore/html/HTMLTextFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WTF/ChangeLog 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-15 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from FocusEvent code.
+ <https://webkit.org/b/139647>
+
+ Reviewed by Anders Carlsson.
+
+ Add a RefPtr::copyRef() to use when passing a RefPtr to a RefPtr&& without
+ transferring the ownership.
+
+ * wtf/RefPtr.h:
+
</ins><span class="cx"> 2014-12-15 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure range based iteration of Vector<> still receives bounds checking
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefPtr.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefPtr.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WTF/wtf/RefPtr.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx">
</span><span class="cx"> static T* hashTableDeletedValue() { return reinterpret_cast<T*>(-1); }
</span><span class="cx">
</span><ins>+ RefPtr copyRef() WARN_UNUSED_RETURN { return RefPtr(m_ptr); }
+
</ins><span class="cx"> private:
</span><span class="cx"> T* m_ptr;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/ChangeLog 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-12-15 Andreas Kling <akling@apple.com>
+
+ Purge PassRefPtr from FocusEvent code.
+ <https://webkit.org/b/139647>
+
+ Reviewed by Anders Carlsson.
+
+ Convert FocusEvent-related code from using PassRefPtr to using RefPtr&& instead.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setFocusedElement):
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchFocusInEvent):
+ (WebCore::Element::dispatchFocusOutEvent):
+ (WebCore::Element::dispatchFocusEvent):
+ (WebCore::Element::dispatchBlurEvent):
+ * dom/Element.h:
+ * dom/FocusEvent.cpp:
+ (WebCore::FocusEvent::FocusEvent):
+ * dom/FocusEvent.h:
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::dispatchBlurEvent):
+ * html/HTMLFormControlElement.h:
+ * html/HTMLSelectElement.cpp:
+ (WebCore::HTMLSelectElement::dispatchFocusEvent):
+ (WebCore::HTMLSelectElement::dispatchBlurEvent):
+ * html/HTMLSelectElement.h:
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::dispatchFocusEvent):
+ (WebCore::HTMLTextFormControlElement::dispatchBlurEvent):
+ * html/HTMLTextFormControlElement.h:
+ * page/FocusController.cpp:
+ (WebCore::dispatchEventsOnWindowAndFocusedElement):
+
</ins><span class="cx"> 2014-12-15 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Codepoints not associated with languages are drawn as boxes
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -3452,7 +3452,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Dispatch the blur event and let the node do any other blur related activities (important for text fields)
</span><del>- oldFocusedElement->dispatchBlurEvent(newFocusedElement);
</del><ins>+ oldFocusedElement->dispatchBlurEvent(newFocusedElement.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (m_focusedElement) {
</span><span class="cx"> // handler shifted focus
</span><span class="lines">@@ -3460,10 +3460,10 @@
</span><span class="cx"> newFocusedElement = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- oldFocusedElement->dispatchFocusOutEvent(eventNames().focusoutEvent, newFocusedElement); // DOM level 3 name for the bubbling blur event.
</del><ins>+ oldFocusedElement->dispatchFocusOutEvent(eventNames().focusoutEvent, newFocusedElement.copyRef()); // DOM level 3 name for the bubbling blur event.
</ins><span class="cx"> // FIXME: We should remove firing DOMFocusOutEvent event when we are sure no content depends
</span><span class="cx"> // on it, probably when <rdar://problem/8503958> is resolved.
</span><del>- oldFocusedElement->dispatchFocusOutEvent(eventNames().DOMFocusOutEvent, newFocusedElement); // DOM level 2 name for compatibility.
</del><ins>+ oldFocusedElement->dispatchFocusOutEvent(eventNames().DOMFocusOutEvent, newFocusedElement.copyRef()); // DOM level 2 name for compatibility.
</ins><span class="cx">
</span><span class="cx"> if (m_focusedElement) {
</span><span class="cx"> // handler shifted focus
</span><span class="lines">@@ -3492,7 +3492,7 @@
</span><span class="cx"> m_focusedElement = newFocusedElement;
</span><span class="cx">
</span><span class="cx"> // Dispatch the focus event and let the node do any other focus related activities (important for text fields)
</span><del>- m_focusedElement->dispatchFocusEvent(oldFocusedElement, direction);
</del><ins>+ m_focusedElement->dispatchFocusEvent(oldFocusedElement.copyRef(), direction);
</ins><span class="cx">
</span><span class="cx"> if (m_focusedElement != newFocusedElement) {
</span><span class="cx"> // handler shifted focus
</span><span class="lines">@@ -3500,7 +3500,7 @@
</span><span class="cx"> goto SetFocusedNodeDone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_focusedElement->dispatchFocusInEvent(eventNames().focusinEvent, oldFocusedElement); // DOM level 3 bubbling focus event.
</del><ins>+ m_focusedElement->dispatchFocusInEvent(eventNames().focusinEvent, oldFocusedElement.copyRef()); // DOM level 3 bubbling focus event.
</ins><span class="cx">
</span><span class="cx"> if (m_focusedElement != newFocusedElement) {
</span><span class="cx"> // handler shifted focus
</span><span class="lines">@@ -3510,7 +3510,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: We should remove firing DOMFocusInEvent event when we are sure no content depends
</span><span class="cx"> // on it, probably when <rdar://problem/8503958> is m.
</span><del>- m_focusedElement->dispatchFocusInEvent(eventNames().DOMFocusInEvent, oldFocusedElement); // DOM level 2 for compatibility.
</del><ins>+ m_focusedElement->dispatchFocusInEvent(eventNames().DOMFocusInEvent, oldFocusedElement.copyRef()); // DOM level 2 for compatibility.
</ins><span class="cx">
</span><span class="cx"> if (m_focusedElement != newFocusedElement) {
</span><span class="cx"> // handler shifted focus
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -1992,36 +1992,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::dispatchFocusInEvent(const AtomicString& eventType, PassRefPtr<Element> oldFocusedElement)
</del><ins>+void Element::dispatchFocusInEvent(const AtomicString& eventType, RefPtr<Element>&& oldFocusedElement)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</span><span class="cx"> ASSERT(eventType == eventNames().focusinEvent || eventType == eventNames().DOMFocusInEvent);
</span><del>- dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, oldFocusedElement));
</del><ins>+ dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, WTF::move(oldFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::dispatchFocusOutEvent(const AtomicString& eventType, PassRefPtr<Element> newFocusedElement)
</del><ins>+void Element::dispatchFocusOutEvent(const AtomicString& eventType, RefPtr<Element>&& newFocusedElement)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
</span><span class="cx"> ASSERT(eventType == eventNames().focusoutEvent || eventType == eventNames().DOMFocusOutEvent);
</span><del>- dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, newFocusedElement));
</del><ins>+ dispatchScopedEvent(FocusEvent::create(eventType, true, false, document().defaultView(), 0, WTF::move(newFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection)
</del><ins>+void Element::dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection)
</ins><span class="cx"> {
</span><span class="cx"> if (document().page())
</span><span class="cx"> document().page()->chrome().client().elementDidFocus(this);
</span><span class="cx">
</span><del>- RefPtr<FocusEvent> event = FocusEvent::create(eventNames().focusEvent, false, false, document().defaultView(), 0, oldFocusedElement);
- EventDispatcher::dispatchEvent(this, event.release());
</del><ins>+ EventDispatcher::dispatchEvent(this, FocusEvent::create(eventNames().focusEvent, false, false, document().defaultView(), 0, WTF::move(oldFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::dispatchBlurEvent(PassRefPtr<Element> newFocusedElement)
</del><ins>+void Element::dispatchBlurEvent(RefPtr<Element>&& newFocusedElement)
</ins><span class="cx"> {
</span><span class="cx"> if (document().page())
</span><span class="cx"> document().page()->chrome().client().elementDidBlur(this);
</span><span class="cx">
</span><del>- RefPtr<FocusEvent> event = FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, newFocusedElement);
- EventDispatcher::dispatchEvent(this, event.release());
</del><ins>+ EventDispatcher::dispatchEvent(this, FocusEvent::create(eventNames().blurEvent, false, false, document().defaultView(), 0, WTF::move(newFocusedElement)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::mergeWithNextTextNode(Text& node, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/dom/Element.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -532,10 +532,10 @@
</span><span class="cx"> bool dispatchWheelEvent(const PlatformWheelEvent&);
</span><span class="cx"> bool dispatchKeyEvent(const PlatformKeyboardEvent&);
</span><span class="cx"> void dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions = SendNoEvents, SimulatedClickVisualOptions = ShowPressedLook);
</span><del>- void dispatchFocusInEvent(const AtomicString& eventType, PassRefPtr<Element> oldFocusedElement);
- void dispatchFocusOutEvent(const AtomicString& eventType, PassRefPtr<Element> newFocusedElement);
- virtual void dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection);
- virtual void dispatchBlurEvent(PassRefPtr<Element> newFocusedElement);
</del><ins>+ void dispatchFocusInEvent(const AtomicString& eventType, RefPtr<Element>&& oldFocusedElement);
+ void dispatchFocusOutEvent(const AtomicString& eventType, RefPtr<Element>&& newFocusedElement);
+ virtual void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection);
+ virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement);
</ins><span class="cx">
</span><span class="cx"> virtual bool willRecalcStyle(Style::Change);
</span><span class="cx"> virtual void didRecalcStyle(Style::Change);
</span></span></pre></div>
<a id="trunkSourceWebCoredomFocusEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/FocusEvent.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/FocusEvent.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/dom/FocusEvent.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FocusEvent::FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view, int detail, PassRefPtr<EventTarget> relatedTarget)
- : UIEvent(type, canBubble, cancelable, view, detail)
- , m_relatedTarget(relatedTarget)
</del><ins>+FocusEvent::FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<AbstractView>&& view, int detail, RefPtr<EventTarget>&& relatedTarget)
+ : UIEvent(type, canBubble, cancelable, WTF::move(view), detail)
+ , m_relatedTarget(WTF::move(relatedTarget))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomFocusEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/FocusEvent.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/FocusEvent.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/dom/FocusEvent.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -46,9 +46,9 @@
</span><span class="cx"> return adoptRef(*new FocusEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<FocusEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView> view, int detail, PassRefPtr<EventTarget> relatedTarget)
</del><ins>+ static Ref<FocusEvent> create(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<AbstractView>&& view, int detail, RefPtr<EventTarget>&& relatedTarget)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new FocusEvent(type, canBubble, cancelable, view, detail, relatedTarget));
</del><ins>+ return adoptRef(*new FocusEvent(type, canBubble, cancelable, WTF::move(view), detail, WTF::move(relatedTarget)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<FocusEvent> create(const AtomicString& type, const FocusEventInit& initializer)
</span><span class="lines">@@ -57,13 +57,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual EventTarget* relatedTarget() const override { return m_relatedTarget.get(); }
</span><del>- void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; }
</del><ins>+ void setRelatedTarget(RefPtr<EventTarget>&& relatedTarget) { m_relatedTarget = WTF::move(relatedTarget); }
</ins><span class="cx">
</span><span class="cx"> virtual EventInterface eventInterface() const override;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> FocusEvent();
</span><del>- FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<AbstractView>, int, PassRefPtr<EventTarget>);
</del><ins>+ FocusEvent(const AtomicString& type, bool canBubble, bool cancelable, RefPtr<AbstractView>&&, int, RefPtr<EventTarget>&&);
</ins><span class="cx"> FocusEvent(const AtomicString& type, const FocusEventInit&);
</span><span class="cx">
</span><span class="cx"> virtual bool isFocusEvent() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -500,9 +500,9 @@
</span><span class="cx"> return m_validationMessage && m_validationMessage->shadowTreeContains(node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLFormControlElement::dispatchBlurEvent(PassRefPtr<Element> newFocusedElement)
</del><ins>+void HTMLFormControlElement::dispatchBlurEvent(RefPtr<Element>&& newFocusedElement)
</ins><span class="cx"> {
</span><del>- HTMLElement::dispatchBlurEvent(newFocusedElement);
</del><ins>+ HTMLElement::dispatchBlurEvent(WTF::move(newFocusedElement));
</ins><span class="cx"> hideVisibleValidationMessage();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void didRecalcStyle(Style::Change) override;
</span><span class="cx">
</span><del>- virtual void dispatchBlurEvent(PassRefPtr<Element> newFocusedElement) override;
</del><ins>+ virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) override;
</ins><span class="cx">
</span><span class="cx"> // This must be called any time the result of willValidate() has changed.
</span><span class="cx"> void setNeedsWillValidateCheck();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLSelectElement.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -945,23 +945,23 @@
</span><span class="cx"> return optionIndex;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection direction)
</del><ins>+void HTMLSelectElement::dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection direction)
</ins><span class="cx"> {
</span><span class="cx"> // Save the selection so it can be compared to the new selection when
</span><span class="cx"> // dispatching change events during blur event dispatch.
</span><span class="cx"> if (usesMenuList())
</span><span class="cx"> saveLastSelection();
</span><del>- HTMLFormControlElementWithState::dispatchFocusEvent(oldFocusedElement, direction);
</del><ins>+ HTMLFormControlElementWithState::dispatchFocusEvent(WTF::move(oldFocusedElement), direction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLSelectElement::dispatchBlurEvent(PassRefPtr<Element> newFocusedElement)
</del><ins>+void HTMLSelectElement::dispatchBlurEvent(RefPtr<Element>&& newFocusedElement)
</ins><span class="cx"> {
</span><span class="cx"> // We only need to fire change events here for menu lists, because we fire
</span><span class="cx"> // change events for list boxes whenever the selection change is actually made.
</span><span class="cx"> // This matches other browsers' behavior.
</span><span class="cx"> if (usesMenuList())
</span><span class="cx"> dispatchChangeEventForMenuList();
</span><del>- HTMLFormControlElementWithState::dispatchBlurEvent(newFocusedElement);
</del><ins>+ HTMLFormControlElementWithState::dispatchBlurEvent(WTF::move(newFocusedElement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLSelectElement::deselectItemsWithoutValidation(HTMLElement* excludeElement)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLSelectElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLSelectElement.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLSelectElement.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLSelectElement.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> virtual bool isKeyboardFocusable(KeyboardEvent*) const override;
</span><span class="cx"> virtual bool isMouseFocusable() const override;
</span><span class="cx">
</span><del>- virtual void dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection) override final;
- virtual void dispatchBlurEvent(PassRefPtr<Element> newFocusedElement) override final;
</del><ins>+ virtual void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) override final;
+ virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) override final;
</ins><span class="cx">
</span><span class="cx"> virtual bool canStartSelection() const override { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -87,20 +87,20 @@
</span><span class="cx"> return InsertionDone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection direction)
</del><ins>+void HTMLTextFormControlElement::dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection direction)
</ins><span class="cx"> {
</span><span class="cx"> if (supportsPlaceholder())
</span><span class="cx"> updatePlaceholderVisibility();
</span><span class="cx"> handleFocusEvent(oldFocusedElement.get(), direction);
</span><del>- HTMLFormControlElementWithState::dispatchFocusEvent(oldFocusedElement, direction);
</del><ins>+ HTMLFormControlElementWithState::dispatchFocusEvent(WTF::move(oldFocusedElement), direction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::dispatchBlurEvent(PassRefPtr<Element> newFocusedElement)
</del><ins>+void HTMLTextFormControlElement::dispatchBlurEvent(RefPtr<Element>&& newFocusedElement)
</ins><span class="cx"> {
</span><span class="cx"> if (supportsPlaceholder())
</span><span class="cx"> updatePlaceholderVisibility();
</span><span class="cx"> handleBlurEvent();
</span><del>- HTMLFormControlElementWithState::dispatchBlurEvent(newFocusedElement);
</del><ins>+ HTMLFormControlElementWithState::dispatchBlurEvent(WTF::move(newFocusedElement));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextFormControlElement::didEditInnerTextValue()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.h (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> int computeSelectionEnd() const;
</span><span class="cx"> TextFieldSelectionDirection computeSelectionDirection() const;
</span><span class="cx">
</span><del>- virtual void dispatchFocusEvent(PassRefPtr<Element> oldFocusedElement, FocusDirection) override final;
- virtual void dispatchBlurEvent(PassRefPtr<Element> newFocusedElement) override final;
</del><ins>+ virtual void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) override final;
+ virtual void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) override final;
</ins><span class="cx"> virtual bool childShouldCreateRenderer(const Node&) const override;
</span><span class="cx">
</span><span class="cx"> unsigned indexForPosition(const Position&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (177292 => 177293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2014-12-15 19:05:14 UTC (rev 177292)
+++ trunk/Source/WebCore/page/FocusController.cpp 2014-12-15 19:17:04 UTC (rev 177293)
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!focused && document->focusedElement())
</span><del>- document->focusedElement()->dispatchBlurEvent(0);
</del><ins>+ document->focusedElement()->dispatchBlurEvent(nullptr);
</ins><span class="cx"> document->dispatchWindowEvent(Event::create(focused ? eventNames().focusEvent : eventNames().blurEvent, false, false));
</span><span class="cx"> if (focused && document->focusedElement())
</span><del>- document->focusedElement()->dispatchFocusEvent(0, FocusDirectionNone);
</del><ins>+ document->focusedElement()->dispatchFocusEvent(nullptr, FocusDirectionNone);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool hasCustomFocusLogic(Element& element)
</span></span></pre>
</div>
</div>
</body>
</html>