diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/html/HTMLSelectElement.idl | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/html/HTMLSelectElement.idl')
| -rw-r--r-- | WebCore/html/HTMLSelectElement.idl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/HTMLSelectElement.idl b/WebCore/html/HTMLSelectElement.idl index d3e85a8..fb08bb1 100644 --- a/WebCore/html/HTMLSelectElement.idl +++ b/WebCore/html/HTMLSelectElement.idl @@ -33,7 +33,7 @@ module html { attribute [ConvertNullToNullString] DOMString value; // Modified in DOM Level 2: -#if defined(LANGUAGE_OBJECTIVE_C) +#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C readonly attribute long length; #else attribute unsigned long length @@ -56,7 +56,7 @@ module html { in HTMLElement before) raises(DOMException); -#if defined(LANGUAGE_JAVASCRIPT) +#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 */); #else |