Search:
Login
Preferences
Forgot your password?
Wiki
Timeline
Browse Source
Search
Context Navigation
←
Previous Changeset
Next Changeset
→
Changeset 23462 in webkit
Timestamp:
Jun 12, 2007 2:50:34 PM (
17 years
ago)
Author:
aroben
Message:
Merge WindowsMerge to trunk
Location:
trunk
Files:
112 copied
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
(copied)
(copied from
branches/WindowsMerge/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.make
)
LayoutTests/http/conf/cygwin-httpd.conf
(copied)
(copied from
branches/WindowsMerge/LayoutTests/http/conf/cygwin-httpd.conf
)
LayoutTests/http/conf/libphp4.dll
(copied)
(copied from
branches/WindowsMerge/LayoutTests/http/conf/libphp4.dll
)
LayoutTests/win
(copied)
(copied from
branches/WindowsMerge/LayoutTests/win
)
WebCore/WebCore.vcproj/WebCore.make
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/WebCore.make
)
WebCore/WebCore.vcproj/WebCore.submit.sln
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/WebCore.submit.sln
)
WebCore/WebCore.vcproj/WebCore.vcproj
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/WebCore.vcproj
)
WebCore/WebCore.vcproj/build-generated-files.sh
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/build-generated-files.sh
)
WebCore/WebCore.vcproj/debug.vsprops
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/debug.vsprops
)
WebCore/WebCore.vcproj/debug_internal.vsprops
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/debug_internal.vsprops
)
WebCore/WebCore.vcproj/release.vsprops
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCore.vcproj/release.vsprops
)
WebCore/WebCorePrefix.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCorePrefix.cpp
)
WebCore/WebCorePrefix.h
(copied)
(copied from
branches/WindowsMerge/WebCore/WebCorePrefix.h
)
WebCore/bridge/win/FrameWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/bridge/win/FrameWin.cpp
)
WebCore/bridge/win/FrameWin.h
(copied)
(copied from
branches/WindowsMerge/WebCore/bridge/win/FrameWin.h
)
WebCore/bridge/win/HistoryWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/bridge/win/HistoryWin.cpp
)
WebCore/bridge/win/PageWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/bridge/win/PageWin.cpp
)
WebCore/config.h
(copied)
(copied from
branches/WindowsMerge/WebCore/config.h
)
WebCore/page/win/DragControllerWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/page/win/DragControllerWin.cpp
)
WebCore/page/win/EventHandlerWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/page/win/EventHandlerWin.cpp
)
WebCore/platform/graphics/cg/ColorCG.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/cg/ColorCG.cpp
)
WebCore/platform/graphics/cg/GraphicsContextPlatformPrivate.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivate.h
)
WebCore/platform/graphics/svg/cg/SVGResourceFilterCg.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/svg/cg/SVGResourceFilterCg.cpp
)
WebCore/platform/graphics/svg/cg/SVGResourceMaskerCg.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/svg/cg/SVGResourceMaskerCg.cpp
)
WebCore/platform/graphics/win/IconWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/win/IconWin.cpp
)
WebCore/platform/graphics/win/ImageWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/graphics/win/ImageWin.cpp
)
WebCore/platform/network/cf/AuthenticationCF.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/AuthenticationCF.cpp
)
WebCore/platform/network/cf/AuthenticationCF.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/AuthenticationCF.h
)
WebCore/platform/network/cf/FormDataStreamCFNet.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/FormDataStreamCFNet.cpp
)
WebCore/platform/network/cf/FormDataStreamCFNet.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/FormDataStreamCFNet.h
)
WebCore/platform/network/cf/ResourceErrorCF.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/ResourceErrorCF.cpp
)
WebCore/platform/network/cf/ResourceHandleCFNet.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
)
WebCore/platform/network/cf/ResourceRequestCFNet.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
)
WebCore/platform/network/cf/ResourceResponseCFNet.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
)
WebCore/platform/network/win/CookieJarWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/network/win/CookieJarWin.cpp
)
WebCore/platform/win/BString.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/BString.cpp
)
WebCore/platform/win/BString.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/BString.h
)
WebCore/platform/win/COMPtr.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/COMPtr.h
)
WebCore/platform/win/ClipboardUtilitiesWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ClipboardUtilitiesWin.cpp
)
WebCore/platform/win/ClipboardUtilitiesWin.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ClipboardUtilitiesWin.h
)
WebCore/platform/win/ClipboardWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ClipboardWin.cpp
)
WebCore/platform/win/ClipboardWin.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ClipboardWin.h
)
WebCore/platform/win/ContextMenuItemWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ContextMenuItemWin.cpp
)
WebCore/platform/win/ContextMenuWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ContextMenuWin.cpp
)
WebCore/platform/win/CursorWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/CursorWin.cpp
)
WebCore/platform/win/DragDataWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/DragDataWin.cpp
)
WebCore/platform/win/DragImageWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/DragImageWin.cpp
)
WebCore/platform/win/EditorWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/EditorWin.cpp
)
WebCore/platform/win/FileChooserWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FileChooserWin.cpp
)
WebCore/platform/win/FontCacheWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FontCacheWin.cpp
)
WebCore/platform/win/FontDataWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FontDataWin.cpp
)
WebCore/platform/win/FontPlatformData.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FontPlatformData.h
)
WebCore/platform/win/FontPlatformDataWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FontPlatformDataWin.cpp
)
WebCore/platform/win/FontWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/FontWin.cpp
)
WebCore/platform/win/GDIObjectCounter.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/GDIObjectCounter.cpp
)
WebCore/platform/win/GDIObjectCounter.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/GDIObjectCounter.h
)
WebCore/platform/win/GlyphPageTreeNodeWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/GlyphPageTreeNodeWin.cpp
)
WebCore/platform/win/GraphicsContextWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/GraphicsContextWin.cpp
)
WebCore/platform/win/KeyEventWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/KeyEventWin.cpp
)
WebCore/platform/win/MimeTypeRegistryWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/MimeTypeRegistryWin.cpp
)
WebCore/platform/win/PasteboardWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/PasteboardWin.cpp
)
WebCore/platform/win/PlatformMouseEventWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/PlatformMouseEventWin.cpp
)
WebCore/platform/win/PlatformScrollBar.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/PlatformScrollBar.h
)
WebCore/platform/win/PlatformScrollBarSafari.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/PlatformScrollBarSafari.cpp
)
WebCore/platform/win/PopupMenuWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/PopupMenuWin.cpp
)
WebCore/platform/win/ScreenWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ScreenWin.cpp
)
WebCore/platform/win/ScrollViewWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/ScrollViewWin.cpp
)
WebCore/platform/win/SearchPopupMenuWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/SearchPopupMenuWin.cpp
)
WebCore/platform/win/SoundWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/SoundWin.cpp
)
WebCore/platform/win/TemporaryLinkStubs.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/TemporaryLinkStubs.cpp
)
WebCore/platform/win/TextBoundariesWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/TextBoundariesWin.cpp
)
WebCore/platform/win/TextBreakIteratorInternalICUWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/TextBreakIteratorInternalICUWin.cpp
)
WebCore/platform/win/UniscribeController.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/UniscribeController.cpp
)
WebCore/platform/win/UniscribeController.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/UniscribeController.h
)
WebCore/platform/win/WCDataObject.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WCDataObject.cpp
)
WebCore/platform/win/WCDataObject.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WCDataObject.h
)
WebCore/platform/win/WebCoreHistory.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreHistory.cpp
)
WebCore/platform/win/WebCoreHistory.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreHistory.h
)
WebCore/platform/win/WebCoreSystemInterface.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreSystemInterface.cpp
)
WebCore/platform/win/WebCoreSystemInterface.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreSystemInterface.h
)
WebCore/platform/win/WebCoreTextRenderer.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreTextRenderer.cpp
)
WebCore/platform/win/WebCoreTextRenderer.h
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WebCoreTextRenderer.h
)
WebCore/platform/win/WheelEventWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WheelEventWin.cpp
)
WebCore/platform/win/WidgetWin.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/platform/win/WidgetWin.cpp
)
WebCore/plugins
(copied)
(copied from
branches/WindowsMerge/WebCore/plugins
)
WebCore/rendering/RenderThemeSafari.cpp
(copied)
(copied from
branches/WindowsMerge/WebCore/rendering/RenderThemeSafari.cpp
)
WebCore/rendering/RenderThemeSafari.h
(copied)
(copied from
branches/WindowsMerge/WebCore/rendering/RenderThemeSafari.h
)
WebKit/win
(copied)
(copied from
branches/WindowsMerge/WebKitWin
)
WebKitLibraries/win
(copied)
(copied from
branches/WindowsMerge/LibrariesWin/win
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree.sln
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree.sln
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DraggingInfo.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DraggingInfo.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.vcproj
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EditingDelegate.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EditingDelegate.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EditingDelegate.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EditingDelegate.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EventSender.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EventSender.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EventSender.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/EventSender.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/GCController.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/GCController.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/GCController.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/GCController.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/LayoutTestController.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/LayoutTestController.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/LayoutTestController.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/LayoutTestController.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WaitUntilDoneDelegate.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WaitUntilDoneDelegate.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WaitUntilDoneDelegate.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WaitUntilDoneDelegate.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueue.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueue.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueue.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueue.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueueItem.cpp
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueueItem.cpp
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueueItem.h
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/WorkQueueItem.h
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/debug.vsprops
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/debug.vsprops
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/debug_internal.vsprops
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/debug_internal.vsprops
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/release.vsprops
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/release.vsprops
)
WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/TestNetscapePlugin
(copied)
(copied from
branches/WindowsMerge/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/TestNetscapePlugin
)
Note:
See
TracChangeset
for help on using the changeset viewer.
Download in other formats:
Unified Diff
Zip Archive