<!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>[170309] 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/170309">170309</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-23 12:19:55 -0700 (Mon, 23 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add skeleton code for updated Gamepad API
https://bugs.webkit.org/show_bug.cgi?id=134165
Reviewed by Dean Jackson.
No new tests (No change in behavior for any tested configuration)
Interface and dummy implementation for the Gamepad object:
* Modules/gamepad/Gamepad.cpp: Added.
(WebCore::Gamepad::Gamepad):
(WebCore::Gamepad::~Gamepad):
(WebCore::Gamepad::axes):
(WebCore::Gamepad::buttons):
* Modules/gamepad/Gamepad.h: Added.
* Modules/gamepad/Gamepad.idl: Added.
Interface and dummy implementation for the GamepadButton object:
* Modules/gamepad/GamepadButton.cpp: Added.
(WebCore::GamepadButton::GamepadButton):
(WebCore::GamepadButton::pressed):
* Modules/gamepad/GamepadButton.h: Added.
(WebCore::GamepadButton::create):
(WebCore::GamepadButton::value):
(WebCore::GamepadButton::setValue):
* Modules/gamepad/GamepadButton.idl: Added.
Interface and dummy implementation for the GamepadEvent object:
* Modules/gamepad/GamepadEvent.cpp: Added.
(WebCore::GamepadEvent::GamepadEvent):
* Modules/gamepad/GamepadEvent.h: Added.
(WebCore::GamepadEventInit::GamepadEventInit):
(WebCore::GamepadEvent::~GamepadEvent):
(WebCore::GamepadEvent::create):
(WebCore::GamepadEvent::gamepad):
* Modules/gamepad/GamepadEvent.idl: Added.
* dom/EventNames.in:
Interface and dummy implementation for additions to the Navigator object:
* Modules/gamepad/NavigatorGamepad.cpp: Added.
(WebCore::NavigatorGamepad::NavigatorGamepad):
(WebCore::NavigatorGamepad::supplementName):
(WebCore::NavigatorGamepad::from):
(WebCore::NavigatorGamepad::getGamepads):
(WebCore::NavigatorGamepad::gamepads):
* Modules/gamepad/NavigatorGamepad.h: Added.
* Modules/gamepad/NavigatorGamepad.idl: Added.
Bindings additions necessary for these new interfaces:
* bindings/js/JSDOMBinding.h:
(WebCore::JSValueTraits<double>::arrayJSValue):
* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:
Project file stuff:
* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCoreCommon.props:
* WebCore.vcxproj/copyForwardingHeaders.cmd:
* WebCore.xcodeproj/project.pbxproj:
* DerivedSources.make:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreCommonprops">trunk/Source/WebCore/WebCore.vcxproj/WebCoreCommon.props</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojcopyForwardingHeaderscmd">trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingh">trunk/Source/WebCore/bindings/js/JSDOMBinding.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionarycpp">trunk/Source/WebCore/bindings/js/JSDictionary.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDictionaryh">trunk/Source/WebCore/bindings/js/JSDictionary.h</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesin">trunk/Source/WebCore/dom/EventNames.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadcpp">trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadh">trunk/Source/WebCore/Modules/gamepad/Gamepad.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadidl">trunk/Source/WebCore/Modules/gamepad/Gamepad.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadButtoncpp">trunk/Source/WebCore/Modules/gamepad/GamepadButton.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadButtonh">trunk/Source/WebCore/Modules/gamepad/GamepadButton.h</a></li>
<li><a href="#trunkSourceWebCoreModulesgamepadGamepadButtonidl">trunk/Source/WebCore/Modules/gamepad/GamepadButton.idl</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="#trunkSourceWebCoreModulesgamepadGamepadEventidl">trunk/Source/WebCore/Modules/gamepad/GamepadEvent.idl</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="#trunkSourceWebCoreModulesgamepadNavigatorGamepadidl">trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -165,6 +165,11 @@
</span><span class="cx"> Modules/battery/BatteryManager.idl
</span><span class="cx"> Modules/battery/NavigatorBattery.idl
</span><span class="cx">
</span><ins>+ Modules/gamepad/Gamepad.idl
+ Modules/gamepad/GamepadButton.idl
+ Modules/gamepad/GamepadEvent.idl
+ Modules/gamepad/NavigatorGamepad.idl
+
</ins><span class="cx"> Modules/gamepad/deprecated/Gamepad.idl
</span><span class="cx"> Modules/gamepad/deprecated/GamepadList.idl
</span><span class="cx"> Modules/gamepad/deprecated/NavigatorGamepad.idl
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/ChangeLog 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2014-06-23 Brady Eidson <beidson@apple.com>
+
+ Add skeleton code for updated Gamepad API
+ https://bugs.webkit.org/show_bug.cgi?id=134165
+
+ Reviewed by Dean Jackson.
+
+ No new tests (No change in behavior for any tested configuration)
+
+ Interface and dummy implementation for the Gamepad object:
+ * Modules/gamepad/Gamepad.cpp: Added.
+ (WebCore::Gamepad::Gamepad):
+ (WebCore::Gamepad::~Gamepad):
+ (WebCore::Gamepad::axes):
+ (WebCore::Gamepad::buttons):
+ * Modules/gamepad/Gamepad.h: Added.
+ * Modules/gamepad/Gamepad.idl: Added.
+
+ Interface and dummy implementation for the GamepadButton object:
+ * Modules/gamepad/GamepadButton.cpp: Added.
+ (WebCore::GamepadButton::GamepadButton):
+ (WebCore::GamepadButton::pressed):
+ * Modules/gamepad/GamepadButton.h: Added.
+ (WebCore::GamepadButton::create):
+ (WebCore::GamepadButton::value):
+ (WebCore::GamepadButton::setValue):
+ * Modules/gamepad/GamepadButton.idl: Added.
+
+ Interface and dummy implementation for the GamepadEvent object:
+ * Modules/gamepad/GamepadEvent.cpp: Added.
+ (WebCore::GamepadEvent::GamepadEvent):
+ * Modules/gamepad/GamepadEvent.h: Added.
+ (WebCore::GamepadEventInit::GamepadEventInit):
+ (WebCore::GamepadEvent::~GamepadEvent):
+ (WebCore::GamepadEvent::create):
+ (WebCore::GamepadEvent::gamepad):
+ * Modules/gamepad/GamepadEvent.idl: Added.
+ * dom/EventNames.in:
+
+ Interface and dummy implementation for additions to the Navigator object:
+ * Modules/gamepad/NavigatorGamepad.cpp: Added.
+ (WebCore::NavigatorGamepad::NavigatorGamepad):
+ (WebCore::NavigatorGamepad::supplementName):
+ (WebCore::NavigatorGamepad::from):
+ (WebCore::NavigatorGamepad::getGamepads):
+ (WebCore::NavigatorGamepad::gamepads):
+ * Modules/gamepad/NavigatorGamepad.h: Added.
+ * Modules/gamepad/NavigatorGamepad.idl: Added.
+
+ Bindings additions necessary for these new interfaces:
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::JSValueTraits<double>::arrayJSValue):
+ * bindings/js/JSDictionary.cpp:
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSDictionary.h:
+
+ Project file stuff:
+ * CMakeLists.txt:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCoreCommon.props:
+ * WebCore.vcxproj/copyForwardingHeaders.cmd:
+ * WebCore.xcodeproj/project.pbxproj:
+ * DerivedSources.make:
+
</ins><span class="cx"> 2014-06-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Catch Obj-C exceptions thrown by _linenPatternImage
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/DerivedSources.make 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> $(WebCore) \
</span><span class="cx"> $(WebCore)/Modules/airplay \
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia \
</span><ins>+ $(WebCore)/Modules/gamepad \
</ins><span class="cx"> $(WebCore)/Modules/geolocation \
</span><span class="cx"> $(WebCore)/Modules/indexeddb \
</span><span class="cx"> $(WebCore)/Modules/indieui \
</span><span class="lines">@@ -74,6 +75,10 @@
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeyNeededEvent.idl \
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeySession.idl \
</span><span class="cx"> $(WebCore)/Modules/encryptedmedia/MediaKeys.idl \
</span><ins>+ $(WebCore)/Modules/gamepad/Gamepad.idl \
+ $(WebCore)/Modules/gamepad/GamepadButton.idl \
+ $(WebCore)/Modules/gamepad/GamepadEvent.idl \
+ $(WebCore)/Modules/gamepad/NavigatorGamepad.idl \
</ins><span class="cx"> $(WebCore)/Modules/geolocation/Coordinates.idl \
</span><span class="cx"> $(WebCore)/Modules/geolocation/Geolocation.idl \
</span><span class="cx"> $(WebCore)/Modules/geolocation/Geoposition.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.cpp 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Gamepad.h"
+
+#if ENABLE(GAMEPAD)
+
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+Gamepad::Gamepad()
+ : m_index(0)
+ , m_connected(true)
+ , m_timestamp(0.0)
+{
+}
+
+Gamepad::~Gamepad()
+{
+}
+
+const Vector<double>& Gamepad::axes() const
+{
+ return m_axes;
+}
+
+const Vector<Ref<GamepadButton>>& Gamepad::buttons() const
+{
+ return m_buttons;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/Gamepad.h (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.h (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef Gamepad_h
+#define Gamepad_h
+
+#if ENABLE(GAMEPAD)
+
+#include "GamepadButton.h"
+#include <wtf/Ref.h>
+#include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class Gamepad: public RefCounted<Gamepad> {
+public:
+ static PassRefPtr<Gamepad> create()
+ {
+ return adoptRef(new Gamepad);
+ }
+ ~Gamepad();
+
+ const String& id() const { return m_id; }
+ unsigned index() const { return m_index; }
+ const String& mapping() const { return m_mapping; }
+
+ bool connected() const { return m_connected; }
+ double timestamp() const { return m_timestamp; }
+ const Vector<double>& axes() const;
+ const Vector<Ref<GamepadButton>>& buttons() const;
+
+private:
+ Gamepad();
+ String m_id;
+ unsigned m_index;
+ bool m_connected;
+ double m_timestamp;
+ String m_mapping;
+
+ Vector<double> m_axes;
+ Vector<Ref<GamepadButton>> m_buttons;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
+
+#endif // Gamepad_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/Gamepad.idl (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/Gamepad.idl (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/Gamepad.idl 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=GAMEPAD,
+ ImplementationLacksVTable
+] interface Gamepad {
+ readonly attribute DOMString id;
+ readonly attribute unsigned long index;
+ readonly attribute boolean connected;
+ readonly attribute double timestamp;
+ readonly attribute DOMString mapping;
+ readonly attribute double[] axes;
+ readonly attribute GamepadButton[] buttons;
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadButtoncpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadButton.cpp (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadButton.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadButton.cpp 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GamepadButton.h"
+
+#if ENABLE(GAMEPAD)
+
+namespace WebCore {
+
+GamepadButton::GamepadButton()
+ : m_value(0)
+{
+}
+
+bool GamepadButton::pressed() const
+{
+ // FIXME: The spec states that for analog buttons there needs to be a
+ // threshold for determining the state of "pressed".
+ // What should that threshold be?
+ return m_value > 0.1;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadButtonh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadButton.h (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadButton.h (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadButton.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GamepadButton_h
+#define GamepadButton_h
+
+#if ENABLE(GAMEPAD)
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class GamepadButton : public RefCounted<GamepadButton> {
+public:
+ static PassRefPtr<GamepadButton> create()
+ {
+ return adoptRef(new GamepadButton);
+ }
+
+ bool pressed() const;
+ double value() const { return m_value; }
+ void setValue(double value) { m_value = value; }
+
+private:
+ GamepadButton();
+
+ double m_value;
+};
+
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
+
+#endif // GamepadButton_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadButtonidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadButton.idl (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadButton.idl (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadButton.idl 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ NoInterfaceObject,
+ Conditional=GAMEPAD,
+ ImplementationLacksVTable
+] interface GamepadButton {
+ readonly attribute boolean pressed;
+ readonly attribute double value;
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadEventcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.cpp 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "config.h"
+#include "GamepadEvent.h"
+
+#if ENABLE(GAMEPAD)
+
+namespace WebCore {
+
+GamepadEvent::GamepadEvent()
+{
+}
+
+GamepadEvent::GamepadEvent(const AtomicString& eventType, Gamepad* gamepad)
+ : Event(eventType, false, false)
+ , m_gamepad(gamepad)
+{
+}
+
+GamepadEvent::GamepadEvent(const AtomicString& eventType, const GamepadEventInit& initializer)
+ : Event(eventType, initializer)
+ , m_gamepad(initializer.gamepad)
+{
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadEventh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef GamepadEvent_h
+#define GamepadEvent_h
+
+#if ENABLE(GAMEPAD)
+
+#include "Event.h"
+#include "EventNames.h"
+#include "Gamepad.h"
+#include <wtf/RefPtr.h>
+
+namespace WebCore {
+
+struct GamepadEventInit : public EventInit {
+ GamepadEventInit()
+ {
+ }
+
+ RefPtr<Gamepad> gamepad;
+};
+
+class GamepadEvent : public Event {
+public:
+ ~GamepadEvent() { }
+
+ static PassRefPtr<GamepadEvent> create()
+ {
+ return adoptRef(new GamepadEvent);
+ }
+
+ static PassRefPtr<GamepadEvent> create(const AtomicString& eventType, Gamepad* gamepad)
+ {
+ return adoptRef(new GamepadEvent(eventType, gamepad));
+ }
+
+ static PassRefPtr<GamepadEvent> create(const AtomicString& eventType, const GamepadEventInit& initializer)
+ {
+ return adoptRef(new GamepadEvent(eventType, initializer));
+ }
+
+ Gamepad* gamepad() const { return m_gamepad.get(); }
+
+ virtual EventInterface eventInterface() const override { return GamepadEventInterfaceType; }
+
+private:
+ GamepadEvent();
+ explicit GamepadEvent(const AtomicString& eventType, Gamepad*);
+ GamepadEvent(const AtomicString& eventType, const GamepadEventInit&);
+
+ RefPtr<Gamepad> m_gamepad;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
+#endif // GamepadEvent_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadGamepadEventidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/GamepadEvent.idl (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/GamepadEvent.idl (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/GamepadEvent.idl 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=GAMEPAD,
+ ConstructorTemplate=Event
+] interface GamepadEvent : Event {
+ [InitializedByEventConstructor] readonly attribute Gamepad gamepad;
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.cpp 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NavigatorGamepad.h"
+
+#if ENABLE(GAMEPAD)
+
+#include "Gamepad.h"
+#include "Navigator.h"
+#include <wtf/NeverDestroyed.h>
+
+namespace WebCore {
+
+NavigatorGamepad::NavigatorGamepad()
+{
+}
+
+const char* NavigatorGamepad::supplementName()
+{
+ return "NavigatorGamepad";
+}
+
+NavigatorGamepad* NavigatorGamepad::from(Navigator* navigator)
+{
+ NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(Supplement<Navigator>::from(navigator, supplementName()));
+ if (!supplement) {
+ auto newSupplement = std::make_unique<NavigatorGamepad>();
+ supplement = newSupplement.get();
+ provideTo(navigator, supplementName(), std::move(newSupplement));
+ }
+ return supplement;
+}
+
+const Vector<RefPtr<Gamepad>>& NavigatorGamepad::getGamepads(Navigator* navigator)
+{
+ return NavigatorGamepad::from(navigator)->gamepads();
+}
+
+const Vector<RefPtr<Gamepad>>& NavigatorGamepad::gamepads()
+{
+ return m_gamepads;
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef NavigatorGamepad_h
+#define NavigatorGamepad_h
+
+#if ENABLE(GAMEPAD)
+
+#include "Supplementable.h"
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+class Gamepad;
+class Navigator;
+
+class NavigatorGamepad : public Supplement<Navigator> {
+public:
+ NavigatorGamepad();
+
+ static NavigatorGamepad* from(Navigator*);
+
+ static const Vector<RefPtr<Gamepad>>& getGamepads(Navigator*);
+
+private:
+ static const char* supplementName();
+
+ const Vector<RefPtr<Gamepad>>& gamepads();
+
+ Vector<RefPtr<Gamepad>> m_gamepads;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(GAMEPAD)
+
+#endif // NavigatorGamepad_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreModulesgamepadNavigatorGamepadidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl (0 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl (rev 0)
+++ trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Conditional=GAMEPAD,
+] partial interface Navigator {
+ Gamepad[] getGamepads();
+};
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -1900,6 +1900,48 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepadButton.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepadEvent.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -6567,6 +6609,10 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\Modules\gamepad\Gamepad.cpp" />
+ <ClCompile Include="..\Modules\gamepad\GamepadButton.cpp" />
+ <ClCompile Include="..\Modules\gamepad\GamepadEvent.cpp" />
+ <ClCompile Include="..\Modules\gamepad\NavigatorGamepad.cpp" />
</ins><span class="cx"> <ClCompile Include="..\Modules\geolocation\Coordinates.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\geolocation\Geolocation.cpp" />
</span><span class="cx"> <ClCompile Include="..\Modules\geolocation\GeolocationController.cpp" />
</span><span class="lines">@@ -18205,6 +18251,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReader.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFileReaderSync.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSFontLoader.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepad.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepadButton.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGamepadEvent.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeolocation.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGeoposition.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSHashChangeEvent.h" />
</span><span class="lines">@@ -18780,6 +18829,10 @@
</span><span class="cx"> <ClInclude Include="..\html\track\VTTRegion.h" />
</span><span class="cx"> <ClInclude Include="..\html\track\VTTRegionList.h" />
</span><span class="cx"> <ClInclude Include="..\html\track\WebVTTElement.h" />
</span><ins>+ <ClInclude Include="..\Modules\gamepad\Gamepad.h" />
+ <ClInclude Include="..\Modules\gamepad\GamepadButton.h" />
+ <ClInclude Include="..\Modules\gamepad\GamepadEvent.h" />
+ <ClInclude Include="..\Modules\gamepad\NavigatorGamepad.h" />
</ins><span class="cx"> <ClInclude Include="..\Modules\geolocation\Coordinates.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\Geolocation.h" />
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\GeolocationClient.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreCommon.props (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreCommon.props 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreCommon.props 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\mediacontrols;$(ProjectDir)..\Modules\mediastream;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\plugins;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\cssjit;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\line;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\shapes;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\audio;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\icu;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\replay;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\crypto;$(ProjectDir)..\crypto\keys;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\style;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(ProjectDir)..\platform\graphics\gpu;$(ProjectDir)..\platform\graphics\egl;$(ProjectDir)..\platform\graphics\surfaces;$(ProjectDir)..\platform\graphics\surfaces\egl;$(ProjectDir)..\platform\graphics\opengl;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</del><ins>+ <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\Modules\mediacontrols;$(ProjectDir)..\Modules\mediastream;$(ProjectDir)..\Modules\filesystem;$(ProjectDir)..\Modules\gamepad;$(ProjectDir)..\Modules\geolocation;$(ProjectDir)..\Modules\indexeddb;$(ProjectDir)..\Modules\mediasource;$(ProjectDir)..\Modules\navigatorcontentutils;$(ProjectDir)..\Modules\plugins;$(ProjectDir)..\Modules\speech;$(ProjectDir)..\Modules\proximity;$(ProjectDir)..\Modules\quota;$(ProjectDir)..\Modules\notifications;$(ProjectDir)..\Modules\webdatabase;$(ProjectDir)..\Modules\websockets;$(ProjectDir)..\accessibility;$(ProjectDir)..\accessibility\win;$(ProjectDir)..\bridge;$(ProjectDir)..\bridge\c;$(ProjectDir)..\bridge\jsc;$(ProjectDir)..\css;$(ProjectDir)..\cssjit;$(ProjectDir)..\editing;$(ProjectDir)..\fileapi;$(ProjectDir)..\rendering;$(ProjectDir)..\rendering\line;$(ProjectDir)..\rendering\mathml;$(ProjectDir)..\rendering\shapes;$(ProjectDir)..\rendering\style;$(ProjectDir)..\rendering\svg;$(ProjectDir)..\bindings;$(ProjectDir)..\bindings\generic;$(ProjectDir)..\bindings\js;$(ProjectDir)..\bindings\js\specialization;$(ProjectDir)..\dom;$(ProjectDir)..\dom\default;$(ProjectDir)..\history;$(ProjectDir)..\html;$(ProjectDir)..\html\canvas;$(ProjectDir)..\html\forms;$(ProjectDir)..\html\parser;$(ProjectDir)..\html\shadow;$(ProjectDir)..\html\track;$(ProjectDir)..\inspector;$(ProjectDir)..\loader;$(ProjectDir)..\loader\appcache;$(ProjectDir)..\loader\archive;$(ProjectDir)..\loader\archive\cf;$(ProjectDir)..\loader\cache;$(ProjectDir)..\loader\icon;$(ProjectDir)..\mathml;$(ProjectDir)..\page;$(ProjectDir)..\page\animation;$(ProjectDir)..\page\scrolling;$(ProjectDir)..\page\win;$(ProjectDir)..\platform;$(ProjectDir)..\platform\animation;$(ProjectDir)..\platform\audio;$(ProjectDir)..\platform\mock;$(ProjectDir)..\platform\sql;$(ProjectDir)..\platform\win;$(ProjectDir)..\platform\network;$(ProjectDir)..\platform\network\win;$(ProjectDir)..\platform\cf;$(ProjectDir)..\platform\graphics;$(ProjectDir)..\platform\graphics\ca;$(ProjectDir)..\platform\graphics\cpu\arm\filters;$(ProjectDir)..\platform\graphics\filters;$(ProjectDir)..\platform\graphics\filters\arm;$(ProjectDir)..\platform\graphics\opentype;$(ProjectDir)..\platform\graphics\transforms;$(ProjectDir)..\platform\text;$(ProjectDir)..\platform\text\icu;$(ProjectDir)..\platform\text\transcoder;$(ProjectDir)..\platform\graphics\win;$(ProjectDir)..\xml;$(ProjectDir)..\xml\parser;$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources;$(ProjectDir)..\plugins;$(ProjectDir)..\plugins\win;$(ProjectDir)..\replay;$(ProjectDir)..\svg\animation;$(ProjectDir)..\svg\graphics;$(ProjectDir)..\svg\properties;$(ProjectDir)..\svg\graphics\filters;$(ProjectDir)..\svg;$(ProjectDir)..\testing;$(ProjectDir)..\crypto;$(ProjectDir)..\crypto\keys;$(ProjectDir)..\wml;$(ProjectDir)..\storage;$(ProjectDir)..\style;$(ProjectDir)..\websockets;$(ProjectDir)..\workers;$(ConfigurationBuildDir)\include;$(ConfigurationBuildDir)\include\private;$(ConfigurationBuildDir)\include\JavaScriptCore;$(ConfigurationBuildDir)\include\private\JavaScriptCore;$(ProjectDir)..\ForwardingHeaders;$(ProjectDir)..\platform\graphics\gpu;$(ProjectDir)..\platform\graphics\egl;$(ProjectDir)..\platform\graphics\surfaces;$(ProjectDir)..\platform\graphics\surfaces\egl;$(ProjectDir)..\platform\graphics\opengl;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;$(WebKit_Libraries)\include\private\JavaScriptCore;$(WebKit_Libraries)\include\sqlite;$(WebKit_Libraries)\include\JavaScriptCore;$(WebKit_Libraries)\include\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ins><span class="cx"> <PreprocessorDefinitions>DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</span><span class="cx"> <PrecompiledHeader>Use</PrecompiledHeader>
</span><span class="cx"> <PrecompiledHeaderFile>WebCorePrefix.h</PrecompiledHeaderFile>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojcopyForwardingHeaderscmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span><span class="cx"> xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span><span class="cx"> xcopy /y /d "%ProjectDir%..\Modules\filesystem\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span><ins>+xcopy /y /d "%ProjectDir%..\Modules\gamepad\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</ins><span class="cx"> xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span><span class="cx"> xcopy /y /d "%ProjectDir%..\Modules\mediacontrols\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span><span class="cx"> xcopy /y /d "%ProjectDir%..\Modules\mediasource\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -1894,6 +1894,9 @@
</span><span class="cx"> 516953971329A3C800B92D04 /* IconDatabaseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516953951329A3C800B92D04 /* IconDatabaseBase.cpp */; };
</span><span class="cx"> 516953981329A3C800B92D04 /* IconDatabaseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 516953961329A3C800B92D04 /* IconDatabaseBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 516BB7940CE91E6800512F79 /* JSTreeWalkerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */; };
</span><ins>+ 516C62201950D48700337E75 /* GamepadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516C621D1950D48700337E75 /* GamepadEvent.cpp */; };
+ 516C62211950D48700337E75 /* GamepadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 516C621E1950D48700337E75 /* GamepadEvent.h */; };
+ 516C62251950E2B900337E75 /* JSGamepadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 516C62231950E2B900337E75 /* JSGamepadEvent.cpp */; };
</ins><span class="cx"> 51741D0F0B07259A00ED442C /* BackForwardClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51741D0B0B07259A00ED442C /* BackForwardClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51741D110B07259A00ED442C /* HistoryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 51741D0D0B07259A00ED442C /* HistoryItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51741D120B07259A00ED442C /* HistoryItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51741D0E0B07259A00ED442C /* HistoryItem.cpp */; };
</span><span class="lines">@@ -1906,9 +1909,16 @@
</span><span class="cx"> 5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */; };
</span><span class="cx"> 5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */; };
</span><span class="cx"> 5189F0DE10B46B0E00F3C739 /* PopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */; };
</span><ins>+ 518F4FF6194CA4E60081BAAE /* GamepadButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518F4FED194CA4E60081BAAE /* GamepadButton.cpp */; };
+ 518F5001194CAC3A0081BAAE /* JSGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518F4FFD194CAC3A0081BAAE /* JSGamepad.cpp */; };
+ 518F5002194CAC3A0081BAAE /* JSGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 518F4FFE194CAC3A0081BAAE /* JSGamepad.h */; };
+ 518F5003194CAC3A0081BAAE /* JSGamepadButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518F4FFF194CAC3A0081BAAE /* JSGamepadButton.cpp */; };
+ 518F5004194CAC3A0081BAAE /* JSGamepadButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 518F5000194CAC3A0081BAAE /* JSGamepadButton.h */; };
</ins><span class="cx"> 51A052331058774F00CC9E95 /* CredentialStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A052311058774F00CC9E95 /* CredentialStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51A052341058774F00CC9E95 /* CredentialStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A052321058774F00CC9E95 /* CredentialStorage.cpp */; };
</span><span class="cx"> 51A052561058874000CC9E95 /* ProtectionSpaceHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A052551058874000CC9E95 /* ProtectionSpaceHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A4BB071954D61600FA5C2E /* Gamepad.cpp */; };
+ 51A4BB101954D62700FA5C2E /* NavigatorGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A4BB0D1954D62700FA5C2E /* NavigatorGamepad.cpp */; };
</ins><span class="cx"> 51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */; };
</span><span class="cx"> 51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */; };
</span><span class="cx"> 51ABAE1E103C1913008C5260 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */; };
</span><span class="lines">@@ -8943,6 +8953,11 @@
</span><span class="cx"> 516953951329A3C800B92D04 /* IconDatabaseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IconDatabaseBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 516953961329A3C800B92D04 /* IconDatabaseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconDatabaseBase.h; sourceTree = "<group>"; };
</span><span class="cx"> 516BB7920CE91E6800512F79 /* JSTreeWalkerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTreeWalkerCustom.cpp; sourceTree = "<group>"; };
</span><ins>+ 516C621D1950D48700337E75 /* GamepadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GamepadEvent.cpp; sourceTree = "<group>"; };
+ 516C621E1950D48700337E75 /* GamepadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadEvent.h; sourceTree = "<group>"; };
+ 516C621F1950D48700337E75 /* GamepadEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GamepadEvent.idl; sourceTree = "<group>"; };
+ 516C62231950E2B900337E75 /* JSGamepadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGamepadEvent.cpp; sourceTree = "<group>"; };
+ 516C62241950E2B900337E75 /* JSGamepadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGamepadEvent.h; sourceTree = "<group>"; };
</ins><span class="cx"> 51741D0B0B07259A00ED442C /* BackForwardClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 51741D0D0B07259A00ED442C /* HistoryItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HistoryItem.h; sourceTree = "<group>"; };
</span><span class="cx"> 51741D0E0B07259A00ED442C /* HistoryItem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HistoryItem.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -8957,11 +8972,24 @@
</span><span class="cx"> 5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPopStateEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPopStateEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopStateEvent.cpp; sourceTree = "<group>"; };
</span><ins>+ 518F4FED194CA4E60081BAAE /* GamepadButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GamepadButton.cpp; sourceTree = "<group>"; };
+ 518F4FEE194CA4E60081BAAE /* GamepadButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadButton.h; sourceTree = "<group>"; };
+ 518F4FEF194CA4E60081BAAE /* GamepadButton.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GamepadButton.idl; sourceTree = "<group>"; };
+ 518F4FFD194CAC3A0081BAAE /* JSGamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGamepad.cpp; sourceTree = "<group>"; };
+ 518F4FFE194CAC3A0081BAAE /* JSGamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGamepad.h; sourceTree = "<group>"; };
+ 518F4FFF194CAC3A0081BAAE /* JSGamepadButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGamepadButton.cpp; sourceTree = "<group>"; };
+ 518F5000194CAC3A0081BAAE /* JSGamepadButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGamepadButton.h; sourceTree = "<group>"; };
</ins><span class="cx"> 519FE0A10DAD446E00A08F21 /* HTMLAttributeNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLAttributeNames.in; sourceTree = "<group>"; };
</span><span class="cx"> 519FE0A20DAD446E00A08F21 /* HTMLTagNames.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTagNames.in; sourceTree = "<group>"; };
</span><span class="cx"> 51A052311058774F00CC9E95 /* CredentialStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CredentialStorage.h; sourceTree = "<group>"; };
</span><span class="cx"> 51A052321058774F00CC9E95 /* CredentialStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CredentialStorage.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51A052551058874000CC9E95 /* ProtectionSpaceHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProtectionSpaceHash.h; sourceTree = "<group>"; };
</span><ins>+ 51A4BB071954D61600FA5C2E /* Gamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Gamepad.cpp; sourceTree = "<group>"; };
+ 51A4BB081954D61600FA5C2E /* Gamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Gamepad.h; sourceTree = "<group>"; };
+ 51A4BB091954D61600FA5C2E /* Gamepad.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Gamepad.idl; sourceTree = "<group>"; };
+ 51A4BB0D1954D62700FA5C2E /* NavigatorGamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorGamepad.cpp; sourceTree = "<group>"; };
+ 51A4BB0E1954D62700FA5C2E /* NavigatorGamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorGamepad.h; sourceTree = "<group>"; };
+ 51A4BB0F1954D62700FA5C2E /* NavigatorGamepad.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorGamepad.idl; sourceTree = "<group>"; };
</ins><span class="cx"> 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
</span><span class="cx"> 51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandle.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14811,6 +14839,7 @@
</span><span class="cx"> CDA98DCD1601515C00FEA3B1 /* EncryptedMedia */,
</span><span class="cx"> A83B79120CCB003F000B0825 /* Events */,
</span><span class="cx"> 89878576122CA1DA003AABDA /* FileAPI */,
</span><ins>+ 518F4FFC194CABE30081BAAE /* Gamepad */,
</ins><span class="cx"> A83B79080CCAFF2B000B0825 /* HTML */,
</span><span class="cx"> AA93C850175D5B2000FD3CE3 /* IndieUI */,
</span><span class="cx"> 1C5FAECA0DCFD8C900D58F78 /* Inspector */,
</span><span class="lines">@@ -15807,7 +15836,6 @@
</span><span class="cx"> 498771161242CD7F002226BA /* mac */,
</span><span class="cx"> 498770C21242C535002226BA /* DrawingBuffer.cpp */,
</span><span class="cx"> 498770C31242C535002226BA /* DrawingBuffer.h */,
</span><del>- 498770D01242C535002226BA /* Shader.h */,
</del><span class="cx"> 498770D71242C535002226BA /* Texture.cpp */,
</span><span class="cx"> 498770D81242C535002226BA /* Texture.h */,
</span><span class="cx"> 498770D91242C535002226BA /* TilingData.cpp */,
</span><span class="lines">@@ -16021,6 +16049,38 @@
</span><span class="cx"> path = ios;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 518F4FE9194CA4B60081BAAE /* gamepad */ = {
+ isa = PBXGroup;
+ children = (
+ 51A4BB071954D61600FA5C2E /* Gamepad.cpp */,
+ 51A4BB081954D61600FA5C2E /* Gamepad.h */,
+ 51A4BB091954D61600FA5C2E /* Gamepad.idl */,
+ 518F4FED194CA4E60081BAAE /* GamepadButton.cpp */,
+ 518F4FEE194CA4E60081BAAE /* GamepadButton.h */,
+ 518F4FEF194CA4E60081BAAE /* GamepadButton.idl */,
+ 516C621D1950D48700337E75 /* GamepadEvent.cpp */,
+ 516C621E1950D48700337E75 /* GamepadEvent.h */,
+ 516C621F1950D48700337E75 /* GamepadEvent.idl */,
+ 51A4BB0D1954D62700FA5C2E /* NavigatorGamepad.cpp */,
+ 51A4BB0E1954D62700FA5C2E /* NavigatorGamepad.h */,
+ 51A4BB0F1954D62700FA5C2E /* NavigatorGamepad.idl */,
+ );
+ path = gamepad;
+ sourceTree = "<group>";
+ };
+ 518F4FFC194CABE30081BAAE /* Gamepad */ = {
+ isa = PBXGroup;
+ children = (
+ 518F4FFD194CAC3A0081BAAE /* JSGamepad.cpp */,
+ 518F4FFE194CAC3A0081BAAE /* JSGamepad.h */,
+ 518F4FFF194CAC3A0081BAAE /* JSGamepadButton.cpp */,
+ 518F5000194CAC3A0081BAAE /* JSGamepadButton.h */,
+ 516C62231950E2B900337E75 /* JSGamepadEvent.cpp */,
+ 516C62241950E2B900337E75 /* JSGamepadEvent.h */,
+ );
+ name = Gamepad;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 51C4AA5118B28357007BFE9B /* mac */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -17869,6 +17929,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> CE26169D187E6554007955F3 /* airplay */,
</span><span class="cx"> CDA98DBD16014E0800FEA3B1 /* encryptedmedia */,
</span><ins>+ 518F4FE9194CA4B60081BAAE /* gamepad */,
</ins><span class="cx"> 971145FF14EF007900674FD9 /* geolocation */,
</span><span class="cx"> 9712A55315004E3C0048AF10 /* indexeddb */,
</span><span class="cx"> AA7EA0A917557B1C00DF4643 /* indieui */,
</span><span class="lines">@@ -23134,6 +23195,7 @@
</span><span class="cx"> FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
</span><span class="cx"> CD2F4A2418D89F700063746D /* AudioHardwareListener.h in Headers */,
</span><span class="cx"> FE4AADEE16D2C37400026FFC /* AbstractSQLStatement.h in Headers */,
</span><ins>+ 516C62211950D48700337E75 /* GamepadEvent.h in Headers */,
</ins><span class="cx"> FE4AADEF16D2C37400026FFC /* AbstractSQLStatementBackend.h in Headers */,
</span><span class="cx"> 41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
</span><span class="cx"> 29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
</span><span class="lines">@@ -23330,6 +23392,7 @@
</span><span class="cx"> 0753860314489E9800B78452 /* CachedTextTrack.h in Headers */,
</span><span class="cx"> BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */,
</span><span class="cx"> 93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
</span><ins>+ 518F5002194CAC3A0081BAAE /* JSGamepad.h in Headers */,
</ins><span class="cx"> 49AE2D97134EE5F90072920A /* CalculationValue.h in Headers */,
</span><span class="cx"> B1D5ECB5134B58DA0087C78F /* CallbackFunction.h in Headers */,
</span><span class="cx"> 6E4E91AD10F7FB3100A2779C /* CanvasContextAttributes.h in Headers */,
</span><span class="lines">@@ -26326,6 +26389,7 @@
</span><span class="cx"> F5A154281279534D00D0B0C0 /* ValidationMessage.h in Headers */,
</span><span class="cx"> F513A3EA15FF4841001526DB /* ValidationMessageClient.h in Headers */,
</span><span class="cx"> 15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */,
</span><ins>+ 518F5004194CAC3A0081BAAE /* JSGamepadButton.h in Headers */,
</ins><span class="cx"> 9A1142041832D135000BB8AD /* ValueToString.h in Headers */,
</span><span class="cx"> FD3160AF12B026F700C1A359 /* VectorMath.h in Headers */,
</span><span class="cx"> BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */,
</span><span class="lines">@@ -27095,6 +27159,7 @@
</span><span class="cx"> 97627B8D14FB3CEE002CDCA1 /* ContextDestructionObserver.cpp in Sources */,
</span><span class="cx"> 5106D7BD18BDB76F000AB166 /* ContextMenuContext.cpp in Sources */,
</span><span class="cx"> 065AD4F60B0C2EDA005A2B1D /* ContextMenuController.cpp in Sources */,
</span><ins>+ 518F5001194CAC3A0081BAAE /* JSGamepad.cpp in Sources */,
</ins><span class="cx"> 06027CB30B1CC03D00884B2D /* ContextMenuItemMac.mm in Sources */,
</span><span class="cx"> 93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */,
</span><span class="cx"> FD31602812B0267600C1A359 /* ConvolverNode.cpp in Sources */,
</span><span class="lines">@@ -27298,6 +27363,7 @@
</span><span class="cx"> 1A8F6BC20DB55CDC001DB794 /* DOMApplicationCache.cpp in Sources */,
</span><span class="cx"> 85D389B30A991A7F00282145 /* DOMAttr.mm in Sources */,
</span><span class="cx"> BC946EF0107FDBAC00857193 /* DOMBeforeLoadEvent.mm in Sources */,
</span><ins>+ 51A4BB101954D62700FA5C2E /* NavigatorGamepad.cpp in Sources */,
</ins><span class="cx"> 2E2D99E810E2BC1C00496337 /* DOMBlob.mm in Sources */,
</span><span class="cx"> 85089CD80A98C42800A275AA /* DOMCDATASection.mm in Sources */,
</span><span class="cx"> 85ACA9870A9B520300671E90 /* DOMCharacterData.mm in Sources */,
</span><span class="lines">@@ -27688,6 +27754,7 @@
</span><span class="cx"> A8CFF7A80A156978000A4234 /* HTMLBRElement.cpp in Sources */,
</span><span class="cx"> A81369D3097374F600D74463 /* HTMLButtonElement.cpp in Sources */,
</span><span class="cx"> 93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */,
</span><ins>+ 51A4BB0A1954D61600FA5C2E /* Gamepad.cpp in Sources */,
</ins><span class="cx"> A8DF3FD1097FA0FC0052981B /* HTMLCollection.cpp in Sources */,
</span><span class="cx"> 977B3864122883E900B81FF8 /* HTMLConstructionSite.cpp in Sources */,
</span><span class="cx"> F5C041DA0FFCA7CE00839D4A /* HTMLDataListElement.cpp in Sources */,
</span><span class="lines">@@ -28044,6 +28111,7 @@
</span><span class="cx"> 1ACE53DF0A8D18810022947D /* JSDOMParser.cpp in Sources */,
</span><span class="cx"> FB91392B16AE4FC0001FE682 /* JSDOMPath.cpp in Sources */,
</span><span class="cx"> A9D247FE0D757E6900FDF959 /* JSDOMPlugin.cpp in Sources */,
</span><ins>+ 518F5003194CAC3A0081BAAE /* JSGamepadButton.cpp in Sources */,
</ins><span class="cx"> A9D248000D757E6900FDF959 /* JSDOMPluginArray.cpp in Sources */,
</span><span class="cx"> A9C6E64C0D7465E7006442E9 /* JSDOMPluginArrayCustom.cpp in Sources */,
</span><span class="cx"> A9C6E64D0D7465E7006442E9 /* JSDOMPluginCustom.cpp in Sources */,
</span><span class="lines">@@ -28353,6 +28421,7 @@
</span><span class="cx"> 0FEA3E7F191B3169000F1B55 /* ScrollingTreeOverflowScrollingNode.cpp in Sources */,
</span><span class="cx"> B59DD69E11902A42007E9684 /* JSSQLTransactionCallback.cpp in Sources */,
</span><span class="cx"> 1AD2316E0CD269E700C1F194 /* JSSQLTransactionCustom.cpp in Sources */,
</span><ins>+ 518F4FF6194CA4E60081BAAE /* GamepadButton.cpp in Sources */,
</ins><span class="cx"> B59DD6A211902A52007E9684 /* JSSQLTransactionErrorCallback.cpp in Sources */,
</span><span class="cx"> B58CEB6E1191361C002A6790 /* JSSQLTransactionSync.cpp in Sources */,
</span><span class="cx"> B55D5AA5119131FC00BCC315 /* JSSQLTransactionSyncCallback.cpp in Sources */,
</span><span class="lines">@@ -28989,6 +29058,7 @@
</span><span class="cx"> DE49B309165F2FE10010338D /* RenderMediaControlElements.cpp in Sources */,
</span><span class="cx"> 41FA303E1316C29C00C0BFC5 /* RenderMediaControls.cpp in Sources */,
</span><span class="cx"> ABDDFE790A5C6E7000A3E11D /* RenderMenuList.cpp in Sources */,
</span><ins>+ 516C62201950D48700337E75 /* GamepadEvent.cpp in Sources */,
</ins><span class="cx"> A454424E119B3687009BE912 /* RenderMeter.cpp in Sources */,
</span><span class="cx"> 1A3586DF15264C450022A659 /* RenderMultiColumnFlowThread.cpp in Sources */,
</span><span class="cx"> BCE32B9E1517C22700F542EC /* RenderMultiColumnSet.cpp in Sources */,
</span><span class="lines">@@ -29342,6 +29412,7 @@
</span><span class="cx"> B22279970D00BF220071B782 /* SVGAnimationElement.cpp in Sources */,
</span><span class="cx"> 08FB17C113BC7E9100040086 /* SVGAttributeToPropertyMap.cpp in Sources */,
</span><span class="cx"> B222799B0D00BF220071B782 /* SVGCircleElement.cpp in Sources */,
</span><ins>+ 516C62251950E2B900337E75 /* JSGamepadEvent.cpp in Sources */,
</ins><span class="cx"> B222799E0D00BF220071B782 /* SVGClipPathElement.cpp in Sources */,
</span><span class="cx"> B22279A10D00BF220071B782 /* SVGColor.cpp in Sources */,
</span><span class="cx"> B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -52,6 +52,17 @@
</span><span class="cx"> class HashEntry;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+namespace WTF {
+
+template<typename T> inline T* getPtr(const Ref<T>& p)
+{
+ return const_cast<T*>(&p.get());
+}
+
+}
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CachedScript;
</span><span class="lines">@@ -416,6 +427,13 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct JSValueTraits<double> {
+ static JSC::JSValue arrayJSValue(JSC::ExecState*, JSDOMGlobalObject*, const double& value)
+ {
+ return JSC::jsNumber(value);
+ }
+};
+
</ins><span class="cx"> template<> struct JSValueTraits<float> {
</span><span class="cx"> static JSC::JSValue arrayJSValue(JSC::ExecState*, JSDOMGlobalObject*, const float& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -56,6 +56,10 @@
</span><span class="cx"> #include "JSSpeechRecognitionResultList.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+#include "JSGamepad.h"
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -265,6 +269,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(GAMEPAD)
+void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<Gamepad>& result)
+{
+ result = toGamepad(value);
+}
+#endif
+
</ins><span class="cx"> bool JSDictionary::getWithUndefinedOrNullCheck(const String& propertyName, String& result) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isValid());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDictionary.h (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDictionary.h 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.h 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class DOMError;
</span><span class="cx"> class DOMWindow;
</span><span class="cx"> class EventTarget;
</span><ins>+class Gamepad;
</ins><span class="cx"> class MediaKeyError;
</span><span class="cx"> class MediaStream;
</span><span class="cx"> class MediaStreamTrack;
</span><span class="lines">@@ -140,6 +141,9 @@
</span><span class="cx"> #if ENABLE(SCRIPTED_SPEECH)
</span><span class="cx"> static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<SpeechRecognitionResultList>&);
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(GAMEPAD)
+ static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<Gamepad>&);
+#endif
</ins><span class="cx">
</span><span class="cx"> JSC::ExecState* m_exec;
</span><span class="cx"> JSC::Strong<JSC::JSObject> m_initializerObject;
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.in (170308 => 170309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventNames.in 2014-06-23 19:02:23 UTC (rev 170308)
+++ trunk/Source/WebCore/dom/EventNames.in 2014-06-23 19:19:55 UTC (rev 170309)
</span><span class="lines">@@ -61,4 +61,5 @@
</span><span class="cx"> UIRequestEvent conditional=INDIE_UI
</span><span class="cx"> GestureEvent conditional=IOS_GESTURE_EVENTS
</span><span class="cx"> WebKitPlaybackTargetAvailabilityEvent conditional=IOS_AIRPLAY
</span><ins>+GamepadEvent conditional=GAMEPAD
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>