<!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>[201213] trunk</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/201213">201213</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-20 07:42:45 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement operator== for WeakPtr
https://bugs.webkit.org/show_bug.cgi?id=157883
Patch by Rawinder Singh <rawinder.singh-webkit@cisra.canon.com.au> on 2016-05-20
Reviewed by Chris Dumez.
Implement operator== and operator!= for WeakPtr and update code to use the operators.
Source/WebCore:
* page/EventHandler.cpp:
(WebCore::EventHandler::handleMousePressEvent):
(WebCore::EventHandler::updateLastScrollbarUnderMouse):
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformCompleteWheelEvent):
Source/WTF:
* wtf/WeakPtr.h:
(WTF::operator==):
(WTF::operator!=):
Tools:
* TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWeakPtrh">trunk/Source/WTF/wtf/WeakPtr.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFWeakPtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Source/WTF/ChangeLog 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-20 Rawinder Singh <rawinder.singh-webkit@cisra.canon.com.au>
+
+ Implement operator== for WeakPtr
+ https://bugs.webkit.org/show_bug.cgi?id=157883
+
+ Reviewed by Chris Dumez.
+
+ Implement operator== and operator!= for WeakPtr and update code to use the operators.
+
+ * wtf/WeakPtr.h:
+ (WTF::operator==):
+ (WTF::operator!=):
+
</ins><span class="cx"> 2016-05-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve compile-time assertions in is<>() / downcast<>()
</span></span></pre></div>
<a id="trunkSourceWTFwtfWeakPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WeakPtr.h (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WeakPtr.h 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Source/WTF/wtf/WeakPtr.h 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -136,6 +136,36 @@
</span><span class="cx"> Ref<WeakReference<T>> m_ref;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename T, typename U> inline bool operator==(const WeakPtr<T>& a, const WeakPtr<U>& b)
+{
+ return a.get() == b.get();
+}
+
+template<typename T, typename U> inline bool operator==(const WeakPtr<T>& a, U* b)
+{
+ return a.get() == b;
+}
+
+template<typename T, typename U> inline bool operator==(T* a, const WeakPtr<U>& b)
+{
+ return a == b.get();
+}
+
+template<typename T, typename U> inline bool operator!=(const WeakPtr<T>& a, const WeakPtr<U>& b)
+{
+ return a.get() != b.get();
+}
+
+template<typename T, typename U> inline bool operator!=(const WeakPtr<T>& a, U* b)
+{
+ return a.get() != b;
+}
+
+template<typename T, typename U> inline bool operator!=(T* a, const WeakPtr<U>& b)
+{
+ return a != b.get();
+}
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::WeakPtr;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Source/WebCore/ChangeLog 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-20 Rawinder Singh <rawinder.singh-webkit@cisra.canon.com.au>
+
+ Implement operator== for WeakPtr
+ https://bugs.webkit.org/show_bug.cgi?id=157883
+
+ Reviewed by Chris Dumez.
+
+ Implement operator== and operator!= for WeakPtr and update code to use the operators.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ (WebCore::EventHandler::updateLastScrollbarUnderMouse):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformCompleteWheelEvent):
+
</ins><span class="cx"> 2016-05-19 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r200638): -[DOMHTMLVideoElement play] disappeared from ObjC bindings
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -1709,9 +1709,9 @@
</span><span class="cx"> // If the hit testing originally determined the event was in a scrollbar, refetch the MouseEventWithHitTestResults
</span><span class="cx"> // in case the scrollbar widget was destroyed when the mouse event was handled.
</span><span class="cx"> if (mouseEvent.scrollbar()) {
</span><del>- const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse.get();
</del><ins>+ const bool wasLastScrollBar = mouseEvent.scrollbar() == m_lastScrollbarUnderMouse;
</ins><span class="cx"> mouseEvent = m_frame.document()->prepareMouseEvent(HitTestRequest(), documentPoint, platformMouseEvent);
</span><del>- if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse.get())
</del><ins>+ if (wasLastScrollBar && mouseEvent.scrollbar() != m_lastScrollbarUnderMouse)
</ins><span class="cx"> m_lastScrollbarUnderMouse = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3705,7 +3705,7 @@
</span><span class="cx"> // last to scrollbar if setLast is true; else set last to nullptr.
</span><span class="cx"> void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setLast)
</span><span class="cx"> {
</span><del>- if (m_lastScrollbarUnderMouse.get() != scrollbar) {
</del><ins>+ if (m_lastScrollbarUnderMouse != scrollbar) {
</ins><span class="cx"> // Send mouse exited to the old scrollbar.
</span><span class="cx"> if (m_lastScrollbarUnderMouse)
</span><span class="cx"> m_lastScrollbarUnderMouse->mouseExited();
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -1049,7 +1049,7 @@
</span><span class="cx"> m_isHandlingWheelEvent = false;
</span><span class="cx">
</span><span class="cx"> // WebKit2 code path
</span><del>- if (!frameHasPlatformWidget(m_frame) && !latchingState->startedGestureAtScrollLimit() && scrollableContainer == latchingState->scrollableContainer() && scrollableArea && view != scrollableArea.get()) {
</del><ins>+ if (!frameHasPlatformWidget(m_frame) && !latchingState->startedGestureAtScrollLimit() && scrollableContainer == latchingState->scrollableContainer() && scrollableArea && view != scrollableArea) {
</ins><span class="cx"> // If we did not start at the scroll limit, do not pass the event on to be handled by enclosing scrollable regions.
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1067,7 +1067,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the platform widget is handling the event, we always want to return false.
</span><del>- if (scrollableArea.get() == view && view->platformWidget())
</del><ins>+ if (scrollableArea == view && view->platformWidget())
</ins><span class="cx"> didHandleWheelEvent = false;
</span><span class="cx">
</span><span class="cx"> return didHandleWheelEvent;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Tools/ChangeLog 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-20 Rawinder Singh <rawinder.singh-webkit@cisra.canon.com.au>
+
+ Implement operator== for WeakPtr
+ https://bugs.webkit.org/show_bug.cgi?id=157883
+
+ Reviewed by Chris Dumez.
+
+ Implement operator== and operator!= for WeakPtr and update code to use the operators.
+
+ * TestWebKitAPI/Tests/WTF/WeakPtr.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-05-19 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add JSON results to 32-bit and CLoop JSC tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWeakPtrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp (201212 => 201213)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp 2016-05-20 06:35:24 UTC (rev 201212)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WeakPtr.cpp 2016-05-20 14:42:45 UTC (rev 201213)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> EXPECT_TRUE(weakPtr1);
</span><span class="cx"> EXPECT_TRUE(weakPtr2);
</span><span class="cx"> EXPECT_TRUE(weakPtr3);
</span><ins>+ EXPECT_TRUE(weakPtr1 == weakPtr2);
+ EXPECT_TRUE(weakPtr1 == &dummy);
+ EXPECT_TRUE(&dummy == weakPtr2);
</ins><span class="cx"> delete factory;
</span><span class="cx"> EXPECT_NULL(weakPtr1.get());
</span><span class="cx"> EXPECT_NULL(weakPtr2.get());
</span><span class="lines">@@ -80,6 +83,9 @@
</span><span class="cx"> EXPECT_EQ(weakPtr2.get(), &dummy2);
</span><span class="cx"> delete factory2;
</span><span class="cx"> EXPECT_NULL(weakPtr2.get());
</span><ins>+ EXPECT_TRUE(weakPtr1 != weakPtr2);
+ EXPECT_TRUE(weakPtr1 != &dummy2);
+ EXPECT_TRUE(&dummy1 != weakPtr2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF_WeakPtr, RevokeAll)
</span></span></pre>
</div>
</div>
</body>
</html>