From 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 Mon Sep 17 00:00:00 2001
From: Andrei Popescu <andreip@google.com>
Date: Wed, 19 Aug 2009 14:09:30 +0100
Subject: Revert "Merge WebKit r47420"

This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
---
 WebCore/dom/ProcessingInstruction.h | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'WebCore/dom/ProcessingInstruction.h')

diff --git a/WebCore/dom/ProcessingInstruction.h b/WebCore/dom/ProcessingInstruction.h
index 4b7dc86..d133019 100644
--- a/WebCore/dom/ProcessingInstruction.h
+++ b/WebCore/dom/ProcessingInstruction.h
@@ -1,6 +1,8 @@
 /*
+ * This file is part of the DOM implementation for KDE.
+ *
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
- * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 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
@@ -33,28 +35,15 @@ class CSSStyleSheet;
 
 class ProcessingInstruction : public ContainerNode, private CachedResourceClient {
 public:
-    static PassRefPtr<ProcessingInstruction> create(Document*, const String& target, const String& data);
+    ProcessingInstruction(Document*);
+    ProcessingInstruction(Document*, const String& target, const String& data);
     virtual ~ProcessingInstruction();
 
-    const String& target() const { return m_target; }
-    const String& data() const { return m_data; }
+    // DOM methods & attributes for Notation
+    String target() const { return m_target; }
+    String data() const { return m_data; }
     void setData(const String&, ExceptionCode&);
 
-    void setCreatedByParser(bool createdByParser) { m_createdByParser = createdByParser; }
-
-    virtual void finishParsingChildren();
-
-    const String& localHref() const { return m_localHref; }
-    StyleSheet* sheet() const { return m_sheet.get(); }
-    void setCSSStyleSheet(PassRefPtr<CSSStyleSheet>);
-
-#if ENABLE(XSLT)
-    bool isXSL() const { return m_isXSL; }
-#endif
-
-private:
-    ProcessingInstruction(Document*, const String& target, const String& data);
-
     virtual String nodeName() const;
     virtual NodeType nodeType() const;
     virtual String nodeValue() const;
@@ -66,18 +55,28 @@ private:
 
     virtual void insertedIntoDocument();
     virtual void removedFromDocument();
+    void setCreatedByParser(bool createdByParser) { m_createdByParser = createdByParser; }
+    virtual void finishParsingChildren();
 
+    // Other methods (not part of DOM)
+    String localHref() const { return m_localHref; }
+    StyleSheet* sheet() const { return m_sheet.get(); }
     void checkStyleSheet();
     virtual void setCSSStyleSheet(const String& url, const String& charset, const CachedCSSStyleSheet*);
 #if ENABLE(XSLT)
     virtual void setXSLStyleSheet(const String& url, const String& sheet);
 #endif
-
+    void setCSSStyleSheet(PassRefPtr<CSSStyleSheet>);
     bool isLoading() const;
     virtual bool sheetLoaded();
 
+#if ENABLE(XSLT)
+    bool isXSL() const { return m_isXSL; }
+#endif
+
     virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
 
+private:
     void parseStyleSheet(const String& sheet);
 
     String m_target;
-- 
cgit v1.1