| Index: core/page/Window.idl
|
| diff --git a/core/page/DOMWindow.idl b/core/page/Window.idl
|
| similarity index 85%
|
| rename from core/page/DOMWindow.idl
|
| rename to core/page/Window.idl
|
| index 09224c2f9e844ef120355f2e81792a7e89e63021..d4682308380b5cac4dca09987ab1bea96f7969a2 100644
|
| --- a/core/page/DOMWindow.idl
|
| +++ b/core/page/Window.idl
|
| @@ -29,8 +29,8 @@
|
| EventTarget,
|
| CustomToV8,
|
| DoNotGenerateWrap,
|
| - InterfaceName=Window
|
| -] interface DOMWindow {
|
| + ImplementedAs=DOMWindow
|
| +] interface Window {
|
| // DOM Level 0
|
| [Replaceable] readonly attribute Screen screen;
|
| [Replaceable] readonly attribute History history;
|
| @@ -42,7 +42,6 @@
|
| [Replaceable] readonly attribute BarProp toolbar;
|
| [Replaceable, PerWorldBindings, ActivityLog=GetterForIsolatedWorlds] readonly attribute Navigator navigator;
|
| [Replaceable] readonly attribute Navigator clientInformation;
|
| - readonly attribute Crypto crypto;
|
| [DoNotCheckSecurity, CustomSetter, Unforgeable, Replaceable, PerWorldBindings, ActivityLog=AccessForIsolatedWorlds] readonly attribute Location location;
|
| [MeasureAs=WindowEvent, NotEnumerable, Replaceable, CustomGetter, CustomSetter] readonly attribute Event event;
|
|
|
| @@ -57,7 +56,7 @@
|
| void print();
|
| void stop();
|
|
|
| - [Custom] DOMWindow open(DOMString url,
|
| + [Custom] Window open(DOMString url,
|
| DOMString name,
|
| optional DOMString options);
|
|
|
| @@ -113,13 +112,13 @@
|
| attribute DOMString defaultstatus;
|
|
|
| // Self referential attributes
|
| - [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow self;
|
| - [DoNotCheckSecurity, Unforgeable] readonly attribute DOMWindow window;
|
| - [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow frames;
|
| + [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute Window self;
|
| + [DoNotCheckSecurity, Unforgeable] readonly attribute Window window;
|
| + [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute Window frames;
|
|
|
| - [Replaceable, DoNotCheckSecurityOnGetter, CustomSetter] readonly attribute DOMWindow opener;
|
| - [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute DOMWindow parent;
|
| - [DoNotCheckSecurityOnGetter, Unforgeable] readonly attribute DOMWindow top;
|
| + [Replaceable, DoNotCheckSecurityOnGetter, CustomSetter] readonly attribute Window opener;
|
| + [Replaceable, DoNotCheckSecurityOnGetter] readonly attribute Window parent;
|
| + [DoNotCheckSecurityOnGetter, Unforgeable] readonly attribute Window top;
|
|
|
| // DOM Level 2 AbstractView Interface
|
| readonly attribute Document document;
|
| @@ -140,22 +139,20 @@
|
|
|
| [Replaceable] readonly attribute double devicePixelRatio;
|
|
|
| - DOMPoint webkitConvertPointFromPageToNode([Default=Undefined] optional Node node,
|
| - [Default=Undefined] optional DOMPoint p);
|
| - DOMPoint webkitConvertPointFromNodeToPage([Default=Undefined] optional Node node,
|
| - [Default=Undefined] optional DOMPoint p);
|
| + WebKitPoint webkitConvertPointFromPageToNode([Default=Undefined] optional Node node,
|
| + [Default=Undefined] optional WebKitPoint p);
|
| + WebKitPoint webkitConvertPointFromNodeToPage([Default=Undefined] optional Node node,
|
| + [Default=Undefined] optional WebKitPoint p);
|
|
|
| [EnabledAtRuntime, PerWorldBindings, ActivityLog=GetterForIsolatedWorlds] readonly attribute DOMApplicationCache applicationCache;
|
|
|
| [EnabledAtRuntime, PerWorldBindings, ActivityLog=GetterForIsolatedWorlds, GetterRaisesException] readonly attribute Storage sessionStorage;
|
| [EnabledAtRuntime, PerWorldBindings, ActivityLog=GetterForIsolatedWorlds, GetterRaisesException] readonly attribute Storage localStorage;
|
|
|
| -#if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS
|
| // This is the interface orientation in degrees. Some examples are:
|
| // 0 is straight up; -90 is when the device is rotated 90 clockwise;
|
| // 90 is when rotated counter clockwise.
|
| - readonly attribute long orientation;
|
| -#endif
|
| + [Conditional=ORIENTATION_EVENTS] readonly attribute long orientation;
|
|
|
| [Replaceable] readonly attribute Console console;
|
|
|
| @@ -164,12 +161,6 @@
|
|
|
| [Replaceable] readonly attribute Performance performance;
|
|
|
| - // Timers
|
| - [Custom] long setTimeout(any handler, [Default=Undefined] optional long timeout);
|
| - void clearTimeout([Default=Undefined] optional long handle);
|
| - [Custom] long setInterval(any handler, [Default=Undefined] optional long timeout);
|
| - void clearInterval([Default=Undefined] optional long handle);
|
| -
|
| [MeasureAs=UnprefixedRequestAnimationFrame] long requestAnimationFrame(RequestAnimationFrameCallback callback);
|
| void cancelAnimationFrame(long id);
|
| [MeasureAs=PrefixedRequestAnimationFrame] long webkitRequestAnimationFrame(RequestAnimationFrameCallback callback);
|
| @@ -261,9 +252,7 @@
|
| attribute EventListener onwebkitanimationstart;
|
| attribute EventListener onwebkittransitionend;
|
| attribute EventListener ontransitionend;
|
| -#if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS
|
| - attribute EventListener onorientationchange;
|
| -#endif
|
| + [Conditional=ORIENTATION_EVENTS] attribute EventListener onorientationchange;
|
| [EnabledAtRuntime=touch] attribute EventListener ontouchstart;
|
| [EnabledAtRuntime=touch] attribute EventListener ontouchmove;
|
| [EnabledAtRuntime=touch] attribute EventListener ontouchend;
|
| @@ -298,40 +287,26 @@
|
| attribute IDBRequestConstructor webkitIDBRequest;
|
| attribute IDBTransactionConstructor webkitIDBTransaction;
|
|
|
| - // Constructors enabled at runtime but whose interface does not have EnabledAtRuntime
|
| - // extended attribute.
|
| - // FIXME: Remove these.
|
| - [EnabledAtRuntime=media] attribute MediaErrorConstructor MediaError;
|
| - [EnabledAtRuntime=media] attribute TimeRangesConstructor TimeRanges;
|
| - [EnabledAtRuntime=media] attribute HTMLSourceElementConstructor HTMLSourceElement;
|
| - [EnabledAtRuntime=media] attribute MediaControllerConstructor MediaController;
|
| - [EnabledAtRuntime=deviceMotion] attribute DeviceMotionEventConstructor DeviceMotionEvent;
|
| - [EnabledAtRuntime=touch] attribute TouchConstructor Touch;
|
| - [EnabledAtRuntime=touch] attribute TouchEventConstructor TouchEvent;
|
| - [EnabledAtRuntime=touch] attribute TouchListConstructor TouchList;
|
| - [EnabledAtRuntime=webMIDI] attribute MIDIConnectionEventConstructor MIDIConnectionEvent;
|
| - [EnabledAtRuntime=webMIDI] attribute MIDIMessageEventConstructor MIDIMessageEvent;
|
| + // Constructors whose name does not match the interface name.
|
| + // FIXME: Remove these once [ImplementedAs] is used and once constructor names match interface names.
|
| [EnabledAtRuntime=mediaStream] attribute MediaStreamConstructor webkitMediaStream;
|
| [Conditional=WEB_AUDIO, EnabledAtRuntime=WebAudio] attribute AudioContextConstructor webkitAudioContext;
|
| [Conditional=WEB_AUDIO, EnabledAtRuntime=WebAudio] attribute OfflineAudioContextConstructor webkitOfflineAudioContext;
|
| [EnabledAtRuntime=peerConnection] attribute RTCPeerConnectionConstructor webkitRTCPeerConnection;
|
| - [EnabledAtRuntime=experimentalContentSecurityPolicyFeatures] attribute SecurityPolicyViolationEventConstructor SecurityPolicyViolationEvent;
|
| - [EnabledAtRuntime] attribute SharedWorkerConstructor SharedWorker; // Usable with the new operator
|
| [EnabledAtRuntime=scriptedSpeech] attribute SpeechGrammarConstructor webkitSpeechGrammar;
|
| [EnabledAtRuntime=scriptedSpeech] attribute SpeechGrammarListConstructor webkitSpeechGrammarList;
|
| [EnabledAtRuntime=scriptedSpeech] attribute SpeechRecognitionConstructor webkitSpeechRecognition;
|
| [EnabledAtRuntime=scriptedSpeech] attribute SpeechRecognitionErrorConstructor webkitSpeechRecognitionError;
|
| [EnabledAtRuntime=scriptedSpeech] attribute SpeechRecognitionEventConstructor webkitSpeechRecognitionEvent;
|
| -
|
| - // Constructors whose name does not match the interface name.
|
| - // FIXME: Remove these once [ImplementedAs] is used and once constructor names match interface names.
|
| attribute ShadowRootConstructor WebKitShadowRoot;
|
| [Conditional=WEB_AUDIO] attribute PannerNodeConstructor webkitAudioPannerNode;
|
|
|
| // window.toString() requires special handling in V8
|
| [DoNotCheckSignature, DoNotCheckSecurity, Custom, NotEnumerable] DOMString toString();
|
|
|
| - [ImplementedAs=anonymousIndexedGetter, NotEnumerable] getter DOMWindow(unsigned long index);
|
| - [Custom, NotEnumerable] getter DOMWindow (DOMString name);
|
| + [ImplementedAs=anonymousIndexedGetter, NotEnumerable] getter Window(unsigned long index);
|
| + [Custom, NotEnumerable] getter Window (DOMString name);
|
| };
|
|
|
| +Window implements WindowTimers;
|
| +
|
|
|