<!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>[205470] trunk/Source/WebKit2</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/205470">205470</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2016-09-05 22:57:16 -0700 (Mon, 05 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ENABLE(GAMEPAD) build errors on non-Cocoa platforms
https://bugs.webkit.org/show_bug.cgi?id=161596
Reviewed by Darin Adler.
This patch fixes build errors popping up when enabling Gamepad
feature on non-Cocoa platforms.
* CMakeLists.txt: Add the Source/WebCore/platform/gamepad/ directory to
WebKit2_INCLUDE_DIRECTORIES. Add GamepadData.cpp, UIGamepad.cpp files to the build.
* UIProcess/Gamepad/UIGamepadProvider.cpp: Don't include Cocoa-specific
HIDGamepadProvider.h file. Update methods for the UIGamepadProvider class.
(WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
(WebKit::UIGamepadProvider::platformStartMonitoringGamepads): Deleted.
(WebKit::UIGamepadProvider::platformStopMonitoringGamepads): Deleted.
(WebKit::UIGamepadProvider::platformGamepads): Deleted.
(WebKit::UIGamepadProvider::platformWebProcessProxyForGamepadInput): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp">trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (205469 => 205470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-09-06 05:57:16 UTC (rev 205470)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx"> "${WEBCORE_DIR}/platform"
</span><span class="cx"> "${WEBCORE_DIR}/platform/animation"
</span><span class="cx"> "${WEBCORE_DIR}/platform/audio"
</span><ins>+ "${WEBCORE_DIR}/platform/gamepad"
</ins><span class="cx"> "${WEBCORE_DIR}/platform/graphics"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/filters"
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/harfbuzz"
</span><span class="lines">@@ -331,6 +332,8 @@
</span><span class="cx"> Shared/Databases/IndexedDB/IDBUtilities.cpp
</span><span class="cx"> Shared/Databases/IndexedDB/WebIDBResult.cpp
</span><span class="cx">
</span><ins>+ Shared/Gamepad/GamepadData.cpp
+
</ins><span class="cx"> Shared/Plugins/NPIdentifierData.cpp
</span><span class="cx"> Shared/Plugins/NPObjectMessageReceiver.cpp
</span><span class="cx"> Shared/Plugins/NPObjectProxy.cpp
</span><span class="lines">@@ -484,6 +487,7 @@
</span><span class="cx"> UIProcess/Downloads/DownloadProxy.cpp
</span><span class="cx"> UIProcess/Downloads/DownloadProxyMap.cpp
</span><span class="cx">
</span><ins>+ UIProcess/Gamepad/UIGamepad.cpp
</ins><span class="cx"> UIProcess/Gamepad/UIGamepadProvider.cpp
</span><span class="cx">
</span><span class="cx"> UIProcess/InspectorServer/HTTPRequest.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205469 => 205470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-06 05:57:16 UTC (rev 205470)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-05 Zan Dobersek <zdobersek@igalia.com>
+
+ Fix ENABLE(GAMEPAD) build errors on non-Cocoa platforms
+ https://bugs.webkit.org/show_bug.cgi?id=161596
+
+ Reviewed by Darin Adler.
+
+ This patch fixes build errors popping up when enabling Gamepad
+ feature on non-Cocoa platforms.
+
+ * CMakeLists.txt: Add the Source/WebCore/platform/gamepad/ directory to
+ WebKit2_INCLUDE_DIRECTORIES. Add GamepadData.cpp, UIGamepad.cpp files to the build.
+ * UIProcess/Gamepad/UIGamepadProvider.cpp: Don't include Cocoa-specific
+ HIDGamepadProvider.h file. Update methods for the UIGamepadProvider class.
+ (WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
+ (WebKit::UIGamepadProvider::platformStartMonitoringGamepads): Deleted.
+ (WebKit::UIGamepadProvider::platformStopMonitoringGamepads): Deleted.
+ (WebKit::UIGamepadProvider::platformGamepads): Deleted.
+ (WebKit::UIGamepadProvider::platformWebProcessProxyForGamepadInput): Deleted.
+
</ins><span class="cx"> 2016-09-05 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some dead code in ViewGestureControllerMac
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (205469 => 205470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-09-06 04:21:23 UTC (rev 205469)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-09-06 05:57:16 UTC (rev 205470)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "GamepadData.h"
</span><span class="cx"> #include "UIGamepad.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><del>-#include <WebCore/HIDGamepadProvider.h>
</del><span class="cx"> #include <WebCore/MockGamepadProvider.h>
</span><ins>+#include <WebCore/PlatformGamepad.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -230,29 +230,12 @@
</span><span class="cx"> // FIXME: Implement for other platforms
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UIGamepadProvider::platformStartMonitoringGamepads()
</del><ins>+WebPageProxy* UIGamepadProvider::platformWebPageProxyForGamepadInput()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Implement for other platforms
</span><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void UIGamepadProvider::platformStopMonitoringGamepads()
-{
- // FIXME: Implement for other platforms
-}
-
-const Vector<PlatformGamepad*>& UIGamepadProvider::platformGamepads()
-{
- static NeverDestroyed<Vector<PlatformGamepad*>> emptyGamepads;
- return emptyGamepads;
-
- // FIXME: Implement for other platforms
-}
-
-WebProcessProxy* UIGamepadProvider::platformWebProcessProxyForGamepadInput()
-{
- // FIXME: Implement for other platforms
-}
-
</del><span class="cx"> void UIGamepadProvider::platformStopMonitoringInput()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>