From d4469626cf6f8e2a856de975610502e65a3ba27c Mon Sep 17 00:00:00 2001
From: Leon Clarke <leonclarke@google.com>
Date: Thu, 3 Jun 2010 17:08:22 +0100
Subject: [PATCH] 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
---
 WebCore/html/HTMLOptionElement.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/WebCore/html/HTMLOptionElement.h b/WebCore/html/HTMLOptionElement.h
index 35f7faee8..b82bfaeaa 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*);
-- 
2.11.0