diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 17:08:22 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 14:49:59 +0100 |
| commit | d4469626cf6f8e2a856de975610502e65a3ba27c (patch) | |
| tree | 0edee2d5628fdb8e4a2dc09378b89bb4b725d260 /WebCore/html | |
| parent | 359e3e1782e0eba605f938bf8e431db585f1b66c (diff) | |
| download | external_webkit-d4469626cf6f8e2a856de975610502e65a3ba27c.zip external_webkit-d4469626cf6f8e2a856de975610502e65a3ba27c.tar.gz external_webkit-d4469626cf6f8e2a856de975610502e65a3ba27c.tar.bz2 | |
Merge webkit.org at r60469 : friend needed after @60361 made many things private
http://trac.webkit.org/changeset/60361
These changes are layering violations so should be removed before upstreaming.
Change-Id: I9ae45d9d0d8f4fa3a5cd1501f10b716be3a7dd85
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLOptionElement.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/WebCore/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h index 35f7fae..b82bfae 100644 --- a/WebCore/html/HTMLOptionElement.h +++ b/WebCore/html/HTMLOptionElement.h @@ -27,6 +27,13 @@ #include "HTMLFormControlElement.h" #include "OptionElement.h" +#if PLATFORM(ANDROID) +namespace android { +class WebViewCore; +class ListBoxReply; +}; +#endif + namespace WebCore { class HTMLSelectElement; @@ -34,6 +41,11 @@ class HTMLSelectElement; class HTMLOptionElement : public HTMLFormControlElement, public OptionElement { friend class HTMLSelectElement; friend class RenderMenuList; +#if PLATFORM(ANDROID) + friend class RenderThemeAndroid; + friend class android::WebViewCore; + friend class android::ListBoxReply; +#endif public: static PassRefPtr<HTMLOptionElement> create(Document*, HTMLFormElement*); |