1 files changed, 25 insertions, 28 deletions
diff --git a/Source/WebCore/page/Location.idl b/Source/WebCore/page/Location.idl
index 7eeb6be92..750a1c4c7 100644
--- a/Source/WebCore/page/Location.idl
+++ b/Source/WebCore/page/Location.idl
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -27,41 +27,38 @@
  */
 
 [
-    JSCustomGetOwnPropertySlotAndDescriptor,
-    CustomNamedSetter,
-    GenerateIsReachable=ImplFrame,
+    CheckSecurity,
     CustomDeleteProperty,
     CustomEnumerateProperty,
+    CustomGetPrototype,
+    CustomNamedSetter,
+    CustomPreventExtensions,
+    CustomSetPrototype,
+    CustomToStringName,
+    GenerateIsReachable=ImplFrame,
     JSCustomDefineOwnProperty,
-    JSCustomNamedGetterOnPrototype,
     JSCustomDefineOwnPropertyOnPrototype,
-    OperationsNotDeletable
+    JSCustomGetOwnPropertySlotAndDescriptor,
+    JSCustomNamedGetterOnPrototype,
+    Unforgeable,
 ] interface Location {
-#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
-             [DoNotCheckSecurityOnSetter, CustomSetter] attribute DOMString href;
-#endif
+    [SetterCallWith=ActiveWindow&FirstWindow, DoNotCheckSecurityOnSetter] stringifier attribute USVString href;
 
-    [Custom] void assign([Default=Undefined] optional DOMString url);
-    [Custom] void replace([Default=Undefined] optional DOMString url);
-    [Custom] void reload();
+    [CallWith=ActiveWindow&FirstWindow, ForwardDeclareInHeader] void assign(USVString url);
+    [DoNotCheckSecurity, CallWith=ActiveWindow&FirstWindow, ForwardDeclareInHeader] void replace(USVString url);
+    [CallWith=ActiveWindow, ForwardDeclareInHeader] void reload();
 
     // URI decomposition attributes
-#if !defined(LANGUAGE_CPP) || !LANGUAGE_CPP
-             [CustomSetter] attribute DOMString protocol;
-             [CustomSetter] attribute DOMString host;
-             [CustomSetter] attribute DOMString hostname;
-             [CustomSetter] attribute DOMString port;
-             [CustomSetter] attribute DOMString pathname;
-             [CustomSetter] attribute DOMString search;
-             [CustomSetter] attribute DOMString hash;
+    [SetterCallWith=ActiveWindow&FirstWindow, SetterMayThrowException] attribute USVString protocol;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString host;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString hostname;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString port;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString pathname;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString search;
+    [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString hash;
 
-             readonly attribute DOMString origin;
-#endif
+    readonly attribute USVString origin;
 
-    readonly attribute DOMStringList ancestorOrigins;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    [NotEnumerable, Custom, ImplementedAs=toStringFunction] DOMString toString();
-#endif
+    // FIXME: Add support for SameObject.
+    [Unforgeable, CachedAttribute] readonly attribute DOMStringList ancestorOrigins;
 };
-