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/HTMLCanvasElement.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/HTMLCanvasElement.idl')
| -rw-r--r-- | WebCore/html/HTMLCanvasElement.idl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/html/HTMLCanvasElement.idl b/WebCore/html/HTMLCanvasElement.idl index bf69ac0..13fc623 100644 --- a/WebCore/html/HTMLCanvasElement.idl +++ b/WebCore/html/HTMLCanvasElement.idl @@ -37,7 +37,7 @@ module html { DOMString toDataURL(in [ConvertUndefinedOrNullToNullString] DOMString type) raises(DOMException); -#if !defined(LANGUAGE_OBJECTIVE_C) +#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C [V8Custom] DOMObject getContext(in DOMString contextId); #endif |