<!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>[205247] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205247">205247</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-08-31 07:38:21 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK2 Gamepad provider on iOS.
https://bugs.webkit.org/show_bug.cgi?id=161412
Reviewed by Tim Horton.
Source/JavaScriptCore:
* Configurations/FeatureDefines.xcconfig:
Source/WebCore:
No new tests (Native framework backends not directly testable)
* Configurations/FeatureDefines.xcconfig:
Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:
* WebView/WebView.mm:
(WebKitInitializeGamepadProviderIfNecessary):
Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:
* Platform/spi/ios/UIKitSPI.h:
* UIProcess/Gamepad/UIGamepadProvider.cpp:
* UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm: Copied from Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm.
(WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
* UIProcess/Gamepad/mac/UIGamepadProviderMac.mm:
* WebKit2.xcodeproj/project.pbxproj:
Tools:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadh">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadProviderh">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadProvidermm">trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadcpp">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadh">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadProvidercpp">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgamepadmacHIDGamepadProviderh">trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp">trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadmacUIGamepadProviderMacmm">trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig">trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebKit2/UIProcess/Gamepad/ios/</li>
<li><a href="#trunkSourceWebKit2UIProcessGamepadiosUIGamepadProviderIOSmm">trunk/Source/WebKit2/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-31 Brady Eidson <beidson@apple.com>
+
+ WK2 Gamepad provider on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=161412
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-08-30 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Some arith nodes are too pessimistic with the types supported on the fast path
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD = ENABLE_GAMEPAD;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-31 Brady Eidson <beidson@apple.com>
+
+ WK2 Gamepad provider on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=161412
+
+ Reviewed by Tim Horton.
+
+ No new tests (Native framework backends not directly testable)
+
+ * Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-08-31 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r201701): Unable to copy from CodeMirror editor version used in Jenkins install website
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD = ENABLE_GAMEPAD;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.h (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.h 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.h 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD) && defined(__LP64__)
</del><ins>+#if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins><span class="cx">
</span><span class="cx"> #include "PlatformGamepad.h"
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -64,5 +64,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD) && defined(__LP64__)
-
</del><ins>+#endif // ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepad.mm 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GameControllerGamepad.h"
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD) && defined(__LP64__)
</del><ins>+#if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins><span class="cx"> #include "GameControllerGamepadProvider.h"
</span><span class="cx"> #include <GameController/GameController.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -177,4 +177,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD) && defined(__LP64__)
</del><ins>+#endif // ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.h (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.h 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.h 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD) && defined(__LP64__)
</del><ins>+#if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins><span class="cx">
</span><span class="cx"> #include "GamepadProvider.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -88,4 +88,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadcocoaGameControllerGamepadProvidermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/cocoa/GameControllerGamepadProvider.mm 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "GameControllerGamepadProvider.h"
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD) && defined(__LP64__)
</del><ins>+#if ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins><span class="cx">
</span><span class="cx"> #import "GameControllerGamepad.h"
</span><span class="cx"> #import "GamepadProviderClient.h"
</span><span class="lines">@@ -157,4 +157,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && (defined(__LP64__) || PLATFORM(IOS))
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.cpp 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HIDGamepad.h"
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD)
</del><ins>+#if ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include <IOKit/hid/IOHIDElement.h>
</span><span class="cx"> #include <IOKit/hid/IOHIDUsageTables.h>
</span><span class="lines">@@ -187,4 +187,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.h (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.h 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepad.h 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD)
</del><ins>+#if ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "PlatformGamepad.h"
</span><span class="cx"> #include <IOKit/hid/IOHIDDevice.h>
</span><span class="lines">@@ -123,4 +123,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.cpp 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HIDGamepadProvider.h"
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD)
</del><ins>+#if ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "GamepadProviderClient.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="lines">@@ -268,4 +268,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgamepadmacHIDGamepadProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebCore/platform/gamepad/mac/HIDGamepadProvider.h 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD)
</del><ins>+#if ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "GamepadProvider.h"
</span><span class="cx"> #include "HIDGamepad.h"
</span><span class="lines">@@ -85,4 +85,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-31 Brady Eidson <beidson@apple.com>
+
+ WK2 Gamepad provider on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=161412
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ * WebView/WebView.mm:
+ (WebKitInitializeGamepadProviderIfNecessary):
+
</ins><span class="cx"> 2016-08-30 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Introduce the ThrowScope and force every throw site to instantiate a ThrowScope.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD = ENABLE_GAMEPAD;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> #import <WebCore/FrameTree.h>
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/GCController.h>
</span><ins>+#import <WebCore/GameControllerGamepadProvider.h>
</ins><span class="cx"> #import <WebCore/GeolocationController.h>
</span><span class="cx"> #import <WebCore/GeolocationError.h>
</span><span class="cx"> #import <WebCore/HTMLNames.h>
</span><span class="lines">@@ -910,7 +911,12 @@
</span><span class="cx"> if (initialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> GamepadProvider::singleton().setSharedProvider(HIDGamepadProvider::singleton());
</span><ins>+#else
+ GamepadProvider::singleton().setSharedProvider(GameControllerGamepadProvider::singleton());
+#endif
+
</ins><span class="cx"> initialized = true;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1419,7 +1425,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><span class="cx"> WebKit::MemoryMeasure measurer("Memory warning: Calling JavaScript GC.");
</span><del>- GCController::singleton().garbageCollectNow();
</del><ins>+ WebCore::GCController::singleton().garbageCollectNow();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)purgeInactiveFontData
</span><span class="lines">@@ -1440,7 +1446,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WebThreadIsCurrent());
</span><span class="cx"> WebKit::MemoryMeasure measurer("Memory warning: Discarding JIT'ed code.");
</span><del>- GCController::singleton().deleteAllCode();
</del><ins>+ WebCore::GCController::singleton().deleteAllCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (BOOL)isCharacterSmartReplaceExempt:(unichar)character isPreviousCharacter:(BOOL)b
</span><span class="lines">@@ -1877,7 +1883,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> // Need this to make leak messages accurate.
</span><span class="cx"> if (applicationIsTerminating) {
</span><del>- GCController::singleton().garbageCollectNow();
</del><ins>+ WebCore::GCController::singleton().garbageCollectNow();
</ins><span class="cx"> [WebCache setDisabled:YES];
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-08-31 Brady Eidson <beidson@apple.com>
+
+ WK2 Gamepad provider on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=161412
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ * Platform/spi/ios/UIKitSPI.h:
+
+ * UIProcess/Gamepad/UIGamepadProvider.cpp:
+
+ * UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm: Copied from Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm.
+ (WebKit::UIGamepadProvider::platformWebPageProxyForGamepadInput):
+
+ * UIProcess/Gamepad/mac/UIGamepadProviderMac.mm:
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2016-08-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix the 32-bit build.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD = ENABLE_GAMEPAD;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -825,6 +825,10 @@
</span><span class="cx"> - (CGRect)accessibilityConvertRectToSceneReferenceCoordinates:(CGRect)rect;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface UIResponder ()
+- (UIResponder *)firstResponder;
+@end
+
</ins><span class="cx"> WTF_EXTERN_C_BEGIN
</span><span class="cx">
</span><span class="cx"> BOOL UIKeyboardEnabledInputModesAllowOneToManyShortcuts();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadUIGamepadProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/UIGamepadProvider.cpp 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> return gamepadDatas;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !PLATFORM(COCOA)
</ins><span class="cx">
</span><span class="cx"> void UIGamepadProvider::platformSetDefaultGamepadProvider()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadiosUIGamepadProviderIOSmmfromrev205246trunkSourceWebKit2UIProcessGamepadmacUIGamepadProviderMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm (from rev 205246, trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm) (0 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/ios/UIGamepadProviderIOS.mm 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2016 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.
+ */
+
+#import "config.h"
+#import "UIGamepadProvider.h"
+
+#if ENABLE(GAMEPAD) && PLATFORM(IOS)
+
+#import "UIKitSPI.h"
+#import "WKWebViewInternal.h"
+
+namespace WebKit {
+
+WebPageProxy* UIGamepadProvider::platformWebPageProxyForGamepadInput()
+{
+ auto firstResponder = [[[UIApplication sharedApplication] keyWindow] firstResponder];
+
+ if ([firstResponder isKindOfClass:[WKContentView class]])
+ return ((WKContentView *)firstResponder).page;
+
+ return nullptr;
+}
+
+}
+
+#endif // ENABLE(GAMEPAD) && PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGamepadmacUIGamepadProviderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/UIProcess/Gamepad/mac/UIGamepadProviderMac.mm 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "UIGamepadProvider.h"
</span><span class="cx">
</span><del>-#if ENABLE(GAMEPAD)
</del><ins>+#if ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="lines">@@ -52,4 +52,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(GAMEPAD)
</del><ins>+#endif // ENABLE(GAMEPAD) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1016,6 +1016,7 @@
</span><span class="cx"> 51E35202180F5D1E00E53BE9 /* DatabaseProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35201180F5D1E00E53BE9 /* DatabaseProcessMac.mm */; };
</span><span class="cx"> 51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */; };
</span><span class="cx"> 51E399061D6F54C7009C8831 /* UIGamepadProviderCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */; };
</span><ins>+ 51E949971D76211300EC9EB9 /* UIGamepadProviderIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */; };
</ins><span class="cx"> 51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FA2D541521118600C1BA0B /* WKBundleDOMWindowExtension.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */; };
</span><span class="cx"> 51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */; };
</span><span class="lines">@@ -3077,6 +3078,7 @@
</span><span class="cx"> 51E35207180F5D6100E53BE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><span class="cx"> 51E35208180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DatabaseServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> 51E399051D6F54C5009C8831 /* UIGamepadProviderCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ 51E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIGamepadProviderIOS.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 51F060DD1654317500F3281B /* WebResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 51F060DE1654317500F3281B /* WebResourceLoaderMessages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebResourceLoaderMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 51F7DC4A180CC93600212CA3 /* com.apple.WebKit.Databases.Development.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = com.apple.WebKit.Databases.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -5502,6 +5504,7 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> 51E399041D6F54AD009C8831 /* cocoa */,
</span><ins>+ 51E949951D761CB000EC9EB9 /* ios */,
</ins><span class="cx"> 515BE1A11D5523B300DD7C68 /* mac */,
</span><span class="cx"> 515BE1AC1D555C5100DD7C68 /* UIGamepad.cpp */,
</span><span class="cx"> 515BE1AD1D555C5100DD7C68 /* UIGamepad.h */,
</span><span class="lines">@@ -5626,6 +5629,14 @@
</span><span class="cx"> path = cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 51E949951D761CB000EC9EB9 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ 51E949961D761CC700EC9EB9 /* UIGamepadProviderIOS.mm */,
+ );
+ path = ios;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 51F7DC0A180CC41100212CA3 /* DatabaseProcess */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -9710,6 +9721,7 @@
</span><span class="cx"> BC989D81161A7E5D000D46D3 /* WKWebProcessPlugIn.mm in Sources */,
</span><span class="cx"> BC8F2F2A16273A2C005FACB5 /* WKWebProcessPlugInBrowserContextController.mm in Sources */,
</span><span class="cx"> 1F7506AD1859161C00EC0FF7 /* WKWebProcessPlugInFrame.mm in Sources */,
</span><ins>+ 51E949971D76211300EC9EB9 /* UIGamepadProviderIOS.mm in Sources */,
</ins><span class="cx"> 1F7506AE1859162200EC0FF7 /* WKWebProcessPlugInHitTestResult.mm in Sources */,
</span><span class="cx"> 1F7506AF1859162800EC0FF7 /* WKWebProcessPlugInNodeHandle.mm in Sources */,
</span><span class="cx"> 1FB00AC8185F76460019142E /* WKWebProcessPlugInPageGroup.mm in Sources */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Tools/ChangeLog 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-31 Brady Eidson <beidson@apple.com>
+
+ WK2 Gamepad provider on iOS.
+ https://bugs.webkit.org/show_bug.cgi?id=161412
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
</ins><span class="cx"> 2016-08-30 Ricky Mondello <rmondello@apple.com>
</span><span class="cx">
</span><span class="cx"> YouTubePluginReplacementTest's URL transformation logic should have tests
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (205246 => 205247)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-08-31 09:12:25 UTC (rev 205246)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2016-08-31 14:38:21 UTC (rev 205247)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> ENABLE_FILTERS_LEVEL_2 = ENABLE_FILTERS_LEVEL_2;
</span><span class="cx"> ENABLE_FONT_LOAD_EVENTS = ;
</span><span class="cx"> ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
</span><del>-ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
</del><ins>+ENABLE_GAMEPAD = ENABLE_GAMEPAD;
</ins><span class="cx"> ENABLE_GAMEPAD_DEPRECATED = ;
</span><span class="cx"> ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
</span><span class="cx"> ENABLE_ICONDATABASE[sdk=macosx*] = ENABLE_ICONDATABASE;
</span></span></pre>
</div>
</div>
</body>
</html>