JavaScriptCore:

        Reviewed by Adam

        <rdar://problem/5086210> - Move RetainPtr to WTF

        * wtf/RetainPtr.h: Added
        * JavaScriptCore.xcodeproj/project.pbxproj: Add it to the project file
        * JavaScriptCore.vcproj/WTF/WTF.vcproj: Ditto

WebCore:

        Reviewed by Adam

        <rdar://problem/5086210> - Move RetainPtr to WTF

        * ForwardingHeaders/wtf/RetainPtr.h: Added.
        * WebCore.xcodeproj/project.pbxproj: Removed WebCore/RetainPtr.h

        * history/HistoryItem.h: Changed #include to <wtf/RetainPtr.h>
        * history/PageCache.h: Ditto
        * page/mac/WebCoreFrameBridge.mm: Ditto
        * platform/ContextMenu.h: Ditto
        * platform/ContextMenuItem.h: Ditto
        * platform/DragImage.h: Ditto
        * platform/FileChooser.h: Ditto
        * platform/PlatformKeyboardEvent.h: Ditto
        * platform/PopupMenu.h: Ditto
        * platform/SharedBuffer.h: Ditto
        * platform/cf/RetainPtr.h: Removed.
        * platform/graphics/Icon.h: Changed #include
        * platform/mac/ClipboardMac.h: Ditto
        * platform/mac/PasteboardMac.mm: Ditto
        * platform/mac/WidgetMac.mm: Ditto
        * platform/network/AuthenticationChallenge.h: Ditto
        * platform/network/ResourceError.h: Ditto
        * platform/network/ResourceHandle.h: Ditto
        * platform/network/ResourceRequest.h: Ditto
        * platform/network/ResourceResponse.h: Ditto
        * rendering/RenderThemeMac.mm: Ditto

WebKit:

        Reviewed by Adam

        <rdar://problem/5086210> - Move RetainPtr to WTF

        * ForwardingHeaders/wtf/RetainPtr.h: Added.
        * History/WebBackForwardList.mm: Changed #import to <wtf/RetainPtr.h>
        * WebCoreSupport/WebEditorClient.h: Ditto
        * WebCoreSupport/WebFrameLoaderClient.h: Ditto
        * WebView/WebDocumentLoaderMac.h: Ditto

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 61f0a2a08e196bd2db8647f46ee2857ac959e278..a90e0348a85a062e01c8820bb9355b12383ef14a 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-03-24  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Adam
+        
+        <rdar://problem/5086210> - Move RetainPtr to WTF
+
+        * wtf/RetainPtr.h: Added
+        * JavaScriptCore.xcodeproj/project.pbxproj: Add it to the project file
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj: Ditto
+
+
 2007-03-23  Christopher Brichford  <chrisb@adobe.com>
 
         Reviewed/landed by Adam.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index dea32ce527199a7f6f49ad01b25ddf071dd519c8..8d1cc2b112259697b1d3fe0b40f38ded79ac4bf1 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -259,6 +259,10 @@
                        RelativePath="..\..\wtf\RefPtr.h"
                        >
                </File>
+               <File
+                       RelativePath="..\..\wtf\RetainPtr.h"
+                       >
+               </File>
                <File
                        RelativePath="..\..\wtf\StringExtras.h"
                        >

diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index a910d1ef1b6afbcc008f1a651d1a945c02256e3f..61ebf17391aa62ff6e5c24e38dc412ffc79b98ed 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -80,6 +80,7 @@
                14F137590A3A727E00F26F90 /* Context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14F137580A3A727E00F26F90 /* Context.cpp */; };
                14F137830A3A765B00F26F90 /* context.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F137820A3A765B00F26F90 /* context.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34880A6C421700ABE06E /* WebScriptObject.h */; };
+               51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F648D60BB4E2CA0033D760 /* RetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65400C110A69BAF200509887 /* PropertyNameArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */; };
                65400C120A69BAF200509887 /* PropertyNameArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 65400C100A69BAF200509887 /* PropertyNameArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
                6541BD7208E80A17002CBEE7 /* TCPageMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541BD6E08E80A17002CBEE7 /* TCPageMap.h */; };
@@ -516,6 +517,7 @@
                51F0EC1005C86F3500E6DF1B /* objc_header.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_header.h; path = bindings/objc/objc_header.h; sourceTree = "<group>"; tabWidth = 8; };
                51F0EC9605C88DC700E6DF1B /* objc_utility.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_utility.h; path = bindings/objc/objc_utility.h; sourceTree = "<group>"; tabWidth = 8; };
                51F0EC9705C88DC700E6DF1B /* objc_utility.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_utility.mm; path = bindings/objc/objc_utility.mm; sourceTree = "<group>"; tabWidth = 8; };
+               51F648D60BB4E2CA0033D760 /* RetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RetainPtr.h; sourceTree = "<group>"; };
                651F6412039D5B5F0078395C /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; tabWidth = 8; };
                651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; tabWidth = 8; };
                65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PropertyNameArray.cpp; sourceTree = "<group>"; };
@@ -923,6 +925,7 @@
                65162EF108E6A21C007556CD /* wtf */ = {
                        isa = PBXGroup;
                        children = (
+                               51F648D60BB4E2CA0033D760 /* RetainPtr.h */,
                                E195678D09E7CF1200B89D13 /* unicode */,
                                93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
                                65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
@@ -1271,6 +1274,7 @@
                                146AAB2B0B66A84900E55F16 /* JSStringRefCF.h in Headers */,
                                657EB7460B708F540063461B /* ListHashSet.h in Headers */,
                                65EA73650BAE35D1001BB560 /* CommonIdentifiers.h in Headers */,
+                               51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/WebCore/platform/cf/RetainPtr.h b/JavaScriptCore/wtf/RetainPtr.h
similarity index 100%
rename from WebCore/platform/cf/RetainPtr.h
rename to JavaScriptCore/wtf/RetainPtr.h

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 42644228188859c28c21a5247797331ac922ab62..0e01a63c9ca294a82f6f27ffbc538eb6d880553a 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2007-03-24  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Adam
+
+        <rdar://problem/5086210> - Move RetainPtr to WTF
+
+        * ForwardingHeaders/wtf/RetainPtr.h: Added.
+        * WebCore.xcodeproj/project.pbxproj: Removed WebCore/RetainPtr.h
+        
+        * history/HistoryItem.h: Changed #include to <wtf/RetainPtr.h>
+        * history/PageCache.h: Ditto
+        * page/mac/WebCoreFrameBridge.mm: Ditto
+        * platform/ContextMenu.h: Ditto
+        * platform/ContextMenuItem.h: Ditto
+        * platform/DragImage.h: Ditto
+        * platform/FileChooser.h: Ditto
+        * platform/PlatformKeyboardEvent.h: Ditto
+        * platform/PopupMenu.h: Ditto
+        * platform/SharedBuffer.h: Ditto
+        * platform/cf/RetainPtr.h: Removed.
+        * platform/graphics/Icon.h: Changed #include
+        * platform/mac/ClipboardMac.h: Ditto
+        * platform/mac/PasteboardMac.mm: Ditto
+        * platform/mac/WidgetMac.mm: Ditto
+        * platform/network/AuthenticationChallenge.h: Ditto
+        * platform/network/ResourceError.h: Ditto
+        * platform/network/ResourceHandle.h: Ditto
+        * platform/network/ResourceRequest.h: Ditto
+        * platform/network/ResourceResponse.h: Ditto
+        * rendering/RenderThemeMac.mm: Ditto
+
 2007-03-24  Mitz Pettel  <mitz@webkit.org>
 
         Fix for <rdar://problem/5086797>, layoutPending is now reporting incorrect results, which will lead

diff --git a/WebCore/ForwardingHeaders/wtf/RetainPtr.h b/WebCore/ForwardingHeaders/wtf/RetainPtr.h
new file mode 100644 (file)
index 0000000..65fc27b
--- /dev/null
+++ b/WebCore/ForwardingHeaders/wtf/RetainPtr.h
@@ -0,0 +1 @@
+#include <JavaScriptCore/RetainPtr.h>

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 26c1992af6b0bb85b532a779fc8ae0abfba703b9..bbecfe44170fd436ac43828d35fce05bea1b69bc 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -419,7 +419,6 @@
                65A21468097A329100B9050A /* Page.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A21467097A329100B9050A /* Page.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65A21484097A3F5300B9050A /* FrameTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65A21482097A3F5300B9050A /* FrameTree.cpp */; };
                65A21485097A3F5300B9050A /* FrameTree.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A21483097A3F5300B9050A /* FrameTree.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               65BAAABE0ADCA015005BB5A4 /* RetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BAAABD0ADCA015005BB5A4 /* RetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65BF022E0974816300C43196 /* Frame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65BF02290974816300C43196 /* Frame.cpp */; };
                65BF022F0974816300C43196 /* Frame.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF022A0974816300C43196 /* Frame.h */; settings = {ATTRIBUTES = (Private, ); }; };
                65BF02300974816300C43196 /* FramePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65BF022B0974816300C43196 /* FramePrivate.h */; };
@@ -3562,7 +3561,6 @@
                65A21482097A3F5300B9050A /* FrameTree.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FrameTree.cpp; sourceTree = "<group>"; };
                65A21483097A3F5300B9050A /* FrameTree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FrameTree.h; sourceTree = "<group>"; };
                65A640F00533BB1F0085E777 /* BlockExceptions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = BlockExceptions.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               65BAAABD0ADCA015005BB5A4 /* RetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RetainPtr.h; sourceTree = "<group>"; };
                65BF02290974816300C43196 /* Frame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Frame.cpp; sourceTree = "<group>"; };
                65BF022A0974816300C43196 /* Frame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Frame.h; sourceTree = "<group>"; };
                65BF022B0974816300C43196 /* FramePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FramePrivate.h; sourceTree = "<group>"; };
@@ -6722,7 +6720,6 @@
                1AE42F670AA4B8CB00C8612D /* cf */ = {
                        isa = PBXGroup;
                        children = (
-                               65BAAABD0ADCA015005BB5A4 /* RetainPtr.h */,
                                1A98956A0AA78F80005EF5EF /* KURLCFNet.cpp */,
                                1AE42F680AA4B8CB00C8612D /* StringCF.cpp */,
                                1AE42F690AA4B8CB00C8612D /* StringImplCF.cpp */,
@@ -11060,7 +11057,6 @@
                                656D37450ADBA5DE00A4554D /* WebPlugInStreamLoaderDelegate.h in Headers */,
                                656D37480ADBA5DE00A4554D /* SubresourceLoader.h in Headers */,
                                93B77A380ADD792500EA4B81 /* FrameLoaderTypes.h in Headers */,
-                               65BAAABE0ADCA015005BB5A4 /* RetainPtr.h in Headers */,
                                0668E18B0ADD9624004128E0 /* PopupMenu.h in Headers */,
                                4B3043B60AE0363200A82647 /* EditorClient.h in Headers */,
                                4B3043C70AE0370300A82647 /* Sound.h in Headers */,

diff --git a/WebCore/history/HistoryItem.h b/WebCore/history/HistoryItem.h
index 12484fab5a5d4feeadb02c977a4694b6f3c997b6..cbb2403df929867cd583c28bf3d447da44f130b8 100644 (file)
--- a/WebCore/history/HistoryItem.h
+++ b/WebCore/history/HistoryItem.h
@@ -38,7 +38,7 @@
 #include <wtf/Vector.h>
 
 #if PLATFORM(MAC)
-#import "RetainPtr.h"
+#import <wtf/RetainPtr.h>
 typedef struct objc_object* id;
 #endif
 

diff --git a/WebCore/history/PageCache.h b/WebCore/history/PageCache.h
index 16d0f260bb097d518302f38d8e45c0a0b9db2c9a..b8def338edbf3a05637f89b3631c57bef7cabf76 100644 (file)
--- a/WebCore/history/PageCache.h
+++ b/WebCore/history/PageCache.h
@@ -33,7 +33,7 @@
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 typedef struct objc_object* id;
 #endif
 

diff --git a/WebCore/page/mac/WebCoreFrameBridge.mm b/WebCore/page/mac/WebCoreFrameBridge.mm
index 207cbb49755e87b2b1039c90b3196e599266df5e..0166987e90394bc009674e3e4e356badaefc2219 100644 (file)
--- a/WebCore/page/mac/WebCoreFrameBridge.mm
+++ b/WebCore/page/mac/WebCoreFrameBridge.mm
@@ -68,7 +68,6 @@
 #import "RenderWidget.h"
 #import "ReplaceSelectionCommand.h"
 #import "ResourceRequest.h"
-#import "RetainPtr.h"
 #import "Screen.h"
 #import "SelectionController.h"
 #import "SystemTime.h"
@@ -90,6 +89,7 @@
 #import <JavaScriptCore/array_instance.h>
 #import <JavaScriptCore/date_object.h>
 #import <JavaScriptCore/runtime_root.h>
+#import <wtf/RetainPtr.h>
 
 @class NSView;
 

diff --git a/WebCore/platform/ContextMenu.h b/WebCore/platform/ContextMenu.h
index 8c5aa67c9ec4906c38c40b687723097d174ba5c7..60f531f76c9fb68f4c7deab93c6f6f1fc358a3d9 100644 (file)
--- a/WebCore/platform/ContextMenu.h
+++ b/WebCore/platform/ContextMenu.h
@@ -33,7 +33,7 @@
 #include "PlatformMenuDescription.h"
 #include "PlatformString.h"
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #elif PLATFORM(QT)
 #include <QMenu>
 typedef QMenu* PlatformMenuDescription;

diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h
index 3cfb71355730f626eb01c7bd06d703a1acea6298..fc6f20dc683ea69bd2a7aebb47f43c9c66f0196d 100644 (file)
--- a/WebCore/platform/ContextMenuItem.h
+++ b/WebCore/platform/ContextMenuItem.h
@@ -31,7 +31,7 @@
 #include <wtf/OwnPtr.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__
 @class NSMenuItem;

diff --git a/WebCore/platform/DragImage.h b/WebCore/platform/DragImage.h
index 6c3f268264aa2fde6d04a144fea50ee50e355697..1fa9c2758bd773f83fc6d4979e2c9fc677b824fd 100644 (file)
--- a/WebCore/platform/DragImage.h
+++ b/WebCore/platform/DragImage.h
@@ -29,7 +29,7 @@
 #include "IntSize.h"
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSImage;
 #else

diff --git a/WebCore/platform/FileChooser.h b/WebCore/platform/FileChooser.h
index 7d3884a3219ddd5144ae61c89b5b2ec86b8d3f46..3a759b5fbfaa025b74042c5789e6f05e72a3aa33 100644 (file)
--- a/WebCore/platform/FileChooser.h
+++ b/WebCore/platform/FileChooser.h
@@ -34,7 +34,7 @@
 #include <wtf/RefPtr.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class OpenPanelController;
 #else

diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h
index 2fa7addec79506b0528ee495bc1f299b7765f910..8d8814112bc88fb5e67d3e82e3cb250c1c70720a 100644 (file)
--- a/WebCore/platform/PlatformKeyboardEvent.h
+++ b/WebCore/platform/PlatformKeyboardEvent.h
@@ -30,7 +30,7 @@
 #include <wtf/Platform.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSEvent;
 #else

diff --git a/WebCore/platform/PopupMenu.h b/WebCore/platform/PopupMenu.h
index 7a7e13fb040ddf40e44f8a772d31a045872666ff..06187cfc90046d414266d9d3205d67e38f740109 100644 (file)
--- a/WebCore/platform/PopupMenu.h
+++ b/WebCore/platform/PopupMenu.h
@@ -28,7 +28,7 @@
 #include <wtf/PassRefPtr.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSPopUpButtonCell;
 #else

diff --git a/WebCore/platform/SharedBuffer.h b/WebCore/platform/SharedBuffer.h
index 5967d5ad9601df53cbf897cf52cd6f96b56cc95f..625370428e62b602f15bc6e128fb35af37b0ade5 100644 (file)
--- a/WebCore/platform/SharedBuffer.h
+++ b/WebCore/platform/SharedBuffer.h
@@ -30,7 +30,7 @@
 #include <wtf/Vector.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__
 @class NSData;

diff --git a/WebCore/platform/graphics/Icon.h b/WebCore/platform/graphics/Icon.h
index b1a12bebf55bfdca584be7c3a34529aa7bef0344..78038c3e02ccf0a4bc0b9a75e7fdae1f66982c46 100644 (file)
--- a/WebCore/platform/graphics/Icon.h
+++ b/WebCore/platform/graphics/Icon.h
@@ -25,7 +25,7 @@
 #include <wtf/Forward.h>
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSImage;
 #else

diff --git a/WebCore/platform/mac/ClipboardMac.h b/WebCore/platform/mac/ClipboardMac.h
index 8d05a7bc5db773701d68c0425c845ed2df0ca8e8..480d8284168d035c150657a3892b84fdae603b87 100644 (file)
--- a/WebCore/platform/mac/ClipboardMac.h
+++ b/WebCore/platform/mac/ClipboardMac.h
@@ -32,7 +32,7 @@
 #include "Clipboard.h"
 #include "ClipboardAccessPolicy.h"
 #include "CachedResourceClient.h"
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 
 #ifdef __OBJC__
 @class NSImage;

diff --git a/WebCore/platform/mac/PasteboardMac.mm b/WebCore/platform/mac/PasteboardMac.mm
index dd89c284b0d44688c0f2975bc3713f7aa30aae0e..48b4ae7decc9ac8ee8efd047ac0cfaaa84036585 100644 (file)
--- a/WebCore/platform/mac/PasteboardMac.mm
+++ b/WebCore/platform/mac/PasteboardMac.mm
@@ -39,11 +39,12 @@
 #import "LoaderNSURLExtras.h"
 #import "MimeTypeRegistry.h"
 #import "RenderImage.h"
-#import "RetainPtr.h"
 #import "WebCoreNSStringExtras.h"
 #import "WebCoreSystemInterface.h"
 #import "markup.h"
 
+#import <wtf/RetainPtr.h>
+
 @interface NSAttributedString (AppKitSecretsIKnowAbout)
 - (id)_initWithDOMRange:(DOMRange *)domRange;
 @end

diff --git a/WebCore/platform/mac/WidgetMac.mm b/WebCore/platform/mac/WidgetMac.mm
index 26410208a441f4899ee0ed25ea8ef57edbc8ffc2..f36b70f9d900f8ea304aadefddf2bd22d2164686 100644 (file)
--- a/WebCore/platform/mac/WidgetMac.mm
+++ b/WebCore/platform/mac/WidgetMac.mm
@@ -32,12 +32,13 @@
 #import "Font.h"
 #import "Frame.h"
 #import "GraphicsContext.h"
-#import "RetainPtr.h"
 #import "WebCoreFrameBridge.h"
 #import "WebCoreFrameView.h"
 #import "WebCoreView.h"
 #import "WidgetClient.h"
 
+#import <wtf/RetainPtr.h>
+
 namespace WebCore {
 
 class WidgetPrivate {

diff --git a/WebCore/platform/network/AuthenticationChallenge.h b/WebCore/platform/network/AuthenticationChallenge.h
index 1c1ae0b90944e6d600ac7a5c13399f553536fce9..3e46ea4227fc97280e398ae746c1c51e6b931e49 100644 (file)
--- a/WebCore/platform/network/AuthenticationChallenge.h
+++ b/WebCore/platform/network/AuthenticationChallenge.h
@@ -34,7 +34,7 @@
 
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifndef __OBJC__
 typedef struct objc_object *id;
 class NSURLAuthenticationChallenge;

diff --git a/WebCore/platform/network/ResourceError.h b/WebCore/platform/network/ResourceError.h
index 92b303104c67c990e22153c65c1dacbc483ec546..c9af95eda508c9c5725510b84d1e472dd0e9279e 100644 (file)
--- a/WebCore/platform/network/ResourceError.h
+++ b/WebCore/platform/network/ResourceError.h
@@ -30,7 +30,7 @@
 #include "PlatformString.h"
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #endif
 
 #ifdef __OBJC__

diff --git a/WebCore/platform/network/ResourceHandle.h b/WebCore/platform/network/ResourceHandle.h
index 0500566795e70361794a7ec0544e55b7956d9282..d78945b66cba4503250cb9d1f8bd06ba74f95573 100644 (file)
--- a/WebCore/platform/network/ResourceHandle.h
+++ b/WebCore/platform/network/ResourceHandle.h
@@ -45,7 +45,7 @@ typedef LONG_PTR LRESULT;
 
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSData;
 @class NSError;

diff --git a/WebCore/platform/network/ResourceRequest.h b/WebCore/platform/network/ResourceRequest.h
index cf7d40ea1e53e37112712380dac526b12bd7e898..9277b9d43cafcbf8a2a04dc8efd4055ad678a0de 100644 (file)
--- a/WebCore/platform/network/ResourceRequest.h
+++ b/WebCore/platform/network/ResourceRequest.h
@@ -33,14 +33,14 @@
 #include "HTTPHeaderMap.h"
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSURLRequest;
 #else
 class NSURLRequest;
 #endif
 #elif USE(CFNETWORK)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 typedef const struct _CFURLRequest* CFURLRequestRef;
 #endif
 

diff --git a/WebCore/platform/network/ResourceResponse.h b/WebCore/platform/network/ResourceResponse.h
index 9f8feb625be993249facb090c9dc413bc11ad848..fbdd9507c90cfb7e2b62b5f4184e128c25bc9d92 100644 (file)
--- a/WebCore/platform/network/ResourceResponse.h
+++ b/WebCore/platform/network/ResourceResponse.h
@@ -31,14 +31,14 @@
 #include "KURL.h"
 
 #if PLATFORM(MAC)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 #ifdef __OBJC__
 @class NSURLResponse;
 #else
 class NSURLResponse;
 #endif
 #elif USE(CFNETWORK)
-#include "RetainPtr.h"
+#include <wtf/RetainPtr.h>
 typedef struct _CFURLResponse* CFURLResponseRef;
 #endif
 

diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index e183cb99759d5585455a0cf02f6fcf048ec29698..23adc508fccb981b660d6d05b7c914da3f26b60b 100644 (file)
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -33,10 +33,10 @@
 #import "LocalCurrentGraphicsContext.h"
 #import "RenderSlider.h"
 #import "RenderView.h"
-#import "RetainPtr.h"
 #import "WebCoreSystemInterface.h"
 #import "cssstyleselector.h"
 #import <Cocoa/Cocoa.h>
+#import <wtf/RetainPtr.h>
 
 
 // The methods in this file are specific to the Mac OS X platform.

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e23f7acf68180014dc8b3101b4eb280f14ab3bc4..4449ec7d4726c6182a819f6641d63770f92fec0f 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-24  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Adam
+
+        <rdar://problem/5086210> - Move RetainPtr to WTF
+        
+        * ForwardingHeaders/wtf/RetainPtr.h: Added.
+        * History/WebBackForwardList.mm: Changed #import to <wtf/RetainPtr.h>
+        * WebCoreSupport/WebEditorClient.h: Ditto
+        * WebCoreSupport/WebFrameLoaderClient.h: Ditto
+        * WebView/WebDocumentLoaderMac.h: Ditto
+
 2007-03-24  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Adele

diff --git a/WebKit/ForwardingHeaders/wtf/RetainPtr.h b/WebKit/ForwardingHeaders/wtf/RetainPtr.h
new file mode 100644 (file)
index 0000000..8471d5d
--- /dev/null
+++ b/WebKit/ForwardingHeaders/wtf/RetainPtr.h
@@ -0,0 +1 @@
+#import <JavaScriptCore/RetainPtr.h>

diff --git a/WebKit/History/WebBackForwardList.mm b/WebKit/History/WebBackForwardList.mm
index f214b11600a38f5d021e6dba318a68a8a6e3f2b5..acf06bee4db3f51ca9937e2f60ee9fbee9b96223 100644 (file)
--- a/WebKit/History/WebBackForwardList.mm
+++ b/WebKit/History/WebBackForwardList.mm
@@ -39,10 +39,11 @@
 #import "WebTypesInternal.h"
 #import <WebCore/BackForwardList.h>
 #import <WebCore/HistoryItem.h>
-#import <WebCore/RetainPtr.h>
 #import <WebCore/ThreadCheck.h>
 #import <WebCore/WebCoreObjCExtras.h>
 
+#import <wtf/RetainPtr.h>
+
 #define COMPUTE_DEFAULT_PAGE_CACHE_SIZE UINT_MAX
 
 using WebCore::BackForwardList;

diff --git a/WebKit/WebCoreSupport/WebEditorClient.h b/WebKit/WebCoreSupport/WebEditorClient.h
index 11811d70395b68a00b48987778dda0d025a614aa..4a03ade7fd17c8ec6db3a726a575373cecc54dae 100644 (file)
--- a/WebKit/WebCoreSupport/WebEditorClient.h
+++ b/WebKit/WebCoreSupport/WebEditorClient.h
@@ -28,7 +28,7 @@
  */
 
 #import <WebCore/EditorClient.h>
-#import <WebCore/RetainPtr.h>
+#import <wtf/RetainPtr.h>
 #import <wtf/Forward.h>
 
 @class WebView;

diff --git a/WebKit/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
index a0955ac2f19be0af5f5e2842ee921acfa8a61acd..dbaf00d5e154b5832656a10002c042ac6d3761bc 100644 (file)
--- a/WebKit/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/WebCoreSupport/WebFrameLoaderClient.h
@@ -27,10 +27,10 @@
  */
 
 #import <WebCore/FrameLoaderClient.h>
-#import <WebCore/RetainPtr.h>
 #import <WebCore/Timer.h>
 #import <wtf/Forward.h>
 #import <wtf/HashMap.h>
+#import <wtf/RetainPtr.h>
 
 @class WebFrame;
 @class WebFramePolicyListener;

diff --git a/WebKit/WebView/WebDocumentLoaderMac.h b/WebKit/WebView/WebDocumentLoaderMac.h
index 20edafa0212186d6f101243942ceed64af4f58dd..18ac4d98bbb62cdb4db98c94559c439747247ada 100644 (file)
--- a/WebKit/WebView/WebDocumentLoaderMac.h
+++ b/WebKit/WebView/WebDocumentLoaderMac.h
@@ -27,7 +27,7 @@
  */
 
 #import <WebCore/DocumentLoader.h>
-#import <WebCore/RetainPtr.h>
+#import <wtf/RetainPtr.h>
 #import <wtf/HashSet.h>
 
 @class WebDataSource;