Index: core/frame/Window.idl |
diff --git a/core/frame/Window.idl b/core/frame/Window.idl |
index 3e75b0b9529ce762c742d8e406c387c30904c25b..f9f7d3ef98f564fda9bcd7f824220ae0c0668e8d 100644 |
--- a/core/frame/Window.idl |
+++ b/core/frame/Window.idl |
@@ -45,7 +45,7 @@ |
[Replaceable, MeasureAs=BarPropToolbar] readonly attribute BarProp toolbar; |
[LogActivity=GetterOnly] readonly attribute Navigator navigator; |
[Replaceable] readonly attribute Navigator clientInformation; |
- [DoNotCheckSecurity, Unforgeable, Replaceable, LogActivity, PutForwards=href] readonly attribute Location location; |
+ [DoNotCheckSecurity, Unforgeable, Replaceable, PutForwards=href] readonly attribute Location location; |
[Custom, MeasureAs=WindowEvent, NotEnumerable] attribute Event event; |
Selection getSelection(); |
@@ -69,9 +69,9 @@ |
void alert(); |
void alert(DOMString message); |
- boolean confirm(optional DOMString message = null); |
- [TreatReturnedNullStringAs=Null] DOMString prompt(optional DOMString message = null, |
- optional DOMString defaultValue = null); |
+ boolean confirm(optional DOMString message = ""); |
+ DOMString? prompt(optional DOMString message = "", |
+ optional DOMString defaultValue = ""); |
boolean find([Default=Undefined] optional DOMString string, |
[Default=Undefined] optional boolean caseSensitive, |
@@ -140,19 +140,14 @@ |
// DOM Level 2 Style Interface |
CSSStyleDeclaration getComputedStyle([Default=Undefined] optional Element element, |
- [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString pseudoElement); |
+ [TreatUndefinedAs=NullString, Default=Undefined] optional DOMString? pseudoElement); |
// WebKit extensions |
[MeasureAs=GetMatchedCSSRules] CSSRuleList getMatchedCSSRules([Default=Undefined] optional Element element, |
- [TreatNullAs=NullString, TreatUndefinedAs=NullString, Default=Undefined] optional DOMString pseudoElement); |
+ [TreatUndefinedAs=NullString, Default=Undefined] optional DOMString? pseudoElement); |
[Replaceable] readonly attribute double devicePixelRatio; |
- [MeasureAs=PrefixedConvertPointFromPageToNode] WebKitPoint webkitConvertPointFromPageToNode([Default=Undefined] optional Node node, |
- [Default=Undefined] optional WebKitPoint p); |
- [MeasureAs=PrefixedConvertPointFromNodeToPage] WebKitPoint webkitConvertPointFromNodeToPage([Default=Undefined] optional Node node, |
- [Default=Undefined] optional WebKitPoint p); |
- |
[RuntimeEnabled=ApplicationCache, LogActivity=GetterOnly] readonly attribute ApplicationCache applicationCache; |
[RuntimeEnabled=SessionStorage, LogActivity=GetterOnly, RaisesException=Getter] readonly attribute Storage sessionStorage; |
@@ -166,7 +161,7 @@ |
[Replaceable] readonly attribute Console console; |
// cross-document messaging |
- [DoNotCheckSecurity, Custom, RaisesException] void postMessage(SerializedScriptValue message, DOMString targetOrigin, optional MessagePort[] messagePorts); |
+ [DoNotCheckSecurity, Custom, RaisesException] void postMessage(SerializedScriptValue message, DOMString targetOrigin, optional sequence<Transferable> transfer); |
[Replaceable] readonly attribute Performance performance; |
@@ -193,7 +188,7 @@ |
attribute EventHandler onwebkitanimationiteration; |
attribute EventHandler onwebkitanimationstart; |
attribute EventHandler onwebkittransitionend; |
- [LogActivity=SetterOnly] attribute EventHandler onwheel; |
+ attribute EventHandler onwheel; |
[MeasureAs=WindowCaptureEvents] void captureEvents(); |
[MeasureAs=WindowReleaseEvents] void releaseEvents(); |
@@ -205,12 +200,27 @@ |
[MeasureAs=PrefixedMutationObserverConstructor] attribute MutationObserverConstructor WebKitMutationObserver; |
// window.toString() requires special handling in V8 |
- [DoNotCheckSignature, DoNotCheckSecurity, Custom, NotEnumerable] DOMString toString(); |
+ [DoNotCheckSignature, DoNotCheckSecurity, Custom, NotEnumerable] stringifier; |
[NotEnumerable] getter Window (unsigned long index); |
[Custom, NotEnumerable] getter Window (DOMString name); |
}; |
+// http://www.whatwg.org/specs/web-apps/current-work/#transferable-objects |
+// |
+// Expressing the Transferable typedef in IDL depends on http://crbug.com/240176. |
+// The postMessage() methods taking a Transferable array argument have custom |
+// binding code that is able to handle the Transferables that we currently |
+// recognize. To be able to declare a postMessage() signature that matches |
+// the implementation, we provide a Transferable typedef but with an |
+// incomplete type. |
+// |
+// FIXME: make this typedef accurate once enough of http://crbug.com/240176 |
+// is in place. |
+// FIXME: consider putting this typedef in an .idl file containing spec-wide |
+// utility type definitions. |
+typedef MessagePort Transferable; |
+ |
Window implements GlobalEventHandlers; |
Window implements WindowBase64; |
Window implements WindowEventHandlers; |