Move gamepad to Modules/ (+ some cleanup)

https://bugs.webkit.org/show_bug.cgi?id=72785

Patch by Scott Graham <scottmg@chromium.org> on 2011-11-19
Reviewed by Adam Barth.

Source/WebCore:

Move main files from page/ to Modules/gamepad/. #include guard the
gamepad header inclusions in Navigator.cpp to avoid including for
ports that do not enable GAMEPAD.

* Modules/gamepad/Gamepad.cpp: Renamed from Source/WebCore/page/Gamepad.cpp.
(WebCore::Gamepad::Gamepad):
(WebCore::Gamepad::axes):
(WebCore::Gamepad::buttons):
(WebCore::Gamepad::~Gamepad):
* Modules/gamepad/Gamepad.h: Renamed from Source/WebCore/page/Gamepad.h.
* Modules/gamepad/Gamepad.idl: Renamed from Source/WebCore/page/Gamepad.idl.
* Modules/gamepad/GamepadList.cpp: Renamed from Source/WebCore/page/GamepadList.cpp.
(WebCore::GamepadList::~GamepadList):
(WebCore::GamepadList::set):
(WebCore::GamepadList::length):
(WebCore::GamepadList::item):
* Modules/gamepad/GamepadList.h: Renamed from Source/WebCore/page/GamepadList.h.
(WebCore::GamepadList::create):
(WebCore::GamepadList::GamepadList):
* Modules/gamepad/GamepadList.idl: Renamed from Source/WebCore/page/GamepadList.idl.
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* page/Navigator.cpp:

LayoutTests:

Use standard pre/post js test harness rather than custom one.

* gamepad/gamepad-api-expected.txt:
* gamepad/gamepad-api.html:
* gamepad/gamepad-test.js: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@100860 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent aebf9e4c
2011-11-19 Scott Graham <scottmg@chromium.org>
Move gamepad to Modules/ (+ some cleanup)
https://bugs.webkit.org/show_bug.cgi?id=72785
Reviewed by Adam Barth.
Use standard pre/post js test harness rather than custom one.
* gamepad/gamepad-api-expected.txt:
* gamepad/gamepad-api.html:
* gamepad/gamepad-test.js: Removed.
2011-11-19 David Barr <davidbarr@chromium.org>
REGRESSION(r98542): Chromium: CSS text is rendered on page
EXPECTED (navigator.webkitGamepads !== 'undefined') OK
END OF TEST
PASS navigator.webkitGamepads is defined.
PASS successfullyParsed is true
TEST COMPLETE
Make sure the main polling access point exists on navigator.
<!DOCTYPE html>
<body>
<script src="gamepad-test.js"></script>
<script src="../fast/js/resources/js-test-pre.js"></script>
<script>
testExpected("navigator.webkitGamepads", undefined, "!==");
endTest();
shouldBeDefined("navigator.webkitGamepads");
</script>
<script src="../fast/js/resources/js-test-post.js"></script>
<p>Make sure the main polling access point exists on navigator.</p>
</body>
var console = null;
var printFullTestDetails = true; // This is optionaly switched of by test whose tested values can differ. (see disableFullTestDetailsPrinting())
logConsole();
if (window.layoutTestController) {
layoutTestController.dumpAsText();
layoutTestController.waitUntilDone();
}
function logConsole()
{
if (!console && document.body) {
console = document.createElement('div');
document.body.appendChild(console);
}
return console;
}
function testExpected(testFuncString, expected, comparison)
{
try {
var observed = eval(testFuncString);
} catch (ex) {
consoleWrite(ex);
return;
}
if (comparison === undefined)
comparison = '==';
var success = false;
switch (comparison)
{
case '<': success = observed < expected; break;
case '<=': success = observed <= expected; break;
case '>': success = observed > expected; break;
case '>=': success = observed >= expected; break;
case '!=': success = observed != expected; break;
case '!==': success = observed !== expected; break;
case '==': success = observed == expected; break;
case '===': success = observed === expected; break;
}
reportExpected(success, testFuncString, comparison, expected, observed)
}
var testNumber = 0;
function reportExpected(success, testFuncString, comparison, expected, observed)
{
testNumber++;
var msg = "Test " + testNumber;
if (printFullTestDetails || !success)
msg = "EXPECTED (<em>" + testFuncString + " </em>" + comparison + " '<em>" + expected + "</em>')";
if (!success)
msg += ", OBSERVED '<em>" + observed + "</em>'";
logResult(success, msg);
}
function waitForEventAndEnd(element, eventName, funcString)
{
waitForEvent(element, eventName, funcString, true)
}
function waitForEvent(element, eventName, func, endit)
{
function _eventCallback(event)
{
consoleWrite("EVENT(" + eventName + ")");
if (func)
func(event);
if (endit)
endTest();
}
element.addEventListener(eventName, _eventCallback);
}
function waitForEventAndTest(element, eventName, testFuncString, endit)
{
function _eventCallback(event)
{
logResult(eval(testFuncString), "EVENT(" + eventName + ") TEST(" + testFuncString + ")");
if (endit)
endTest();
}
element.addEventListener(eventName, _eventCallback);
}
function waitForEventTestAndEnd(element, eventName, testFuncString)
{
waitForEventAndTest(element, eventName, testFuncString, true);
}
var testEnded = false;
function endTest()
{
consoleWrite("END OF TEST");
testEnded = true;
if (window.layoutTestController)
layoutTestController.notifyDone();
}
function logResult(success, text)
{
if (success)
consoleWrite(text + " <span style='color:green'>OK</span>");
else
consoleWrite(text + " <span style='color:red'>FAIL</span>");
}
function consoleWrite(text)
{
if (testEnded)
return;
logConsole().innerHTML += text + "<br>";
}
2011-11-19 Scott Graham <scottmg@chromium.org>
Move gamepad to Modules/ (+ some cleanup)
https://bugs.webkit.org/show_bug.cgi?id=72785
Reviewed by Adam Barth.
Move main files from page/ to Modules/gamepad/. #include guard the
gamepad header inclusions in Navigator.cpp to avoid including for
ports that do not enable GAMEPAD.
* Modules/gamepad/Gamepad.cpp: Renamed from Source/WebCore/page/Gamepad.cpp.
(WebCore::Gamepad::Gamepad):
(WebCore::Gamepad::axes):
(WebCore::Gamepad::buttons):
(WebCore::Gamepad::~Gamepad):
* Modules/gamepad/Gamepad.h: Renamed from Source/WebCore/page/Gamepad.h.
* Modules/gamepad/Gamepad.idl: Renamed from Source/WebCore/page/Gamepad.idl.
* Modules/gamepad/GamepadList.cpp: Renamed from Source/WebCore/page/GamepadList.cpp.
(WebCore::GamepadList::~GamepadList):
(WebCore::GamepadList::set):
(WebCore::GamepadList::length):
(WebCore::GamepadList::item):
* Modules/gamepad/GamepadList.h: Renamed from Source/WebCore/page/GamepadList.h.
(WebCore::GamepadList::create):
(WebCore::GamepadList::GamepadList):
* Modules/gamepad/GamepadList.idl: Renamed from Source/WebCore/page/GamepadList.idl.
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* page/Navigator.cpp:
2011-11-19 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r100834.
......@@ -48,6 +48,7 @@
'webcore_include_dirs': [
'../',
'../..',
'../Modules/gamepad',
'../accessibility',
'../accessibility/chromium',
'../bindings',
......
......@@ -1129,6 +1129,8 @@
'svg/properties/SVGTransformListPropertyTearOff.h',
],
'webcore_bindings_idl_files': [
'Modules/gamepad/Gamepad.idl',
'Modules/gamepad/GamepadList.idl',
'css/CSSCharsetRule.idl',
'css/CSSFontFaceRule.idl',
'css/CSSImportRule.idl',
......@@ -1402,8 +1404,6 @@
'page/DOMSelection.idl',
'page/DOMWindow.idl',
'page/EventSource.idl',
'page/Gamepad.idl',
'page/GamepadList.idl',
'page/Geolocation.idl',
'page/Geoposition.idl',
'page/History.idl',
......@@ -1667,6 +1667,10 @@
'svg/SVGZoomEvent.idl',
],
'webcore_files': [
'Modules/gamepad/Gamepad.cpp',
'Modules/gamepad/Gamepad.h',
'Modules/gamepad/GamepadList.cpp',
'Modules/gamepad/GamepadList.h',
'accessibility/AXObjectCache.cpp',
'accessibility/AccessibilityARIAGrid.cpp',
'accessibility/AccessibilityARIAGrid.h',
......@@ -2951,10 +2955,6 @@
'page/FrameActionScheduler.h',
'page/FrameTree.cpp',
'page/FrameView.cpp',
'page/Gamepad.cpp',
'page/Gamepad.h',
'page/GamepadList.cpp',
'page/GamepadList.h',
'page/Geolocation.cpp',
'page/GeolocationController.cpp',
'page/GroupSettings.cpp',
......
......@@ -32,7 +32,6 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "GamepadList.h"
#include "Geolocation.h"
#include "PointerLock.h"
#include "KURL.h"
......@@ -46,6 +45,10 @@
#include <wtf/HashSet.h>
#include <wtf/StdLibExtras.h>
#if ENABLE(GAMEPAD)
#include "GamepadList.h"
#endif
#if ENABLE(MEDIA_STREAM)
#include "NavigatorUserMediaErrorCallback.h"
#include "NavigatorUserMediaSuccessCallback.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment