2006-10-07 Anders Carlsson <acarlsson@apple.com>

        Reviewed by Darin.

        Convert a bunch of RefPtr<StringImpl> to String.

        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::didTellBridgeAboutLoad):
        (WebCore::FrameMac::haveToldBridgeAboutLoad):
        * dom/BeforeUnloadEvent.cpp:
        (WebCore::BeforeUnloadEvent::storeResult):
        * dom/BeforeUnloadEvent.h:
        (WebCore::BeforeUnloadEvent::result):
        * dom/Document.cpp:
        (WebCore::Document::createEntityReference):
        * dom/Entity.cpp:
        (WebCore::Entity::Entity):
        (WebCore::Entity::nodeName):
        (WebCore::Entity::toString):
        * dom/Entity.h:
        (WebCore::Entity::publicId):
        (WebCore::Entity::systemId):
        (WebCore::Entity::notationName):
        * dom/EntityReference.cpp:
        (WebCore::EntityReference::EntityReference):
        (WebCore::EntityReference::nodeName):
        (WebCore::EntityReference::cloneNode):
        (WebCore::EntityReference::toString):
        * dom/EntityReference.h:
        * dom/KeyboardEvent.cpp:
        (WebCore::KeyboardEvent::KeyboardEvent):
        (WebCore::KeyboardEvent::initKeyboardEvent):
        * dom/KeyboardEvent.h:
        (WebCore::KeyboardEvent::keyIdentifier):
        * dom/MutationEvent.cpp:
        (WebCore::MutationEvent::MutationEvent):
        (WebCore::MutationEvent::initMutationEvent):
        * dom/MutationEvent.h:
        (WebCore::MutationEvent::prevValue):
        (WebCore::MutationEvent::newValue):
        (WebCore::MutationEvent::attrName):
        * dom/Notation.cpp:
        (WebCore::Notation::Notation):
        (WebCore::Notation::nodeName):
        * dom/Notation.h:
        (WebCore::Notation::publicId):
        (WebCore::Notation::systemId):
        * dom/ProcessingInstruction.cpp:
        (WebCore::ProcessingInstruction::ProcessingInstruction):
        (WebCore::ProcessingInstruction::setData):
        (WebCore::ProcessingInstruction::nodeName):
        (WebCore::ProcessingInstruction::nodeValue):
        (WebCore::ProcessingInstruction::cloneNode):
        (WebCore::ProcessingInstruction::checkStyleSheet):
        (WebCore::ProcessingInstruction::toString):
        * dom/ProcessingInstruction.h:
        (WebCore::ProcessingInstruction::target):
        (WebCore::ProcessingInstruction::data):
        (WebCore::ProcessingInstruction::localHref):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16885 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3112b11d8b9256f26b3abd5b3c36d383d1541e01..d51b6bbf209739e550d1ad14724b6abb5ddef13c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,64 @@
+2006-10-07  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Darin.
+
+        Convert a bunch of RefPtr<StringImpl> to String.
+        
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::didTellBridgeAboutLoad):
+        (WebCore::FrameMac::haveToldBridgeAboutLoad):
+        * dom/BeforeUnloadEvent.cpp:
+        (WebCore::BeforeUnloadEvent::storeResult):
+        * dom/BeforeUnloadEvent.h:
+        (WebCore::BeforeUnloadEvent::result):
+        * dom/Document.cpp:
+        (WebCore::Document::createEntityReference):
+        * dom/Entity.cpp:
+        (WebCore::Entity::Entity):
+        (WebCore::Entity::nodeName):
+        (WebCore::Entity::toString):
+        * dom/Entity.h:
+        (WebCore::Entity::publicId):
+        (WebCore::Entity::systemId):
+        (WebCore::Entity::notationName):
+        * dom/EntityReference.cpp:
+        (WebCore::EntityReference::EntityReference):
+        (WebCore::EntityReference::nodeName):
+        (WebCore::EntityReference::cloneNode):
+        (WebCore::EntityReference::toString):
+        * dom/EntityReference.h:
+        * dom/KeyboardEvent.cpp:
+        (WebCore::KeyboardEvent::KeyboardEvent):
+        (WebCore::KeyboardEvent::initKeyboardEvent):
+        * dom/KeyboardEvent.h:
+        (WebCore::KeyboardEvent::keyIdentifier):
+        * dom/MutationEvent.cpp:
+        (WebCore::MutationEvent::MutationEvent):
+        (WebCore::MutationEvent::initMutationEvent):
+        * dom/MutationEvent.h:
+        (WebCore::MutationEvent::prevValue):
+        (WebCore::MutationEvent::newValue):
+        (WebCore::MutationEvent::attrName):
+        * dom/Notation.cpp:
+        (WebCore::Notation::Notation):
+        (WebCore::Notation::nodeName):
+        * dom/Notation.h:
+        (WebCore::Notation::publicId):
+        (WebCore::Notation::systemId):
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::ProcessingInstruction):
+        (WebCore::ProcessingInstruction::setData):
+        (WebCore::ProcessingInstruction::nodeName):
+        (WebCore::ProcessingInstruction::nodeValue):
+        (WebCore::ProcessingInstruction::cloneNode):
+        (WebCore::ProcessingInstruction::checkStyleSheet):
+        (WebCore::ProcessingInstruction::toString):
+        * dom/ProcessingInstruction.h:
+        (WebCore::ProcessingInstruction::target):
+        (WebCore::ProcessingInstruction::data):
+        (WebCore::ProcessingInstruction::localHref):
+
 2006-10-07  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Tim H.

diff --git a/WebCore/bridge/mac/FrameMac.h b/WebCore/bridge/mac/FrameMac.h
index ba3c3a5c9a8104451a988651fb12a8da20d7a83c..0ed1014af2e9db20b7b4ed64b5d3f7813d54cbed 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.h
+++ b/WebCore/bridge/mac/FrameMac.h
@@ -364,7 +364,7 @@ private:
 
     bool _haveUndoRedoOperations;
     
-    HashSet<RefPtr<StringImpl> > urlsBridgeKnowsAbout;
+    HashSet<String> urlsBridgeKnowsAbout;
 
     friend class Frame;
 

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index c972e855ecf5c53e5b04bb60cf3da8a7ad7cf41f..3771c0bdcfab84e9dd33f9ea8dac6a6cf399d2d2 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -2911,12 +2911,12 @@ WebCoreKeyboardUIMode FrameMac::keyboardUIMode() const
 
 void FrameMac::didTellBridgeAboutLoad(const String& URL)
 {
-    urlsBridgeKnowsAbout.add(URL.impl());
+    urlsBridgeKnowsAbout.add(URL);
 }
 
 bool FrameMac::haveToldBridgeAboutLoad(const String& URL)
 {
-    return urlsBridgeKnowsAbout.contains(URL.impl());
+    return urlsBridgeKnowsAbout.contains(URL);
 }
 
 void FrameMac::clear()

diff --git a/WebCore/dom/BeforeUnloadEvent.cpp b/WebCore/dom/BeforeUnloadEvent.cpp
index 4eab00a12434981a9f9e980cac9dedda1bab75cb..446f8845ff06291680f17dcd0f3e103c9d495446 100644 (file)
--- a/WebCore/dom/BeforeUnloadEvent.cpp
+++ b/WebCore/dom/BeforeUnloadEvent.cpp
@@ -43,7 +43,7 @@ bool BeforeUnloadEvent::storesResultAsString() const
 
 void BeforeUnloadEvent::storeResult(const String& s)
 {
-    m_result = s.impl();
+    m_result = s;
 }
 
 } // namespace WebCore

diff --git a/WebCore/dom/BeforeUnloadEvent.h b/WebCore/dom/BeforeUnloadEvent.h
index a09aacd7d929013c425ac6f423faf354062126eb..2d8205f52eb7a973030d71895fb3a48d3c35f105 100644 (file)
--- a/WebCore/dom/BeforeUnloadEvent.h
+++ b/WebCore/dom/BeforeUnloadEvent.h
@@ -37,10 +37,10 @@ namespace WebCore {
         virtual bool storesResultAsString() const;
         virtual void storeResult(const String&);
 
-        String result() const { return m_result.get(); }
+        String result() const { return m_result; }
 
     private:
-        RefPtr<StringImpl> m_result;
+        String m_result;
     };
 
 } // namespace WebCore

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 4ea7ea2e3cd64146651f05621ee46fdcf59817ab..7fc238a6d6b87b56d13de56c692eada4fd44b94e 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -461,7 +461,7 @@ PassRefPtr<EntityReference> Document::createEntityReference(const String &name,
         ec = NOT_SUPPORTED_ERR;
         return 0;
     }
-    return new EntityReference(this, name.impl());
+    return new EntityReference(this, name);
 }
 
 PassRefPtr<EditingText> Document::createEditingTextNode(const String &text)

diff --git a/WebCore/dom/Entity.cpp b/WebCore/dom/Entity.cpp
index c2557d197a5520fea79d924eac7f2506522f5af6..d4d75a1a3daa348f45e53ec6d4e290d0bc4e5e5d 100644 (file)
--- a/WebCore/dom/Entity.cpp
+++ b/WebCore/dom/Entity.cpp
@@ -31,21 +31,21 @@ Entity::Entity(Document* doc)
 
 Entity::Entity(Document* doc, const String& name)
     : ContainerNode(doc)
-    , m_name(name.impl())
+    , m_name(name)
 {
 }
 
 Entity::Entity(Document* doc, const String& publicId, const String& systemId, const String& notationName)
     : ContainerNode(doc)
-    , m_publicId(publicId.impl())
-    , m_systemId(systemId.impl())
-    , m_notationName(notationName.impl())
+    , m_publicId(publicId)
+    , m_systemId(systemId)
+    , m_notationName(notationName)
 {
 }
 
 String Entity::nodeName() const
 {
-    return m_name.get();
+    return m_name;
 }
 
 Node::NodeType Entity::nodeType() const
@@ -80,26 +80,26 @@ String Entity::toString() const
 {
     String result = "<!ENTITY' ";
 
-    if (m_name && m_name->length()) {
+    if (!m_name.isEmpty()) {
         result += " ";
-        result += m_name.get();
+        result += m_name;
     }
 
-    if (m_publicId && m_publicId->length()) {
+    if (!m_publicId.isEmpty()) {
         result += " PUBLIC \"";
-        result += m_publicId.get();
+        result += m_publicId;
         result += "\" \"";
-        result += m_systemId.get();
+        result += m_systemId;
         result += "\"";
-    } else if (m_systemId && m_systemId->length()) {
+    } else if (!m_systemId.isEmpty()) {
         result += " SYSTEM \"";
-        result += m_systemId.get();
+        result += m_systemId;
         result += "\"";
     }
 
-    if (m_notationName && m_notationName->length()) {
+    if (!m_notationName.isEmpty()) {
         result += " NDATA ";
-        result += m_notationName.get();
+        result += m_notationName;
     }
 
     result += ">";

diff --git a/WebCore/dom/Entity.h b/WebCore/dom/Entity.h
index 0bf30b7d7c4c7a0f7721e34cbc75ad54170035ef..728530b071412eb4daa744d66d20d8bde80996c4 100644 (file)
--- a/WebCore/dom/Entity.h
+++ b/WebCore/dom/Entity.h
@@ -36,9 +36,9 @@ public:
     Entity(Document*, const String& publicId, const String& systemId, const String& notationName);
 
     // DOM methods & attributes for Entity
-    String publicId() const { return m_publicId.get(); }
-    String systemId() const { return m_systemId.get(); }
-    String notationName() const { return m_notationName.get(); }
+    String publicId() const { return m_publicId; }
+    String systemId() const { return m_systemId; }
+    String notationName() const { return m_notationName; }
 
     virtual String nodeName() const;
     virtual NodeType nodeType() const;
@@ -47,10 +47,10 @@ public:
     virtual String toString() const;
 
 private:
-    RefPtr<StringImpl> m_publicId;
-    RefPtr<StringImpl> m_systemId;
-    RefPtr<StringImpl> m_notationName;
-    RefPtr<StringImpl> m_name;
+    String m_publicId;
+    String m_systemId;
+    String m_notationName;
+    String m_name;
 };
 
 } //namespace

diff --git a/WebCore/dom/EntityReference.cpp b/WebCore/dom/EntityReference.cpp
index ceaff0a3fc2d690b269de0d75ff40e7db23f8c56..b4e2c1ac63134a7a67a7831147202ce455ba464a 100644 (file)
--- a/WebCore/dom/EntityReference.cpp
+++ b/WebCore/dom/EntityReference.cpp
@@ -29,7 +29,7 @@ EntityReference::EntityReference(Document* doc)
 {
 }
 
-EntityReference::EntityReference(Document* doc, StringImpl* entityName)
+EntityReference::EntityReference(Document* doc, const String& entityName)
     : ContainerNode(doc)
     , m_entityName(entityName)
 {
@@ -37,7 +37,7 @@ EntityReference::EntityReference(Document* doc, StringImpl* entityName)
 
 String EntityReference::nodeName() const
 {
-    return m_entityName.get();
+    return m_entityName;
 }
 
 Node::NodeType EntityReference::nodeType() const
@@ -47,7 +47,7 @@ Node::NodeType EntityReference::nodeType() const
 
 PassRefPtr<Node> EntityReference::cloneNode(bool deep)
 {
-    RefPtr<EntityReference> clone = new EntityReference(document(), m_entityName.get());
+    RefPtr<EntityReference> clone = new EntityReference(document(), m_entityName);
     // ### make sure children are readonly
     // ### since we are a reference, should we clone children anyway (even if not deep?)
     if (deep)
@@ -75,7 +75,7 @@ bool EntityReference::childTypeAllowed(NodeType type)
 String EntityReference::toString() const
 {
     String result = "&";
-    result += m_entityName.get();
+    result += m_entityName;
     result += ";";
 
     return result;

diff --git a/WebCore/dom/EntityReference.h b/WebCore/dom/EntityReference.h
index b9b9d483ec5ad88af3c39274bbc01a0e6050325e..154f089bd539fc7f8a1462873cb4211dc1da44b5 100644 (file)
--- a/WebCore/dom/EntityReference.h
+++ b/WebCore/dom/EntityReference.h
@@ -32,7 +32,7 @@ class EntityReference : public ContainerNode
 {
 public:
     EntityReference(Document*);
-    EntityReference(Document*, StringImpl* entityName);
+    EntityReference(Document*, const String& entityName);
 
     virtual String nodeName() const;
     virtual NodeType nodeType() const;
@@ -41,7 +41,7 @@ public:
     virtual String toString() const;
 
 private:
-    RefPtr<StringImpl> m_entityName;
+    String m_entityName;
 };
 
 } //namespace

diff --git a/WebCore/dom/KeyboardEvent.cpp b/WebCore/dom/KeyboardEvent.cpp
index 5b6be8b08dbd4e680ae89a5d57f8a5b0720f71fe..2edb878d7a47f6e6b6c61b06e08a2146f788e508 100644 (file)
--- a/WebCore/dom/KeyboardEvent.cpp
+++ b/WebCore/dom/KeyboardEvent.cpp
@@ -42,7 +42,7 @@ KeyboardEvent::KeyboardEvent(const PlatformKeyboardEvent& key, AbstractView* vie
     : UIEventWithKeyState(key.isKeyUp() ? keyupEvent : key.isAutoRepeat() ? keypressEvent : keydownEvent,
                           true, true, view, 0, key.ctrlKey(), key.altKey(), key.shiftKey(), key.metaKey())
     , m_keyEvent(new PlatformKeyboardEvent(key))
-    , m_keyIdentifier(String(key.keyIdentifier()).impl())
+    , m_keyIdentifier(key.keyIdentifier())
     , m_keyLocation(key.isKeypad() ? DOM_KEY_LOCATION_NUMPAD : DOM_KEY_LOCATION_STANDARD)
     , m_altGraphKey(false)
 {
@@ -53,7 +53,7 @@ KeyboardEvent::KeyboardEvent(const AtomicString& eventType, bool canBubble, bool
                              bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey)
     : UIEventWithKeyState(eventType, canBubble, cancelable, view, 0, ctrlKey, altKey, shiftKey, metaKey)
     , m_keyEvent(0)
-    , m_keyIdentifier(keyIdentifier.impl())
+    , m_keyIdentifier(keyIdentifier)
     , m_keyLocation(keyLocation)
     , m_altGraphKey(altGraphKey)
 {
@@ -73,7 +73,7 @@ void KeyboardEvent::initKeyboardEvent(const AtomicString& type, bool canBubble,
 
     initUIEvent(type, canBubble, cancelable, view, 0);
 
-    m_keyIdentifier = keyIdentifier.impl();
+    m_keyIdentifier = keyIdentifier;
     m_keyLocation = keyLocation;
     m_ctrlKey = ctrlKey;
     m_shiftKey = shiftKey;

diff --git a/WebCore/dom/KeyboardEvent.h b/WebCore/dom/KeyboardEvent.h
index 6e41485913b68c41f7be805a647efeedd94c4ffd..43c32dbcacc7539725deaded110b95c8dfdd0885 100644 (file)
--- a/WebCore/dom/KeyboardEvent.h
+++ b/WebCore/dom/KeyboardEvent.h
@@ -53,7 +53,7 @@ namespace WebCore {
                                const String& keyIdentifier, unsigned keyLocation,
                                bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, bool altGraphKey = false);
     
-        String keyIdentifier() const { return m_keyIdentifier.get(); }
+        String keyIdentifier() const { return m_keyIdentifier; }
         unsigned keyLocation() const { return m_keyLocation; }
     
         bool altGraphKey() const { return m_altGraphKey; }
@@ -68,7 +68,7 @@ namespace WebCore {
 
     private:
         PlatformKeyboardEvent* m_keyEvent;
-        RefPtr<StringImpl> m_keyIdentifier;
+        String m_keyIdentifier;
         unsigned m_keyLocation;
         bool m_altGraphKey : 1;
     };

diff --git a/WebCore/dom/MutationEvent.cpp b/WebCore/dom/MutationEvent.cpp
index f5c5a7957a2c0084cd4cb5c4e8aa25ed2af18720..55cabe83798cb02b5ef23bf9282dae41662e3d1a 100644 (file)
--- a/WebCore/dom/MutationEvent.cpp
+++ b/WebCore/dom/MutationEvent.cpp
@@ -37,9 +37,9 @@ MutationEvent::MutationEvent(const AtomicString& type, bool canBubble, bool canc
                              const String& attrName, unsigned short attrChange)
     : Event(type, canBubble, cancelable)
     , m_relatedNode(relatedNode)
-    , m_prevValue(prevValue.impl())
-    , m_newValue(newValue.impl())
-    , m_attrName(attrName.impl())
+    , m_prevValue(prevValue)
+    , m_newValue(newValue)
+    , m_attrName(attrName)
     , m_attrChange(attrChange)
 {
 }
@@ -54,9 +54,9 @@ void MutationEvent::initMutationEvent(const AtomicString& type, bool canBubble,
     initEvent(type, canBubble, cancelable);
 
     m_relatedNode = relatedNode;
-    m_prevValue = prevValue.impl();
-    m_newValue = newValue.impl();
-    m_attrName = attrName.impl();
+    m_prevValue = prevValue;
+    m_newValue = newValue;
+    m_attrName = attrName;
     m_attrChange = attrChange;
 }
 

diff --git a/WebCore/dom/MutationEvent.h b/WebCore/dom/MutationEvent.h
index e1fb74a96aa371bfdb3233b81f5135aab2d88295..b036634bf58cdb305db32d479dab1546e8af04fe 100644 (file)
--- a/WebCore/dom/MutationEvent.h
+++ b/WebCore/dom/MutationEvent.h
@@ -49,18 +49,18 @@ namespace WebCore {
                                const String& attrName, unsigned short attrChange);
 
         Node* relatedNode() const { return m_relatedNode.get(); }
-        String prevValue() const { return m_prevValue.get(); }
-        String newValue() const { return m_newValue.get(); }
-        String attrName() const { return m_attrName.get(); }
+        String prevValue() const { return m_prevValue; }
+        String newValue() const { return m_newValue; }
+        String attrName() const { return m_attrName; }
         unsigned short attrChange() const { return m_attrChange; }
 
         virtual bool isMutationEvent() const;
 
     private:
         RefPtr<Node> m_relatedNode;
-        RefPtr<StringImpl> m_prevValue;
-        RefPtr<StringImpl> m_newValue;
-        RefPtr<StringImpl> m_attrName;
+        String m_prevValue;
+        String m_newValue;
+        String m_attrName;
         unsigned short m_attrChange;
     };
 

diff --git a/WebCore/dom/Notation.cpp b/WebCore/dom/Notation.cpp
index 27df85b9fdb5df29792d9c77ac0a5ad15787232d..7521db71c14721de1958dd9591963fb4702f1f7a 100644 (file)
--- a/WebCore/dom/Notation.cpp
+++ b/WebCore/dom/Notation.cpp
@@ -30,15 +30,15 @@ Notation::Notation(Document* doc) : ContainerNode(doc)
 
 Notation::Notation(Document* doc, const String& name, const String& publicId, const String& systemId)
     : ContainerNode(doc)
-    , m_name(name.impl())
-    , m_publicId(publicId.impl())
-    , m_systemId(systemId.impl())
+    , m_name(name)
+    , m_publicId(publicId)
+    , m_systemId(systemId)
 {
 }
 
 String Notation::nodeName() const
 {
-    return m_name.get();
+    return m_name;
 }
 
 Node::NodeType Notation::nodeType() const

diff --git a/WebCore/dom/Notation.h b/WebCore/dom/Notation.h
index 57203ebba999c0627b0c2a139657dc09c003486e..590ca6f64e01ac83b4ab125e2b2c589b20e5041a 100644 (file)
--- a/WebCore/dom/Notation.h
+++ b/WebCore/dom/Notation.h
@@ -36,8 +36,8 @@ public:
     Notation(Document*, const String& name, const String& publicId, const String& systemId);
 
     // DOM methods & attributes for Notation
-    String publicId() const { return m_publicId.get(); }
-    String systemId() const { return m_systemId. get(); }
+    String publicId() const { return m_publicId; }
+    String systemId() const { return m_systemId; }
 
     virtual String nodeName() const;
     virtual NodeType nodeType() const;
@@ -45,9 +45,9 @@ public:
     virtual bool childTypeAllowed(NodeType);
 
 private:
-    RefPtr<StringImpl> m_name;
-    RefPtr<StringImpl> m_publicId;
-    RefPtr<StringImpl> m_systemId;
+    String m_name;
+    String m_publicId;
+    String m_systemId;
 };
 
 } //namespace

diff --git a/WebCore/dom/ProcessingInstruction.cpp b/WebCore/dom/ProcessingInstruction.cpp
index dea24482b450ccd740b141aa873049c4c5e689da..6f575bae437a5e5bbdb7ab14c7cf1d8c26821fa6 100644 (file)
--- a/WebCore/dom/ProcessingInstruction.cpp
+++ b/WebCore/dom/ProcessingInstruction.cpp
@@ -46,8 +46,8 @@ ProcessingInstruction::ProcessingInstruction(Document* doc)
 
 ProcessingInstruction::ProcessingInstruction(Document* doc, const String& target, const String& data)
     : ContainerNode(doc)
-    , m_target(target.impl())
-    , m_data(data.impl())
+    , m_target(target)
+    , m_data(data)
     , m_cachedSheet(0)
     , m_loading(false)
 #if XSLT_SUPPORT
@@ -69,12 +69,12 @@ void ProcessingInstruction::setData(const String& data, ExceptionCode& ec)
         ec = NO_MODIFICATION_ALLOWED_ERR;
         return;
     }
-    m_data = data.impl();
+    m_data = data;
 }
 
 String ProcessingInstruction::nodeName() const
 {
-    return m_target.get();
+    return m_target;
 }
 
 Node::NodeType ProcessingInstruction::nodeType() const
@@ -84,7 +84,7 @@ Node::NodeType ProcessingInstruction::nodeType() const
 
 String ProcessingInstruction::nodeValue() const
 {
-    return m_data.get();
+    return m_data;
 }
 
 void ProcessingInstruction::setNodeValue(const String& nodeValue, ExceptionCode& ec)
@@ -96,7 +96,7 @@ void ProcessingInstruction::setNodeValue(const String& nodeValue, ExceptionCode&
 PassRefPtr<Node> ProcessingInstruction::cloneNode(bool /*deep*/)
 {
     // ### copy m_localHref
-    return new ProcessingInstruction(document(), m_target.get(), m_data.get());
+    return new ProcessingInstruction(document(), m_target, m_data);
 }
 
 // DOM Section 1.1.1
@@ -107,12 +107,12 @@ bool ProcessingInstruction::childTypeAllowed(NodeType)
 
 bool ProcessingInstruction::checkStyleSheet()
 {
-    if (String(m_target.get()) == "xml-stylesheet") {
+    if (m_target == "xml-stylesheet") {
         // see http://www.w3.org/TR/xml-stylesheet/
         // ### support stylesheet included in a fragment of this (or another) document
         // ### make sure this gets called when adding from javascript
         bool attrsOk;
-        const HashMap<String, String> attrs = parseAttributes(m_data.get(), attrsOk);
+        const HashMap<String, String> attrs = parseAttributes(m_data, attrsOk);
         if (!attrsOk)
             return true;
         HashMap<String, String>::const_iterator i = attrs.find("type");
@@ -139,7 +139,7 @@ bool ProcessingInstruction::checkStyleSheet()
                 // We need to make a synthetic XSLStyleSheet that is embedded.  It needs to be able
                 // to kick off import/include loads that can hang off some parent sheet.
                 if (m_isXSL) {
-                    m_sheet = new XSLStyleSheet(this, m_localHref.get(), true);
+                    m_sheet = new XSLStyleSheet(this, m_localHref, true);
                     m_loading = false;
                 }                    
                 return !m_isXSL;
@@ -227,9 +227,9 @@ void ProcessingInstruction::parseStyleSheet(const String &sheet)
 String ProcessingInstruction::toString() const
 {
     String result = "<?";
-    result += m_target.get();
+    result += m_target;
     result += " ";
-    result += m_data.get();
+    result += m_data;
     result += "?>";
     return result;
 }

diff --git a/WebCore/dom/ProcessingInstruction.h b/WebCore/dom/ProcessingInstruction.h
index 4e57ee7ee403cb94b91819e43eac430b454b6766..df94faed19092ae818add2d24bb63d2b469bd511 100644 (file)
--- a/WebCore/dom/ProcessingInstruction.h
+++ b/WebCore/dom/ProcessingInstruction.h
@@ -40,8 +40,8 @@ public:
     virtual ~ProcessingInstruction();
 
     // DOM methods & attributes for Notation
-    String target() const { return m_target.get(); }
-    String data() const { return m_data.get(); }
+    String target() const { return m_target; }
+    String data() const { return m_data; }
     void setData(const String&, ExceptionCode&);
 
     virtual String nodeName() const;
@@ -53,7 +53,7 @@ public:
     virtual bool offsetInCharacters() const;
 
     // Other methods (not part of DOM)
-    String localHref() const { return m_localHref.get(); }
+    String localHref() const { return m_localHref; }
     StyleSheet* sheet() const { return m_sheet.get(); }
     bool checkStyleSheet();
     virtual void setCSSStyleSheet(const String& URL, const String& charset, const String& sheet);
@@ -72,9 +72,9 @@ public:
 private:
     void parseStyleSheet(const String& sheet);
 
-    RefPtr<StringImpl> m_target;
-    RefPtr<StringImpl> m_data;
-    RefPtr<StringImpl> m_localHref;
+    String m_target;
+    String m_data;
+    String m_localHref;
     CachedResource* m_cachedSheet;
     RefPtr<StyleSheet> m_sheet;
     bool m_loading;