1 files changed, 20 insertions, 9 deletions
diff --git a/WebCore/html/HTMLLinkElement.h b/WebCore/html/HTMLLinkElement.h
index 07a9228..b9c31e6 100644
--- a/WebCore/html/HTMLLinkElement.h
+++ b/WebCore/html/HTMLLinkElement.h
@@ -1,7 +1,9 @@
 /*
+ * This file is part of the DOM implementation for KDE.
+ *
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2003, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,20 +21,19 @@
  * Boston, MA 02110-1301, USA.
  *
  */
-
 #ifndef HTMLLinkElement_h
 #define HTMLLinkElement_h
 
-#include "CSSStyleSheet.h"
-#include "CachedResourceClient.h"
 #include "HTMLElement.h"
+#include "CachedResourceClient.h"
+#include "CSSStyleSheet.h"
 
 namespace WebCore {
 
 class CachedCSSStyleSheet;
-class KURL;
 
-class HTMLLinkElement : public HTMLElement, public CachedResourceClient {
+class HTMLLinkElement : public HTMLElement, public CachedResourceClient
+{
 public:
     HTMLLinkElement(Document*);
     ~HTMLLinkElement();
@@ -46,7 +47,7 @@ public:
     String charset() const;
     void setCharset(const String&);
 
-    KURL href() const;
+    String href() const;
     void setHref(const String&);
 
     String hreflang() const;
@@ -78,7 +79,7 @@ public:
     virtual void removedFromDocument();
 
     // from CachedResourceClient
-    virtual void setCSSStyleSheet(const String &url, const String& charset, const CachedCSSStyleSheet* sheet);
+    virtual void setCSSStyleSheet(const String &url, const String& charset, const String &sheet);
     bool isLoading() const;
     virtual bool sheetLoaded();
 
@@ -90,8 +91,11 @@ public:
     void setDisabledState(bool _disabled);
 
     virtual bool isURLAttribute(Attribute*) const;
-    
+#ifdef ANDROID_PRELOAD_CHANGES
+    static void tokenizeRelAttribute(const AtomicString& value, bool& stylesheet, bool& alternate, bool& icon);
+#else
     void tokenizeRelAttribute(const AtomicString& rel);
+#endif
 
 protected:
     CachedCSSStyleSheet* m_cachedSheet;
@@ -100,10 +104,17 @@ protected:
     String m_type;
     String m_media;
     int m_disabledState; // 0=unset(default), 1=enabled via script, 2=disabled
+#ifdef ANDROID_PRELOAD_CHANGES
+    bool m_loading;
+    bool m_alternate;
+    bool m_isStyleSheet;
+    bool m_isIcon;
+#else
     bool m_loading : 1;
     bool m_alternate : 1;
     bool m_isStyleSheet : 1;
     bool m_isIcon : 1;
+#endif
 };
 
 } //namespace