diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/bindings/js/JSTrackCustom.h | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/bindings/js/JSTrackCustom.h')
| -rw-r--r-- | Source/WebCore/bindings/js/JSTrackCustom.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/WebCore/bindings/js/JSTrackCustom.h b/Source/WebCore/bindings/js/JSTrackCustom.h index 6e24a0915..30dd99066 100644 --- a/Source/WebCore/bindings/js/JSTrackCustom.h +++ b/Source/WebCore/bindings/js/JSTrackCustom.h @@ -10,10 +10,10 @@ * 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 COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * 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 @@ -23,8 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef JSTrackCustom_h -#define JSTrackCustom_h +#pragma once #if ENABLE(VIDEO_TRACK) @@ -35,8 +34,7 @@ namespace WebCore { -TrackBase* toTrack(JSC::JSValue); -JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TrackBase*); +JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TrackBase&); inline void* root(TrackBase* track) { @@ -45,7 +43,6 @@ inline void* root(TrackBase* track) return track; } -} +} // namespace WebCore -#endif -#endif +#endif // ENABLE(VIDEO_TRACK) |