Commit caf99db3 authored by cmarrin@apple.com's avatar cmarrin@apple.com

Missed checking in 2 Canvas3D files

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



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a95c2200
2009-08-25 Chris Marrin <cmarrin@apple.com>
Reviewed by Simon Fraser.
Missed checking in 2 Canvas3D files
https://bugs.webkit.org/show_bug.cgi?id=28018
* bindings/js/JSCanvasRenderingContextCustom.cpp: Implements toJS to do proper subclass binding
* bindings/js/JSCanvasRenderingContext3DCustom.cpp: Argument marshaling for 3D calls
2009-08-25 Mads Ager <ager@chromium.org>
Reviewed by Adam Barth.
This diff is collapsed.
/*
* Copyright (C) 2009 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 COMPUTER, 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
* 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.
*/
#include "config.h"
#include "JSCanvasRenderingContext.h"
#include "CanvasRenderingContext2D.h"
#include "JSCanvasRenderingContext2D.h"
#if ENABLE(3D_CANVAS)
#include "CanvasRenderingContext3D.h"
#include "JSCanvasRenderingContext3D.h"
#endif
using namespace JSC;
namespace WebCore {
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasRenderingContext* object)
{
if (!object)
return jsUndefined();
#if ENABLE(3D_CANVAS)
if (object->is3d())
return getDOMObjectWrapper<JSCanvasRenderingContext3D>(exec, globalObject, static_cast<CanvasRenderingContext3D*>(object));
#endif
ASSERT(object->is2d());
return getDOMObjectWrapper<JSCanvasRenderingContext2D>(exec, globalObject, static_cast<CanvasRenderingContext2D*>(object));
}
} // namespace WebCore
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