diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-04 10:18:00 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 14:50:09 +0100 |
| commit | 42ce4030a1ff35b1154f5c07e06c84875ec75adc (patch) | |
| tree | bce78feb0a13475dbafc876140f10452742a2e28 /WebCore/bindings | |
| parent | 6f60177b50520b5406116adc50e752cb8a596243 (diff) | |
| download | external_webkit-42ce4030a1ff35b1154f5c07e06c84875ec75adc.zip external_webkit-42ce4030a1ff35b1154f5c07e06c84875ec75adc.tar.gz external_webkit-42ce4030a1ff35b1154f5c07e06c84875ec75adc.tar.bz2 | |
Merge webkit.org at r60469 : Make generated bindings code compile
Change-Id: Ib2ec92fa65ee46f3c76093d9ff6b6eb18f863736
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/custom/V8CustomVoidCallback.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/custom/V8CustomVoidCallback.h b/WebCore/bindings/v8/custom/V8CustomVoidCallback.h index 03a47bc..61fb82e 100644 --- a/WebCore/bindings/v8/custom/V8CustomVoidCallback.h +++ b/WebCore/bindings/v8/custom/V8CustomVoidCallback.h @@ -32,6 +32,11 @@ #define V8CustomVoidCallback_h #include "VoidCallback.h" +#if PLATFORM(ANDROID) +// Temporary workaround until this bug is resolved +// https://bugs.webkit.org/show_bug.cgi?id=40290 +#include "V8Proxy.h" +#endif #include <v8.h> #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> |