Changeset 78323 in webkit

Timestamp:

Feb 11, 2011 1:12:41 AM (13 years ago)

Author:

abarth@webkit.org

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Crypto.cpp (modified) (2 diffs)
• page/Crypto.h (modified) (1 diff)
• page/Crypto.idl (modified) (1 diff)
• page/DOMWindow.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/page/Crypto.cpp

@@ -42 +42 @@
 }
 
+#if ENABLE(WEBGL) || ENABLE(BLOB)
 void Crypto::getRandomValues(ArrayBufferView* array, ExceptionCode& ec)
 {
@@ -55 +56 @@
 #endif
 }
+#endif
 
 }

trunk/Source/WebCore/page/Crypto.h

@@ -44 +44 @@
     static PassRefPtr<Crypto> create() { return adoptRef(new Crypto()); }
 
+#if ENABLE(WEBGL) || ENABLE(BLOG)
     void getRandomValues(ArrayBufferView*, ExceptionCode&);
+#endif
 
 private:

trunk/Source/WebCore/page/Crypto.idl

@@ -30 +30 @@
 
     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);
     };
 

trunk/Source/WebCore/page/DOMWindow.idl

@@ -55 +55 @@
         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();