2010-07-12  Steve Block  <steveblock@google.com>

        Reviewed by NOBODY (OOPS!).

        DeviceOrientationEvent should use optional properties

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

        This change adds a new DeviceOrientation class which takes care of which of the

        optional properties are present. DeviceOrientationEvent owns an instance of

        DeviceOrientation, rather than owning the properties directly.

        DeviceOrientationEvent now requires custom bindings.

        Test: fast/dom/DeviceOrientation/optional-event-properties.html

        * Android.jscbindings.mk:

        * Android.v8bindings.mk:

        * CMakeLists.txt:

        * GNUmakefile.am:

        * WebCore.gypi:

        * WebCore.pro:

        * WebCore.vcproj/WebCore.vcproj:

        * WebCore.xcodeproj/project.pbxproj:

        * bindings/js/JSDeviceOrientationEventCustom.cpp: Added.

        (WebCore::JSDeviceOrientationEvent::alpha):

        (WebCore::JSDeviceOrientationEvent::beta):

        (WebCore::JSDeviceOrientationEvent::gamma):

        (WebCore::JSDeviceOrientationEvent::initDeviceOrientationEvent):

        * bindings/v8/custom/V8DeviceOrientationEventCustom.cpp: Added.

        (WebCore::V8DeviceOrientationEvent::alphaAccessorGetter):

        (WebCore::V8DeviceOrientationEvent::betaAccessorGetter):

        (WebCore::V8DeviceOrientationEvent::gammaAccessorGetter):

        (WebCore::V8DeviceOrientationEvent::initDeviceOrientationEventCallback):

        * dom/DeviceOrientation.h: Added.

        (WebCore::DeviceOrientation::create):

        (WebCore::DeviceOrientation::canProvideAlpha):

        (WebCore::DeviceOrientation::alpha):

        (WebCore::DeviceOrientation::canProvideBeta):

        (WebCore::DeviceOrientation::beta):

        (WebCore::DeviceOrientation::canProvideGamma):

        (WebCore::DeviceOrientation::gamma):

        (WebCore::DeviceOrientation::DeviceOrientation):

        * dom/DeviceOrientationEvent.cpp:

        (WebCore::DeviceOrientationEvent::DeviceOrientationEvent):

        (WebCore::DeviceOrientationEvent::initDeviceOrientationEvent):

        * dom/DeviceOrientationEvent.h:

        (WebCore::DeviceOrientationEvent::create):

        (WebCore::DeviceOrientationEvent::orientation):

        * dom/DeviceOrientationEvent.idl:

	bindings/js/JSDatabaseCallback.cpp \

	bindings/js/JSDesktopNotificationsCustom.cpp \

	bindings/js/JSDeviceOrientationEventCustom.cpp \

	bindings/v8/custom/V8DeviceOrientationEventCustom.cpp \

    bindings/js/JSDeviceOrientationEventCustom.cpp

	WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp \

	WebCore/dom/DeviceOrientation.h \

            'bindings/js/JSDeviceOrientationEventCustom.cpp',

            'bindings/v8/custom/V8DeviceOrientationEventCustom.cpp',

            'dom/DeviceOrientation.h',

    bindings/js/JSDeviceOrientationEventCustom.cpp \

    dom/DeviceOrientation.h \

				RelativePath="..\dom\DeviceOrientation.h"

				>

			</File>

			<File

					RelativePath="..\bindings\js\JSDeviceOrientationEventCustom.cpp"

					>

					<FileConfiguration

						Name="Debug|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Release|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Debug_Internal|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Debug_Cairo|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Release_Cairo|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

					<FileConfiguration

						Name="Debug_All|Win32"

						ExcludedFromBuild="true"

						>

						<Tool

							Name="VCCLCompilerTool"

						/>

					</FileConfiguration>

				</File>

				<File

		590E1B4911E4EF4B0069F784 /* DeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */; };

		590E1B4B11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */; };

		590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientation.h; sourceTree = "<group>"; };

		590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeviceOrientationEventCustom.cpp; sourceTree = "<group>"; };

				590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,

				590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */,

				590E1B4911E4EF4B0069F784 /* DeviceOrientation.h in Headers */,

				590E1B4B11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp in Sources */,

/*

 * Copyright 2010, The Android Open Source Project

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * 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 THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT OWNER 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 "JSDeviceOrientationEvent.h"

#if ENABLE(DEVICE_ORIENTATION)

#include "DeviceOrientation.h"

#include "DeviceOrientationEvent.h"

using namespace JSC;

namespace WebCore {

JSValue JSDeviceOrientationEvent::alpha(ExecState* exec) const

{

    DeviceOrientationEvent* imp = static_cast<DeviceOrientationEvent*>(impl());

    if (!imp->orientation()->canProvideAlpha())

        return jsNull();

    return jsNumber(exec, imp->orientation()->alpha());

}

JSValue JSDeviceOrientationEvent::beta(ExecState* exec) const

{

    DeviceOrientationEvent* imp = static_cast<DeviceOrientationEvent*>(impl());

    if (!imp->orientation()->canProvideBeta())

        return jsNull();

    return jsNumber(exec, imp->orientation()->beta());

}

JSValue JSDeviceOrientationEvent::gamma(ExecState* exec) const

{

    DeviceOrientationEvent* imp = static_cast<DeviceOrientationEvent*>(impl());

    if (!imp->orientation()->canProvideGamma())

        return jsNull();

    return jsNumber(exec, imp->orientation()->gamma());

}

JSValue JSDeviceOrientationEvent::initDeviceOrientationEvent(ExecState* exec)

{

    const String& type = ustringToString(exec->argument(0).toString(exec));

    bool bubbles = exec->argument(1).toBoolean(exec);

    bool cancelable = exec->argument(2).toBoolean(exec);

    // If alpha, beta or gamma are null or undefined, mark them as not provided.

    // Otherwise, use the standard JavaScript conversion.

    bool alphaProvided = !exec->argument(3).isUndefinedOrNull();

    double alpha = exec->argument(3).toNumber(exec);

    bool betaProvided = !exec->argument(4).isUndefinedOrNull();

    double beta = exec->argument(4).toNumber(exec);

    bool gammaProvided = !exec->argument(5).isUndefinedOrNull();

    double gamma = exec->argument(5).toNumber(exec);

    RefPtr<DeviceOrientation> orientation = DeviceOrientation::create(alphaProvided, alpha, betaProvided, beta, gammaProvided, gamma);

    DeviceOrientationEvent* imp = static_cast<DeviceOrientationEvent*>(impl());

    imp->initDeviceOrientationEvent(type, bubbles, cancelable, orientation.get());

    return jsUndefined();

}

} // namespace WebCore

#endif // ENABLE(DEVICE_ORIENTATION)

/*

 * Copyright 2010, The Android Open Source Project

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * 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 THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT OWNER 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 "V8DeviceOrientationEvent.h"

#if ENABLE(DEVICE_ORIENTATION)

#include "DeviceOrientation.h"

#include "V8Binding.h"

#include "V8Proxy.h"

#include <v8.h>

namespace WebCore {

v8::Handle<v8::Value> V8DeviceOrientationEvent::alphaAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)

{

    INC_STATS("DOM.DeviceOrientationEvent.alpha._get");

    v8::Handle<v8::Object> holder = info.Holder();

    DeviceOrientationEvent* imp = V8DeviceOrientationEvent::toNative(holder);

    if (!imp->orientation()->canProvideAlpha())

        return v8::Null();

    return v8::Number::New(imp->orientation()->alpha());

}

v8::Handle<v8::Value> V8DeviceOrientationEvent::betaAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)

{

    INC_STATS("DOM.DeviceOrientationEvent.beta._get");

    v8::Handle<v8::Object> holder = info.Holder();

    DeviceOrientationEvent* imp = V8DeviceOrientationEvent::toNative(holder);

    if (!imp->orientation()->canProvideBeta())

        return v8::Null();

    return v8::Number::New(imp->orientation()->beta());

}

v8::Handle<v8::Value> V8DeviceOrientationEvent::gammaAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)

{

    INC_STATS("DOM.DeviceOrientationEvent.gamma._get");

    v8::Handle<v8::Object> holder = info.Holder();

    DeviceOrientationEvent* imp = V8DeviceOrientationEvent::toNative(holder);

    if (!imp->orientation()->canProvideGamma())

        return v8::Null();

    return v8::Number::New(imp->orientation()->gamma());

}

v8::Handle<v8::Value> V8DeviceOrientationEvent::initDeviceOrientationEventCallback(const v8::Arguments& args)

{

    DeviceOrientationEvent* imp = V8DeviceOrientationEvent::toNative(args.Holder());

    V8Parameter<> type = args[0];

    bool bubbles = args[1]->BooleanValue();

    bool cancelable = args[2]->BooleanValue();

    // If alpha, beta or gamma are null or undefined, mark them as not provided.

    // Otherwise, use the standard JavaScript conversion.

    bool alphaProvided = !isUndefinedOrNull(args[3]);

    double alpha = static_cast<double>(args[3]->NumberValue());

    bool betaProvided = !isUndefinedOrNull(args[4]);

    double beta = static_cast<double>(args[4]->NumberValue());

    bool gammaProvided = !isUndefinedOrNull(args[5]);

    double gamma = static_cast<double>(args[5]->NumberValue());

    RefPtr<DeviceOrientation> orientation = DeviceOrientation::create(alphaProvided, alpha, betaProvided, beta, gammaProvided, gamma);

    imp->initDeviceOrientationEvent(type, bubbles, cancelable, orientation.get());

    return v8::Handle<v8::Value>();

}

} // namespace WebCore

#endif // ENABLE(DEVICE_ORIENTATION)

/*

 * Copyright 2010, The Android Open Source Project

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * 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 THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT OWNER 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.

 */

#ifndef DeviceOrientation_h

#define DeviceOrientation_h

#include <wtf/RefCounted.h>

namespace WebCore {

class DeviceOrientation : public RefCounted<DeviceOrientation> {

public:

    static PassRefPtr<DeviceOrientation> create()

    {

        return adoptRef(new DeviceOrientation);

    }

    static PassRefPtr<DeviceOrientation> create(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)

    {

        return adoptRef(new DeviceOrientation(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma));

    }

    double alpha() const { return m_alpha; }

    double beta() const { return m_beta; }

    double gamma() const { return m_gamma; }

    bool canProvideAlpha() const { return m_canProvideAlpha; }

    bool canProvideBeta() const { return m_canProvideBeta; }

    bool canProvideGamma() const { return m_canProvideGamma; }

private:

    DeviceOrientation()

        : m_canProvideAlpha(false)

        , m_canProvideBeta(false)

        , m_canProvideGamma(false) {}

    DeviceOrientation(bool canProvideAlpha, double alpha, bool canProvideBeta, double beta, bool canProvideGamma, double gamma)

        : m_canProvideAlpha(canProvideAlpha)

        , m_canProvideBeta(canProvideBeta)

        , m_canProvideGamma(canProvideGamma)

        , m_alpha(alpha)

        , m_beta(beta)

        , m_gamma(gamma) {}

    bool m_canProvideAlpha;

    bool m_canProvideBeta;

    bool m_canProvideGamma;

    double m_alpha;

    double m_beta;

    double m_gamma;

};

} // namespace WebCore

#endif // DeviceOrientation_h

#include "DeviceOrientation.h"

class DeviceOrientation;

    DeviceOrientation* orientation() const { return m_orientation.get(); }

2010-07-12  Steve Block  <steveblock@google.com>

        Reviewed by NOBODY (OOPS!).

        DeviceOrientationEvent should use optional properties

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

        * fast/dom/DeviceOrientation/optional-event-properties-expected.txt: Added.

        * fast/dom/DeviceOrientation/optional-event-properties.html: Added.

        * fast/dom/DeviceOrientation/script-tests/optional-event-properties.js: Added.

Tests the optional properties of DeviceOrientationEvent. Each property should be null if not set, or set to null or undefined.

On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

PASS event.alpha == null is true

PASS event.beta == null is true

PASS event.gamma == null is true

PASS event.alpha == 0 is true

PASS event.beta == 1 is true

PASS event.gamma == 2 is true

PASS event.alpha == null is true

PASS event.beta == null is true

PASS event.gamma == null is true

PASS event.alpha == 0 is true

PASS event.beta == 0 is true

PASS event.gamma == 0 is true

PASS event.alpha == null is true

PASS event.beta == null is true

PASS event.gamma == null is true

PASS event.alpha == 0 is true

PASS event.beta == 0 is true

PASS event.gamma == 0 is true

PASS event.alpha == null is true

PASS event.beta == null is true

PASS event.gamma == null is true

PASS successfullyParsed is true

TEST COMPLETE

<html>

<head>

<link rel="stylesheet" href="../../js/resources/js-test-style.css">

<script src="../../js/resources/js-test-pre.js"></script>

</head>

<body>

<p id="description"></p>

<div id="console"></div>

<script src="script-tests/optional-event-properties.js"></script>

<script src="../../js/resources/js-test-post.js"></script>

</body>

</html>

description("Tests the optional properties of DeviceOrientationEvent. Each property should be null if not set, or set to null or undefined.");

var event = document.createEvent('DeviceOrientationEvent');

shouldBeTrue("event.alpha == null");

shouldBeTrue("event.beta == null");

shouldBeTrue("event.gamma == null");

event.initDeviceOrientationEvent("", false, false, 0, 1, 2);

shouldBeTrue("event.alpha == 0");

shouldBeTrue("event.beta == 1");

shouldBeTrue("event.gamma == 2");

event.initDeviceOrientationEvent();

shouldBeTrue("event.alpha == null");

shouldBeTrue("event.beta == null");

shouldBeTrue("event.gamma == null");

event.initDeviceOrientationEvent("", false, false, [], [], []);

shouldBeTrue("event.alpha == 0");

shouldBeTrue("event.beta == 0");

shouldBeTrue("event.gamma == 0");

event.initDeviceOrientationEvent("", false, false, undefined, undefined, undefined);

shouldBeTrue("event.alpha == null");

shouldBeTrue("event.beta == null");

shouldBeTrue("event.gamma == null");

event.initDeviceOrientationEvent("", false, false, "", "", "");

shouldBeTrue("event.alpha == 0");

shouldBeTrue("event.beta == 0");

shouldBeTrue("event.gamma == 0");

event.initDeviceOrientationEvent("", false, false, null, null, null);

shouldBeTrue("event.alpha == null");

shouldBeTrue("event.beta == null");

shouldBeTrue("event.gamma == null");

window.successfullyParsed = true;