From ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 8 Jul 2010 12:51:48 +0100 Subject: Merge WebKit at r62496: Initial merge by git Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 --- WebCore/html/HTMLSelectElement.idl | 47 ++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 25 deletions(-) (limited to 'WebCore/html/HTMLSelectElement.idl') diff --git a/WebCore/html/HTMLSelectElement.idl b/WebCore/html/HTMLSelectElement.idl index 3303272..2e53bca 100644 --- a/WebCore/html/HTMLSelectElement.idl +++ b/WebCore/html/HTMLSelectElement.idl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. * Copyright (C) 2006 Samuel Weinig * * This library is free software; you can redistribute it and/or @@ -24,51 +24,48 @@ module html { HasIndexGetter, HasCustomIndexSetter ] HTMLSelectElement : HTMLElement { - - readonly attribute DOMString type; - attribute long selectedIndex; - attribute [ConvertNullToNullString] DOMString value; + readonly attribute DOMString type; + attribute long selectedIndex; + attribute [ConvertNullToNullString] DOMString value; // Modified in DOM Level 2: #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C - readonly attribute long length; + readonly attribute long length; #else - attribute unsigned long length - setter raises (DOMException); + attribute unsigned long length setter raises (DOMException); #endif readonly attribute HTMLFormElement form; - readonly attribute ValidityState validity; - readonly attribute boolean willValidate; - readonly attribute DOMString validationMessage; - boolean checkValidity(); - void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error); + readonly attribute ValidityState validity; + readonly attribute boolean willValidate; + readonly attribute DOMString validationMessage; + boolean checkValidity(); + void setCustomValidity(in [ConvertUndefinedOrNullToNullString] DOMString error); // Modified in DOM Level 2: readonly attribute HTMLOptionsCollection options; - attribute boolean disabled; - attribute boolean autofocus; - attribute boolean multiple; - attribute [ConvertNullToNullString] DOMString name; - attribute long size; + attribute [Reflect] boolean disabled; + attribute [Reflect] boolean autofocus; + attribute boolean multiple; + attribute [ConvertNullToNullString] DOMString name; + attribute long size; - [OldStyleObjC] void add(in HTMLElement element, - in HTMLElement before) - raises(DOMException); + [OldStyleObjC] void add(in HTMLElement element, in HTMLElement before) raises(DOMException); #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT - // In JS, we support both options index and options object parameters - this cannot be autogenerated now. - [Custom] void remove(/* 1 */); + // In JavaScript, we support both option index and option object parameters. + // As of this writing this cannot be auto-generated. + [Custom] void remove(/* indexOrOption */); #else - void remove(in long index); + void remove(in long index); #endif // These methods are not in DOM Level 2 IDL, but are mentioned in the standard: // "The contained options can be directly accessed through the select element as a collection." Node item(in [IsIndex] unsigned long index); Node namedItem(in DOMString name); - readonly attribute NodeList labels; + readonly attribute NodeList labels; }; } -- cgit v1.1