diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/page/DOMWindow.idl | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/page/DOMWindow.idl')
| -rw-r--r-- | WebCore/page/DOMWindow.idl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index bf1d55d..5b1000a 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -54,7 +54,7 @@ module window { attribute [Replaceable] BarInfo toolbar; attribute [Replaceable] Navigator navigator; attribute [Replaceable] Navigator clientInformation; - attribute [DoNotCheckDomainSecurity, JSCCustom, V8CustomSetter, V8DisallowShadowing] Location location; + attribute [DoNotCheckDomainSecurity, JSCCustom, V8CustomSetter, V8DisallowShadowing, CPPCustom] Location location; attribute [Replaceable, CustomGetter, V8CustomSetter] Event event; @@ -730,6 +730,10 @@ module window { #endif #endif +#if defined(ENABLE_DATABASE) + attribute SQLExceptionConstructor SQLException; +#endif + attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent; attribute DOMFormDataConstructor FormData; @@ -737,6 +741,8 @@ module window { attribute [Conditional=FILE_READER|FILE_WRITER] FileErrorConstructor FileError; attribute [Conditional=FILE_READER] FileReaderConstructor FileReader; + attribute BlobBuilderConstructor BlobBuilder; + #endif // defined(LANGUAGE_JAVASCRIPT) #if defined(V8_BINDING) && V8_BINDING |