Changeset 100860 in webkit


Ignore:
Timestamp:
Nov 19, 2011 12:51:42 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

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.
Location:
trunk
Files:
2 added
1 deleted
7 edited
6 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r100856 r100860  
     12011-11-19  Scott Graham  <scottmg@chromium.org>
     2
     3        Move gamepad to Modules/ (+ some cleanup)
     4        https://bugs.webkit.org/show_bug.cgi?id=72785
     5
     6        Reviewed by Adam Barth.
     7
     8        Use standard pre/post js test harness rather than custom one.
     9
     10        * gamepad/gamepad-api-expected.txt:
     11        * gamepad/gamepad-api.html:
     12        * gamepad/gamepad-test.js: Removed.
     13
    1142011-11-19  David Barr  <davidbarr@chromium.org>
    215

  • trunk/LayoutTests/gamepad/gamepad-api-expected.txt

    r100833 r100860  
    1 EXPECTED (navigator.webkitGamepads !== 'undefined') OK
    2 END OF TEST
     1PASS navigator.webkitGamepads is defined.
     2PASS successfullyParsed is true
     3
     4TEST COMPLETE
    35Make sure the main polling access point exists on navigator.

  • trunk/LayoutTests/gamepad/gamepad-api.html

    r100833 r100860  
    11<!DOCTYPE html>
    22<body>
    3 <script src="gamepad-test.js"></script>
     3<script src="../fast/js/resources/js-test-pre.js"></script>
    44<script>
    5     testExpected("navigator.webkitGamepads", undefined, "!==");
    6     endTest();
     5    shouldBeDefined("navigator.webkitGamepads");
    76</script>
     7<script src="../fast/js/resources/js-test-post.js"></script>
    88<p>Make sure the main polling access point exists on navigator.</p>
    99</body>

  • trunk/Source/WebCore/ChangeLog

    r100859 r100860  
     12011-11-19  Scott Graham  <scottmg@chromium.org>
     2
     3        Move gamepad to Modules/ (+ some cleanup)
     4        https://bugs.webkit.org/show_bug.cgi?id=72785
     5
     6        Reviewed by Adam Barth.
     7
     8        Move main files from page/ to Modules/gamepad/. #include guard the
     9        gamepad header inclusions in Navigator.cpp to avoid including for
     10        ports that do not enable GAMEPAD.
     11
     12        * Modules/gamepad/Gamepad.cpp: Renamed from Source/WebCore/page/Gamepad.cpp.
     13        (WebCore::Gamepad::Gamepad):
     14        (WebCore::Gamepad::axes):
     15        (WebCore::Gamepad::buttons):
     16        (WebCore::Gamepad::~Gamepad):
     17        * Modules/gamepad/Gamepad.h: Renamed from Source/WebCore/page/Gamepad.h.
     18        * Modules/gamepad/Gamepad.idl: Renamed from Source/WebCore/page/Gamepad.idl.
     19        * Modules/gamepad/GamepadList.cpp: Renamed from Source/WebCore/page/GamepadList.cpp.
     20        (WebCore::GamepadList::~GamepadList):
     21        (WebCore::GamepadList::set):
     22        (WebCore::GamepadList::length):
     23        (WebCore::GamepadList::item):
     24        * Modules/gamepad/GamepadList.h: Renamed from Source/WebCore/page/GamepadList.h.
     25        (WebCore::GamepadList::create):
     26        (WebCore::GamepadList::GamepadList):
     27        * Modules/gamepad/GamepadList.idl: Renamed from Source/WebCore/page/GamepadList.idl.
     28        * WebCore.gyp/WebCore.gyp:
     29        * WebCore.gypi:
     30        * page/Navigator.cpp:
     31
    1322011-11-19  Sheriff Bot  <webkit.review.bot@gmail.com>
    233

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r100851 r100860  
    4949      '../',
    5050      '../..',
     51      '../Modules/gamepad',
    5152      '../accessibility',
    5253      '../accessibility/chromium',

  • trunk/Source/WebCore/WebCore.gypi

    r100833 r100860  
    11301130        ],
    11311131        'webcore_bindings_idl_files': [
     1132            'Modules/gamepad/Gamepad.idl',
     1133            'Modules/gamepad/GamepadList.idl',
    11321134            'css/CSSCharsetRule.idl',
    11331135            'css/CSSFontFaceRule.idl',
    … …  
    14031405            'page/DOMWindow.idl',
    14041406            'page/EventSource.idl',
    1405             'page/Gamepad.idl',
    1406             'page/GamepadList.idl',
    14071407            'page/Geolocation.idl',
    14081408            'page/Geoposition.idl',
    … …  
    16681668        ],
    16691669        'webcore_files': [
     1670            'Modules/gamepad/Gamepad.cpp',
     1671            'Modules/gamepad/Gamepad.h',
     1672            'Modules/gamepad/GamepadList.cpp',
     1673            'Modules/gamepad/GamepadList.h',
    16701674            'accessibility/AXObjectCache.cpp',
    16711675            'accessibility/AccessibilityARIAGrid.cpp',
    … …  
    29522956            'page/FrameTree.cpp',
    29532957            'page/FrameView.cpp',
    2954             'page/Gamepad.cpp',
    2955             'page/Gamepad.h',
    2956             'page/GamepadList.cpp',
    2957             'page/GamepadList.h',
    29582958            'page/Geolocation.cpp',
    29592959            'page/GeolocationController.cpp',

  • trunk/Source/WebCore/page/Navigator.cpp

    r100833 r100860  
    3333#include "FrameLoader.h"
    3434#include "FrameLoaderClient.h"
    35 #include "GamepadList.h"
    3635#include "Geolocation.h"
    3736#include "PointerLock.h"
    … …  
    4645#include <wtf/HashSet.h>
    4746#include <wtf/StdLibExtras.h>
     47
     48#if ENABLE(GAMEPAD)
     49#include "GamepadList.h"
     50#endif
    4851
    4952#if ENABLE(MEDIA_STREAM)
Note: See TracChangeset for help on using the changeset viewer.