Reviewed by Adam.

        Copy the remaining files in bridge/ over to page/

        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * bridge: Removed.
        * bridge/AXObjectCache.h: Removed.
        * bridge/EditorClient.h: Removed.
        * bridge/GlobalHistory.h: Removed.
        * bridge/win: Removed.
        * bridge/win/FrameCGWin.cpp: Removed.
        * bridge/win/FrameCairoWin.cpp: Removed.
        * bridge/win/FrameWin.cpp: Removed.
        * bridge/win/FrameWin.h: Removed.
        * bridge/win/GlobalHistoryWin.cpp: Removed.
        * bridge/win/PageWin.cpp: Removed.
        * page/AXObjectCache.h: Copied from bridge/AXObjectCache.h.
        * page/EditorClient.h: Copied from bridge/EditorClient.h.
        * page/GlobalHistory.h: Copied from bridge/GlobalHistory.h.
        * page/win/FrameCGWin.cpp: Copied from bridge/win/FrameCGWin.cpp.
        * page/win/FrameCairoWin.cpp: Copied from bridge/win/FrameCairoWin.cpp.
        * page/win/FrameWin.cpp: Copied from bridge/win/FrameWin.cpp.
        * page/win/FrameWin.h: Copied from bridge/win/FrameWin.h.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cffc84daf61c90d89b9b93fa7a15936c8e6567c1..ef4fd31a7c65ba4a023b5d25cbce6439126d4988 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2008-02-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam.
+        
+        Copy the remaining files in bridge/ over to page/
+
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bridge: Removed.
+        * bridge/AXObjectCache.h: Removed.
+        * bridge/EditorClient.h: Removed.
+        * bridge/GlobalHistory.h: Removed.
+        * bridge/win: Removed.
+        * bridge/win/FrameCGWin.cpp: Removed.
+        * bridge/win/FrameCairoWin.cpp: Removed.
+        * bridge/win/FrameWin.cpp: Removed.
+        * bridge/win/FrameWin.h: Removed.
+        * bridge/win/GlobalHistoryWin.cpp: Removed.
+        * bridge/win/PageWin.cpp: Removed.
+        * page/AXObjectCache.h: Copied from bridge/AXObjectCache.h.
+        * page/EditorClient.h: Copied from bridge/EditorClient.h.
+        * page/GlobalHistory.h: Copied from bridge/GlobalHistory.h.
+        * page/win/FrameCGWin.cpp: Copied from bridge/win/FrameCGWin.cpp.
+        * page/win/FrameCairoWin.cpp: Copied from bridge/win/FrameCairoWin.cpp.
+        * page/win/FrameWin.cpp: Copied from bridge/win/FrameWin.cpp.
+        * page/win/FrameWin.h: Copied from bridge/win/FrameWin.h.
+
 2008-02-29  Robert Blaut  <webkit@blaut.biz>
 
         Reviewed by Darin Adler.

diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index e03a34d4b878191046dc5647a0b5aa401e19c65e..d0bde22fa90055259c2087624272e4408a5ad468 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -2606,6 +2606,42 @@
                <Filter\r
                        Name="page"\r
                        >\r
+                       <Filter\r
+                               Name="win"\r
+                               >\r
+                               <File\r
+                                       RelativePath="..\page\win\FrameCGWin.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\page\win\FrameWin.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\page\win\FrameWin.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\page\win\GlobalHistoryWin.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\page\win\PageWin.cpp"\r
+                                       >\r
+                               </File>\r
+                       </Filter>                       \r
+                       <File\r
+                               RelativePath="..\bridge\AXObjectCache.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\bridge\EditorClient.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\bridge\GlobalHistory.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\page\AnimationController.cpp"\r
                                >\r
@@ -6397,46 +6433,6 @@
                                >\r
                        </File>\r
                </Filter>\r
-               <Filter\r
-                       Name="bridge"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\bridge\AXObjectCache.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\bridge\EditorClient.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\bridge\GlobalHistory.h"\r
-                               >\r
-                       </File>\r
-                       <Filter\r
-                               Name="win"\r
-                               >\r
-                               <File\r
-                                       RelativePath="..\bridge\win\FrameCGWin.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\bridge\win\FrameWin.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\bridge\win\FrameWin.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\bridge\win\GlobalHistoryWin.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\bridge\win\PageWin.cpp"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
                <Filter\r
                        Name="editing"\r
                        >\r

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index c994ac04c3906771a4da3da52cc555f3ee139103..19be46f6b7ad5b597de9617fc7ac916932dc2309 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -247,6 +247,9 @@
                1AF326490D78B5530068F0C4 /* WebCoreAXObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF326430D78B5530068F0C4 /* WebCoreAXObject.mm */; };
                1AF3264A0D78B5530068F0C4 /* WebCoreScriptDebugger.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326440D78B5530068F0C4 /* WebCoreScriptDebugger.h */; };
                1AF3264B0D78B5530068F0C4 /* WebCoreScriptDebugger.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AF326450D78B5530068F0C4 /* WebCoreScriptDebugger.mm */; };
+               1AF326780D78B9440068F0C4 /* AXObjectCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326760D78B9440068F0C4 /* AXObjectCache.h */; };
+               1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF326770D78B9440068F0C4 /* EditorClient.h */; };
+               1AF3267B0D78B94E0068F0C4 /* GlobalHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF3267A0D78B94E0068F0C4 /* GlobalHistory.h */; };
                1AFE117D0CBFFB36003017FA /* SQLResultSetRowList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFE117B0CBFFB36003017FA /* SQLResultSetRowList.cpp */; };
                1AFE117E0CBFFB36003017FA /* SQLResultSetRowList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFE117C0CBFFB36003017FA /* SQLResultSetRowList.h */; };
                1AFE11990CBFFCC4003017FA /* JSSQLResultSetRowList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFE11970CBFFCC4003017FA /* JSSQLResultSetRowList.cpp */; };
@@ -339,7 +342,6 @@
                4A8C96EB0BE69032004EEFF0 /* SelectionControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */; };
                4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2708C50AF19EE40065127F /* Pasteboard.h */; };
                4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B2709810AF2E5E00065127F /* PasteboardMac.mm */; };
-               4B3043B60AE0363200A82647 /* EditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043B50AE0363200A82647 /* EditorClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4B3043C70AE0370300A82647 /* Sound.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3043C60AE0370300A82647 /* Sound.h */; };
                4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4B3043C80AE0371D00A82647 /* SoundMac.mm */; };
                4B3043CC0AE0373B00A82647 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B3043CA0AE0373B00A82647 /* Editor.cpp */; };
@@ -1651,7 +1653,6 @@
                93F199B308245E59001E9ABC /* WebCoreViewFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855402DE375901EA4122 /* WebCoreViewFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199B808245E59001E9ABC /* ScrollBar.h in Headers */ = {isa = PBXBuildFile; fileRef = BC7B2AF80450824100A8000F /* ScrollBar.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199BB08245E59001E9ABC /* WebCoreKeyboardUIMode.h in Headers */ = {isa = PBXBuildFile; fileRef = BE983D95052A2E0A00892D85 /* WebCoreKeyboardUIMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               93F199BD08245E59001E9ABC /* AXObjectCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 55998A5C052B59CC0017A6C1 /* AXObjectCache.h */; };
                93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A640F00533BB1F0085E777 /* BlockExceptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199C208245E59001E9ABC /* WebCoreKeyGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 84B2B1F7056BEF3A00D2B771 /* WebCoreKeyGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93F199DE08245E59001E9ABC /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = BE91FC8B06133666005E3790 /* Position.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3553,7 +3554,6 @@
                BC94D14F0C275C68006BC617 /* JSHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = BC94D14D0C275C68006BC617 /* JSHistory.h */; };
                BC94D1530C275C8B006BC617 /* History.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC94D1500C275C8B006BC617 /* History.cpp */; };
                BC94D1540C275C8B006BC617 /* History.h in Headers */ = {isa = PBXBuildFile; fileRef = BC94D1510C275C8B006BC617 /* History.h */; };
-               BC94D1570C275CAB006BC617 /* GlobalHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = BC94D1560C275CAB006BC617 /* GlobalHistory.h */; };
                BC98543D0CD3D98B00069BC1 /* JSConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */; };
                BC98543E0CD3D98C00069BC1 /* JSConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = BC98543C0CD3D98B00069BC1 /* JSConsole.h */; };
                BC98A27D0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */; };
@@ -4529,6 +4529,9 @@
                1AF326430D78B5530068F0C4 /* WebCoreAXObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreAXObject.mm; sourceTree = "<group>"; };
                1AF326440D78B5530068F0C4 /* WebCoreScriptDebugger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScriptDebugger.h; sourceTree = "<group>"; };
                1AF326450D78B5530068F0C4 /* WebCoreScriptDebugger.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreScriptDebugger.mm; sourceTree = "<group>"; };
+               1AF326760D78B9440068F0C4 /* AXObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AXObjectCache.h; sourceTree = "<group>"; };
+               1AF326770D78B9440068F0C4 /* EditorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorClient.h; sourceTree = "<group>"; };
+               1AF3267A0D78B94E0068F0C4 /* GlobalHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalHistory.h; sourceTree = "<group>"; };
                1AFE117B0CBFFB36003017FA /* SQLResultSetRowList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLResultSetRowList.cpp; sourceTree = "<group>"; };
                1AFE117C0CBFFB36003017FA /* SQLResultSetRowList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLResultSetRowList.h; sourceTree = "<group>"; };
                1AFE118C0CBFFC4E003017FA /* SQLResultSetRowList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SQLResultSetRowList.idl; sourceTree = "<group>"; };
@@ -4607,7 +4610,6 @@
                4A8C96EA0BE69032004EEFF0 /* SelectionControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectionControllerMac.mm; path = mac/SelectionControllerMac.mm; sourceTree = "<group>"; };
                4B2708C50AF19EE40065127F /* Pasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pasteboard.h; sourceTree = "<group>"; };
                4B2709810AF2E5E00065127F /* PasteboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardMac.mm; sourceTree = "<group>"; };
-               4B3043B50AE0363200A82647 /* EditorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditorClient.h; sourceTree = "<group>"; };
                4B3043C60AE0370300A82647 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
                4B3043C80AE0371D00A82647 /* SoundMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SoundMac.mm; sourceTree = "<group>"; };
                4B3043CA0AE0373B00A82647 /* Editor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Editor.cpp; sourceTree = "<group>"; };
@@ -4726,7 +4728,6 @@
                51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseTrackerClient.h; sourceTree = "<group>"; };
                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               55998A5C052B59CC0017A6C1 /* AXObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AXObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                5DCF836C0D59159800953BC6 /* PluginInfoStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInfoStore.h; sourceTree = "<group>"; };
                650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
                6548E24809E1E04D00AF8020 /* Document.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Document.idl; sourceTree = "<group>"; };
@@ -7655,7 +7656,6 @@
                BC94D1500C275C8B006BC617 /* History.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = History.cpp; sourceTree = "<group>"; };
                BC94D1510C275C8B006BC617 /* History.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = History.h; sourceTree = "<group>"; };
                BC94D1520C275C8B006BC617 /* History.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = History.idl; sourceTree = "<group>"; };
-               BC94D1560C275CAB006BC617 /* GlobalHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GlobalHistory.h; sourceTree = "<group>"; };
                BC98543B0CD3D98B00069BC1 /* JSConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSConsole.cpp; sourceTree = "<group>"; };
                BC98543C0CD3D98B00069BC1 /* JSConsole.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSConsole.h; sourceTree = "<group>"; };
                BC98A27C0C0C9950004BEBF7 /* JSStyleSheetCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStyleSheetCustom.cpp; sourceTree = "<group>"; };
@@ -8387,6 +8387,7 @@
                                8538F0000AD71770006A81D1 /* AbstractView.idl */,
                                BC80C9890CD2950500A0B7B3 /* AnimationController.cpp */,
                                BC80C98A0CD2950500A0B7B3 /* AnimationController.h */,
+                               1AF326760D78B9440068F0C4 /* AXObjectCache.h */,
                                BC124EE40C2641CD009E2349 /* BarInfo.cpp */,
                                BC124EE50C2641CD009E2349 /* BarInfo.h */,
                                BC124EE60C2641CD009E2349 /* BarInfo.idl */,
@@ -8409,6 +8410,7 @@
                                A7CA59620B27C1F200FA021D /* DragClient.h */,
                                A7CA595C0B27BD9E00FA021D /* DragController.cpp */,
                                A7CA595B0B27BD9E00FA021D /* DragController.h */,
+                               1AF326770D78B9440068F0C4 /* EditorClient.h */,
                                93C09A800B064F00005ABD4D /* EventHandler.cpp */,
                                93C09A520B064DB3005ABD4D /* EventHandler.h */,
                                14993BE30B2F2B1C0050497F /* FocusController.cpp */,
@@ -8422,6 +8424,7 @@
                                65A21483097A3F5300B9050A /* FrameTree.h */,
                                65CBFEF70974F607001DAC25 /* FrameView.cpp */,
                                65CBFEF80974F607001DAC25 /* FrameView.h */,
+                               1AF3267A0D78B94E0068F0C4 /* GlobalHistory.h */,
                                BC94D1500C275C8B006BC617 /* History.cpp */,
                                BC94D1510C275C8B006BC617 /* History.h */,
                                BC94D1520C275C8B006BC617 /* History.idl */,
@@ -8449,9 +8452,6 @@
                65BF021F097480EF00C43196 /* bridge */ = {
                        isa = PBXGroup;
                        children = (
-                               55998A5C052B59CC0017A6C1 /* AXObjectCache.h */,
-                               4B3043B50AE0363200A82647 /* EditorClient.h */,
-                               BC94D1560C275CAB006BC617 /* GlobalHistory.h */,
                        );
                        path = bridge;
                        sourceTree = "<group>";
@@ -12370,7 +12370,6 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               93F199BD08245E59001E9ABC /* AXObjectCache.h in Headers */,
                                B27535570B053814002CE64F /* AffineTransform.h in Headers */,
                                BC80C98C0CD2950500A0B7B3 /* AnimationController.h in Headers */,
                                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
@@ -13213,7 +13212,6 @@
                                93309DE4099E64920056E581 /* EditCommand.h in Headers */,
                                6550B6A4099DF0270090D781 /* EditingText.h in Headers */,
                                4B3043CD0AE0373B00A82647 /* Editor.h in Headers */,
-                               4B3043B60AE0363200A82647 /* EditorClient.h in Headers */,
                                4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */,
                                93FDAFCA0B11307400E2746F /* EditorInsertAction.h in Headers */,
                                A8C4A80709D563270003AC8D /* Element.h in Headers */,
@@ -13267,7 +13265,6 @@
                                65CBFEFA0974F607001DAC25 /* FrameView.h in Headers */,
                                1432E8470C51493800B1500F /* GCController.h in Headers */,
                                935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */,
-                               BC94D1570C275CAB006BC617 /* GlobalHistory.h in Headers */,
                                B2C3DA6C0D006CD600EF6F26 /* GlyphBuffer.h in Headers */,
                                B2C3DA6E0D006CD600EF6F26 /* GlyphPageTreeNode.h in Headers */,
                                B2C3DA700D006CD600EF6F26 /* GlyphWidthMap.h in Headers */,
@@ -14239,6 +14236,9 @@
                                A77979290D6B9E64003851B9 /* JSImageData.h in Headers */,
                                1AF326480D78B5530068F0C4 /* WebCoreAXObject.h in Headers */,
                                1AF3264A0D78B5530068F0C4 /* WebCoreScriptDebugger.h in Headers */,
+                               1AF326780D78B9440068F0C4 /* AXObjectCache.h in Headers */,
+                               1AF326790D78B9440068F0C4 /* EditorClient.h in Headers */,
+                               1AF3267B0D78B94E0068F0C4 /* GlobalHistory.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/WebCore/bridge/win/GlobalHistoryWin.cpp b/WebCore/bridge/win/GlobalHistoryWin.cpp
deleted file mode 100644 (file)
index c81f09b..0000000
--- a/WebCore/bridge/win/GlobalHistoryWin.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "GlobalHistory.h"
-
-#include "WebCoreHistory.h"
-
-namespace WebCore {
-
-bool historyContains(const UChar* characters, unsigned length)
-{
-    WebCoreHistoryProvider* provider = WebCoreHistory::historyProvider();
-    return provider && provider->containsURL(characters, length);
-}
-
-} // namespace WebCore

diff --git a/WebCore/bridge/win/PageWin.cpp b/WebCore/bridge/win/PageWin.cpp
deleted file mode 100644 (file)
index f4c744a..0000000
--- a/WebCore/bridge/win/PageWin.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "Page.h"
-
-#include "Frame.h"
-#include "FrameView.h"
-#include "FloatRect.h"
-#include <windows.h>
-
-namespace WebCore {
-
-HINSTANCE Page::s_instanceHandle = 0;
-
-} // namespace WebCore

diff --git a/WebCore/bridge/AXObjectCache.h b/WebCore/page/AXObjectCache.h
similarity index 100%
rename from WebCore/bridge/AXObjectCache.h
rename to WebCore/page/AXObjectCache.h

diff --git a/WebCore/bridge/EditorClient.h b/WebCore/page/EditorClient.h
similarity index 100%
rename from WebCore/bridge/EditorClient.h
rename to WebCore/page/EditorClient.h

diff --git a/WebCore/bridge/GlobalHistory.h b/WebCore/page/GlobalHistory.h
similarity index 100%
rename from WebCore/bridge/GlobalHistory.h
rename to WebCore/page/GlobalHistory.h

diff --git a/WebCore/bridge/win/FrameCGWin.cpp b/WebCore/page/win/FrameCGWin.cpp
similarity index 100%
rename from WebCore/bridge/win/FrameCGWin.cpp
rename to WebCore/page/win/FrameCGWin.cpp

diff --git a/WebCore/bridge/win/FrameCairoWin.cpp b/WebCore/page/win/FrameCairoWin.cpp
similarity index 100%
rename from WebCore/bridge/win/FrameCairoWin.cpp
rename to WebCore/page/win/FrameCairoWin.cpp

diff --git a/WebCore/bridge/win/FrameWin.cpp b/WebCore/page/win/FrameWin.cpp
similarity index 100%
rename from WebCore/bridge/win/FrameWin.cpp
rename to WebCore/page/win/FrameWin.cpp

diff --git a/WebCore/bridge/win/FrameWin.h b/WebCore/page/win/FrameWin.h
similarity index 100%
rename from WebCore/bridge/win/FrameWin.h
rename to WebCore/page/win/FrameWin.h