Commit aa5a9e22 authored by abarth@webkit.org's avatar abarth@webkit.org

2011-02-11 Adam Barth <abarth@webkit.org>

        Attempt to fix the Windows build.  Apparently we don't support
        conditional attributes on functions.  This patch makes the whole Crypto
        interface conditional on ArrayBuffer support.

        * page/DOMWindow.idl:
        * page/Crypto.cpp:
        * page/Crypto.h:
        * page/Crypto.idl:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78323 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 61ac637b
2011-02-11 Adam Barth <abarth@webkit.org>
Attempt to fix the Windows build. Apparently we don't support
conditional attributes on functions. This patch makes the whole Crypto
interface conditional on ArrayBuffer support.
* page/DOMWindow.idl:
* page/Crypto.cpp:
* page/Crypto.h:
* page/Crypto.idl:
2011-02-10 Antti Koivisto <antti@apple.com>
Reviewed by Dave Hyatt.
......@@ -41,6 +41,7 @@ Crypto::Crypto()
{
}
#if ENABLE(WEBGL) || ENABLE(BLOB)
void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
{
#if USE(OS_RANDOMNESS)
......@@ -54,5 +55,6 @@ void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
ec = NOT_SUPPORTED_ERR;
#endif
}
#endif
}
......@@ -43,7 +43,9 @@ class Crypto : public RefCounted<Crypto> {
public:
static PassRefPtr<Crypto> create() { return adoptRef(new Crypto()); }
#if ENABLE(WEBGL) || ENABLE(BLOG)
void getRandomValues(ArrayBufferView*, ExceptionCode&);
#endif
private:
Crypto();
......
......@@ -29,10 +29,11 @@
module window {
interface [
// FIXME: We should just enable ArrayBuffer support all the time.
Conditional=WEBGL|BLOB,
OmitConstructor
] Crypto {
// FIXME: We should just enable ArrayBuffer support all the time.
[Conditional=WEBGL|BLOB] void getRandomValues(in ArrayBufferView array) raises(DOMException);
void getRandomValues(in ArrayBufferView array) raises(DOMException);
};
}
......@@ -54,11 +54,11 @@ module window {
attribute [Replaceable] BarInfo toolbar;
attribute [Replaceable] Navigator navigator;
attribute [Replaceable] Navigator clientInformation;
attribute [Replaceable, Conditional=WEBGL|BLOB] Crypto crypto;
attribute [DoNotCheckDomainSecurity, JSCCustom, V8CustomSetter, V8DisallowShadowing, CPPCustom] Location location;
attribute [Replaceable, CustomGetter, V8CustomSetter] Event event;
readonly attribute Crypto crypto;
DOMSelection getSelection();
......
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