<!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>[172890] 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/172890">172890</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-08-23 13:39:07 -0700 (Sat, 23 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Random Gamepad cleanup
https://bugs.webkit.org/show_bug.cgi?id=136193
Reviewed by Sam Weinig.
No new tests (Not tested yet, and no change in behavior anyways)
- Use DOMWindow WeakPtrs when iterating
- More references instead of pointers
* Modules/gamepad/GamepadEvent.cpp:
(WebCore::GamepadEvent::GamepadEvent):
* Modules/gamepad/GamepadEvent.h:
(WebCore::GamepadEvent::create):
* Modules/gamepad/GamepadManager.cpp:
(WebCore::GamepadManager::platformGamepadDisconnected):
(WebCore::GamepadManager::makeGamepadVisible):
* Modules/gamepad/NavigatorGamepad.cpp:
(WebCore::NavigatorGamepad::gamepadFromPlatformGamepad):
(WebCore::NavigatorGamepad::gamepadAtIndex): Deleted.
* Modules/gamepad/NavigatorGamepad.h:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::DOMWindow):
* page/DOMWindow.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadEventcpp">trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadEventh">trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadManagercpp">trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadNavigatorGamepadh">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/ChangeLog 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-08-23 Brady Eidson <beidson@apple.com>
+
+ Random Gamepad cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=136193
+
+ Reviewed by Sam Weinig.
+
+ No new tests (Not tested yet, and no change in behavior anyways)
+
+ - Use DOMWindow WeakPtrs when iterating
+ - More references instead of pointers
+
+ * Modules/gamepad/GamepadEvent.cpp:
+ (WebCore::GamepadEvent::GamepadEvent):
+ * Modules/gamepad/GamepadEvent.h:
+ (WebCore::GamepadEvent::create):
+
+ * Modules/gamepad/GamepadManager.cpp:
+ (WebCore::GamepadManager::platformGamepadDisconnected):
+ (WebCore::GamepadManager::makeGamepadVisible):
+ * Modules/gamepad/NavigatorGamepad.cpp:
+ (WebCore::NavigatorGamepad::gamepadFromPlatformGamepad):
+ (WebCore::NavigatorGamepad::gamepadAtIndex): Deleted.
+ * Modules/gamepad/NavigatorGamepad.h:
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::DOMWindow):
+ * page/DOMWindow.h:
+
</ins><span class="cx"> 2014-08-23 Byungseon Shin <sun.shin@lge.com>
</span><span class="cx">
</span><span class="cx"> Unify GraphicsLayer::setContentsToMedia and setContentsToCanvas
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GamepadEvent::GamepadEvent(const AtomicString& eventType, Gamepad* gamepad)
</del><ins>+GamepadEvent::GamepadEvent(const AtomicString& eventType, Gamepad& gamepad)
</ins><span class="cx"> : Event(eventType, false, false)
</span><del>- , m_gamepad(gamepad)
</del><ins>+ , m_gamepad(&gamepad)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> return adoptRef(new GamepadEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<GamepadEvent> create(const AtomicString& eventType, Gamepad* gamepad)
</del><ins>+ static PassRefPtr<GamepadEvent> create(const AtomicString& eventType, Gamepad& gamepad)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new GamepadEvent(eventType, gamepad));
</span><span class="cx"> }
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> GamepadEvent();
</span><del>- explicit GamepadEvent(const AtomicString& eventType, Gamepad*);
</del><ins>+ explicit GamepadEvent(const AtomicString& eventType, Gamepad&);
</ins><span class="cx"> GamepadEvent(const AtomicString& eventType, const GamepadEventInit&);
</span><span class="cx">
</span><span class="cx"> RefPtr<Gamepad> m_gamepad;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadManager.cpp 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -77,18 +77,21 @@
</span><span class="cx">
</span><span class="cx"> void GamepadManager::platformGamepadDisconnected(PlatformGamepad& platformGamepad)
</span><span class="cx"> {
</span><del>- Vector<DOMWindow*> domWindowVector;
- copyToVector(m_domWindows, domWindowVector);
</del><ins>+ Vector<WeakPtr<DOMWindow>> weakWindows;
+ for (auto* domWindow : m_domWindows)
+ weakWindows.append(domWindow->createWeakPtr());
</ins><span class="cx">
</span><span class="cx"> HashSet<NavigatorGamepad*> notifiedNavigators;
</span><span class="cx">
</span><span class="cx"> // Handle the disconnect for all DOMWindows with event listeners and their Navigators.
</span><del>- for (auto* window : domWindowVector) {
</del><ins>+ for (auto& window : weakWindows) {
</ins><span class="cx"> // Event dispatch might have made this window go away.
</span><del>- if (!m_domWindows.contains(window))
</del><ins>+ if (!window)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window);
</del><ins>+ // This DOMWindow's Navigator might not be accessible. e.g. The DOMWindow might be in the back/forward cache.
+ // If this happens the DOMWindow will not get this gamepaddisconnected event.
+ NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window.get());
</ins><span class="cx"> if (!navigator)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -96,8 +99,7 @@
</span><span class="cx"> if (m_gamepadBlindNavigators.contains(navigator))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RefPtr<Gamepad> gamepad = navigator->gamepadAtIndex(platformGamepad.index());
- ASSERT(gamepad);
</del><ins>+ Ref<Gamepad> gamepad(navigator->gamepadFromPlatformGamepad(platformGamepad));
</ins><span class="cx">
</span><span class="cx"> navigator->gamepadDisconnected(platformGamepad);
</span><span class="cx"> notifiedNavigators.add(navigator);
</span><span class="lines">@@ -132,21 +134,23 @@
</span><span class="cx"> for (auto* navigator : navigatorSet)
</span><span class="cx"> navigator->gamepadConnected(platformGamepad);
</span><span class="cx">
</span><del>- Vector<DOMWindow*> domWindowVector;
- copyToVector(domWindowSet, domWindowVector);
</del><ins>+ Vector<WeakPtr<DOMWindow>> weakWindows;
+ for (auto* domWindow : m_domWindows)
+ weakWindows.append(domWindow->createWeakPtr());
</ins><span class="cx">
</span><del>- for (auto* window : domWindowVector) {
</del><ins>+ for (auto& window : weakWindows) {
</ins><span class="cx"> // Event dispatch might have made this window go away.
</span><del>- if (!m_domWindows.contains(window))
</del><ins>+ if (!window)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window);
</del><ins>+ // This DOMWindow's Navigator might not be accessible. e.g. The DOMWindow might be in the back/forward cache.
+ // If this happens the DOMWindow will not get this gamepadconnected event.
+ // The new gamepad will still be visibile to it once it is restored from the back/forward cache.
+ NavigatorGamepad* navigator = navigatorGamepadFromDOMWindow(window.get());
</ins><span class="cx"> if (!navigator)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- RefPtr<Gamepad> gamepad = navigator->gamepadAtIndex(platformGamepad.index());
- ASSERT(gamepad);
-
</del><ins>+ Ref<Gamepad> gamepad(navigator->gamepadFromPlatformGamepad(platformGamepad));
</ins><span class="cx"> window->dispatchEvent(GamepadEvent::create(eventNames().gamepadconnectedEvent, gamepad.get()), window->document());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -72,11 +72,13 @@
</span><span class="cx"> return supplement;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Gamepad* NavigatorGamepad::gamepadAtIndex(unsigned index)
</del><ins>+PassRef<Gamepad> NavigatorGamepad::gamepadFromPlatformGamepad(PlatformGamepad& platformGamepad)
</ins><span class="cx"> {
</span><del>- if (index >= m_gamepads.size())
- return nullptr;
- return m_gamepads[index].get();
</del><ins>+ unsigned index = platformGamepad.index();
+ if (index >= m_gamepads.size() || !m_gamepads[index])
+ return adoptRef(*Gamepad::create(platformGamepad).leakRef());
+
+ return *m_gamepads[index];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Vector<RefPtr<Gamepad>>& NavigatorGamepad::getGamepads(Navigator* navigator)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> void gamepadConnected(PlatformGamepad&);
</span><span class="cx"> void gamepadDisconnected(PlatformGamepad&);
</span><span class="cx">
</span><del>- Gamepad* gamepadAtIndex(unsigned index);
</del><ins>+ PassRef<Gamepad> gamepadFromPlatformGamepad(PlatformGamepad&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static const char* supplementName();
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx"> , m_shouldPrintWhenFinishedLoading(false)
</span><span class="cx"> , m_suspendedForPageCache(false)
</span><span class="cx"> , m_lastPageStatus(PageStatusNone)
</span><ins>+ , m_weakPtrFactory(this)
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_scrollEventListenerCount(0)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (172889 => 172890)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h 2014-08-23 09:24:44 UTC (rev 172889)
+++ trunk/Source/WebCore/page/DOMWindow.h 2014-08-23 20:39:07 UTC (rev 172890)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "Supplementable.h"
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class ScriptCallStack;
</span><span class="lines">@@ -445,6 +446,8 @@
</span><span class="cx"> void enableSuddenTermination();
</span><span class="cx"> void disableSuddenTermination();
</span><span class="cx">
</span><ins>+ WeakPtr<DOMWindow> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit DOMWindow(Document*);
</span><span class="cx">
</span><span class="lines">@@ -494,6 +497,8 @@
</span><span class="cx"> enum PageStatus { PageStatusNone, PageStatusShown, PageStatusHidden };
</span><span class="cx"> PageStatus m_lastPageStatus;
</span><span class="cx">
</span><ins>+ WeakPtrFactory<DOMWindow> m_weakPtrFactory;
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> unsigned m_scrollEventListenerCount;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>