JavaScriptCore:

        Reviewed by Adam

        Whoops, RetainPtr should be in the WTF namespace

        * wtf/RetainPtr.h:

WebKit:

        Reviewed by Adam

        RetainPtr is no longer in the WebCore namespace

        * History/WebBackForwardList.mm:
        * WebCoreSupport/WebEditorClient.h:
        * WebCoreSupport/WebFrameLoaderClient.h:
        * WebView/WebDocumentLoaderMac.h:

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a90e0348a85a062e01c8820bb9355b12383ef14a..ac5052ca7066fd00a1167770f6da14177382bcf2 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-24  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Adam
+
+        Whoops, RetainPtr should be in the WTF namespace
+
+        * wtf/RetainPtr.h:
+
 2007-03-24  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Adam

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 61ebf17391aa62ff6e5c24e38dc412ffc79b98ed..635f8832fafa17867fa85bb31d239fff0383a136 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -925,7 +925,6 @@
                65162EF108E6A21C007556CD /* wtf */ = {
                        isa = PBXGroup;
                        children = (
-                               51F648D60BB4E2CA0033D760 /* RetainPtr.h */,
                                E195678D09E7CF1200B89D13 /* unicode */,
                                93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
                                65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
@@ -952,6 +951,7 @@
                                6580F795094070560082C219 /* PassRefPtr.h */,
                                65D6D87E09B5A32E0002E4D7 /* Platform.h */,
                                65C647B3093EF8D60022C380 /* RefPtr.h */,
+                               51F648D60BB4E2CA0033D760 /* RetainPtr.h */,
                                E11D51750B2E798D0056C188 /* StringExtras.h */,
                                6541BD6E08E80A17002CBEE7 /* TCPageMap.h */,
                                6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,

diff --git a/JavaScriptCore/wtf/RetainPtr.h b/JavaScriptCore/wtf/RetainPtr.h
index 33a10726c737990c28cccb4317db41b5fd31e23f..1527b4292458c9c04f80dfe356756794f6a17194 100644 (file)
--- a/JavaScriptCore/wtf/RetainPtr.h
+++ b/JavaScriptCore/wtf/RetainPtr.h
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <CoreFoundation/CoreFoundation.h>
 
-namespace WebCore {
+namespace WTF {
 
     template <typename T> struct RemovePointer {
         typedef T type;
@@ -202,6 +202,10 @@ namespace WebCore {
         return a != b.get(); 
     }
 
-}
+} // namespace WTF
 
-#endif // RetainPtr_h
+using WTF::AdoptCF;
+using WTF::AdoptNS;
+using WTF::RetainPtr;
+
+#endif // WTF_RetainPtr_h

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4449ec7d4726c6182a819f6641d63770f92fec0f..9deb181f997d82cc733656b90448c649f667619a 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-24  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Adam
+
+        RetainPtr is no longer in the WebCore namespace
+
+        * History/WebBackForwardList.mm:
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebView/WebDocumentLoaderMac.h:
+
 2007-03-24  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Adam

diff --git a/WebKit/History/WebBackForwardList.mm b/WebKit/History/WebBackForwardList.mm
index acf06bee4db3f51ca9937e2f60ee9fbee9b96223..7f2f36f39ed67aa6af5b67a9d9f764176e317ba4 100644 (file)
--- a/WebKit/History/WebBackForwardList.mm
+++ b/WebKit/History/WebBackForwardList.mm
@@ -49,7 +49,6 @@
 using WebCore::BackForwardList;
 using WebCore::HistoryItem;
 using WebCore::HistoryItemVector;
-using WebCore::RetainPtr;
 
 static inline WebBackForwardListPrivate* kitPrivate(BackForwardList* list) { return (WebBackForwardListPrivate*)list; }
 static inline BackForwardList* core(WebBackForwardListPrivate* list) { return (BackForwardList*)list; }

diff --git a/WebKit/WebCoreSupport/WebEditorClient.h b/WebKit/WebCoreSupport/WebEditorClient.h
index 4a03ade7fd17c8ec6db3a726a575373cecc54dae..38b5af247735a7f6df067eb693bf079cdc29de42 100644 (file)
--- a/WebKit/WebCoreSupport/WebEditorClient.h
+++ b/WebKit/WebCoreSupport/WebEditorClient.h
@@ -102,7 +102,7 @@ private:
     WebEditorClient();
     
     WebView *m_webView;
-    WebCore::RetainPtr<WebEditorUndoTarget> m_undoTarget;
+    RetainPtr<WebEditorUndoTarget> m_undoTarget;
     
     bool m_haveUndoRedoOperations;
 };

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
index dbaf00d5e154b5832656a10002c042ac6d3761bc..53bb16ac87a90bd248308970e2d5eb4a5cb0e047 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
@@ -46,7 +46,7 @@ namespace WebCore {
     class ResourceRequest;
 }
 
-typedef HashMap<RefPtr<WebCore::ResourceLoader>, WebCore::RetainPtr<WebResource> > ResourceMap;
+typedef HashMap<RefPtr<WebCore::ResourceLoader>, RetainPtr<WebResource> > ResourceMap;
 
 class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
 public:
@@ -199,7 +199,7 @@ private:
     bool canUseArchivedResource(NSURLResponse *) const;
     void deliverArchivedResources(WebCore::Timer<WebFrameLoaderClient>*);
 
-    WebCore::RetainPtr<WebFramePolicyListener> setUpPolicyListener(WebCore::FramePolicyFunction);
+    RetainPtr<WebFramePolicyListener> setUpPolicyListener(WebCore::FramePolicyFunction);
 
     NSDictionary *actionDictionary(const WebCore::NavigationAction&) const;
 
@@ -207,9 +207,9 @@ private:
     
     virtual bool canCachePage() const;
 
-    WebCore::RetainPtr<WebFrame> m_webFrame;
+    RetainPtr<WebFrame> m_webFrame;
 
-    WebCore::RetainPtr<WebFramePolicyListener> m_policyListener;
+    RetainPtr<WebFramePolicyListener> m_policyListener;
     WebCore::FramePolicyFunction m_policyFunction;
 
     mutable ResourceMap m_pendingArchivedResources;

diff --git a/WebKit/WebView/WebDocumentLoaderMac.h b/WebKit/WebView/WebDocumentLoaderMac.h
index 18ac4d98bbb62cdb4db98c94559c439747247ada..fbb33f2e1efce005225bb2035c4ba991be0da5f6 100644 (file)
--- a/WebKit/WebView/WebDocumentLoaderMac.h
+++ b/WebKit/WebView/WebDocumentLoaderMac.h
@@ -52,8 +52,8 @@ public:
     void decreaseLoadCount(unsigned long identifier);
 private:
     WebDataSource *m_dataSource;
-    WebCore::RetainPtr<id> m_resourceLoadDelegate;
-    WebCore::RetainPtr<id> m_downloadDelegate;
+    RetainPtr<id> m_resourceLoadDelegate;
+    RetainPtr<id> m_downloadDelegate;
     bool m_hasEverBeenDetached;
     HashSet<unsigned long> m_loadingResources;
 };