Rubber stamped by Adam Roben.
authorweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Sep 2007 19:37:07 +0000 (19:37 +0000)
committerweinig <weinig@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Sep 2007 19:37:07 +0000 (19:37 +0000)
        - Move dump state data to LayoutTestContoller and add getter/setters to accommodate.
        - Move mac specific DumpRenderTree files to DumpRenderTree/mac

        * DumpRenderTree/AppleScriptController.h: Removed.
        * DumpRenderTree/AppleScriptController.m: Removed.
        * DumpRenderTree/DumpRenderTree.h:
        * DumpRenderTree/DumpRenderTree.mm:
        (startJavaScriptThreads):
        (stopJavaScriptThreads):
        (activateAhemFont):
        (setDefaultColorProfileToRGB):
        (makeLargeMallocFailSilently):
        (dumpFrameScrollPosition):
        (dumpFramesAsText):
        (dump):
        (runTest):
        (-[DumpRenderTreeWindow isKeyWindow]):
        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
        * DumpRenderTree/DumpRenderTreeDraggingInfo.h: Removed.
        * DumpRenderTree/DumpRenderTreeDraggingInfo.m: Removed.
        * DumpRenderTree/EditingDelegate.h: Removed.
        * DumpRenderTree/EditingDelegate.m: Removed.
        * DumpRenderTree/EventSendingController.h: Removed.
        * DumpRenderTree/EventSendingController.m: Removed.
        * DumpRenderTree/FrameLoadDelegate.h: Removed.
        * DumpRenderTree/FrameLoadDelegate.mm: Removed.
        * DumpRenderTree/GCController.mm: Removed.
        * DumpRenderTree/ImageDiff.m: Removed.
        * DumpRenderTree/LayoutTestController.cpp:
        (LayoutTestController::LayoutTestController):
        (dumpAsTextCallback):
        (dumpBackForwardListCallback):
        (dumpChildFramesAsTextCallback):
        (dumpChildFrameScrollPositionsCallback):
        (dumpDOMAsWebArchiveCallback):
        (dumpEditingCallbacksCallback):
        (dumpFrameLoadCallbacksCallback):
        (dumpResourceLoadCallbacksCallback):
        (dumpSelectionRectCallback):
        (dumpSourceAsWebArchiveCallback):
        (dumpTitleChangesCallback):
        (repaintSweepHorizontallyCallback):
        (setCallCloseOnWebViewsCallback):
        (setCanOpenWindowsCallback):
        (setCloseRemainingWindowsWhenCompleteCallback):
        (testRepaintCallback):
        (addFileToPasteboardOnDragCallback):
        (waitUntilDoneCallback):
        * DumpRenderTree/LayoutTestController.h:
        (LayoutTestController::dumpAsText):
        (LayoutTestController::setDumpAsText):
        (LayoutTestController::dumpBackForwardList):
        (LayoutTestController::setDumpBackForwardList):
        (LayoutTestController::dumpChildFrameScrollPositions):
        (LayoutTestController::setDumpChildFrameScrollPositions):
        (LayoutTestController::dumpChildFramesAsText):
        (LayoutTestController::setDumpChildFramesAsText):
        (LayoutTestController::dumpDOMAsWebArchive):
        (LayoutTestController::setDumpDOMAsWebArchive):
        (LayoutTestController::dumpSelectionRect):
        (LayoutTestController::setDumpSelectionRect):
        (LayoutTestController::dumpSourceAsWebArchive):
        (LayoutTestController::setDumpSourceAsWebArchive):
        (LayoutTestController::dumpTitleChanges):
        (LayoutTestController::setDumpTitleChanges):
        (LayoutTestController::dumpEditingCallbacks):
        (LayoutTestController::setDumpEditingCallbacks):
        (LayoutTestController::dumpResourceLoadCallbacks):
        (LayoutTestController::setDumpResourceLoadCallbacks):
        (LayoutTestController::dumpFrameLoadCallbacks):
        (LayoutTestController::setDumpFrameLoadCallbacks):
        (LayoutTestController::addFileToPasteboardOnDrag):
        (LayoutTestController::setAddFileToPasteboardOnDrag):
        (LayoutTestController::callCloseOnWebViews):
        (LayoutTestController::setCallCloseOnWebViews):
        (LayoutTestController::canOpenWindows):
        (LayoutTestController::setCanOpenWindows):
        (LayoutTestController::closeRemainingWindowsWhenComplete):
        (LayoutTestController::setCloseRemainingWindowsWhenComplete):
        (LayoutTestController::testRepaint):
        (LayoutTestController::setTestRepaint):
        (LayoutTestController::testRepaintSweepHorizontally):
        (LayoutTestController::setTestRepaintSweepHorizontally):
        (LayoutTestController::waitToDump):
        (LayoutTestController::windowIsKey):
        * DumpRenderTree/LayoutTestControllerMac.mm: Removed.
        * DumpRenderTree/NavigationController.h: Removed.
        * DumpRenderTree/NavigationController.m: Removed.
        * DumpRenderTree/ObjCController.h: Removed.
        * DumpRenderTree/ObjCController.m: Removed.
        * DumpRenderTree/ObjCPlugin.h: Removed.
        * DumpRenderTree/ObjCPlugin.m: Removed.
        * DumpRenderTree/ObjCPluginFunction.h: Removed.
        * DumpRenderTree/ObjCPluginFunction.m: Removed.
        * DumpRenderTree/PolicyDelegate.h: Removed.
        * DumpRenderTree/PolicyDelegate.m: Removed.
        * DumpRenderTree/ResourceLoadDelegate.h: Removed.
        * DumpRenderTree/ResourceLoadDelegate.m: Removed.
        * DumpRenderTree/TextInputController.h: Removed.
        * DumpRenderTree/TextInputController.m: Removed.
        * DumpRenderTree/UIDelegate.h: Removed.
        * DumpRenderTree/UIDelegate.mm: Removed.
        * DumpRenderTree/WorkQueueItemMac.mm: Removed.
        * DumpRenderTree/mac: Added.
        * DumpRenderTree/mac/AppleScriptController.h: Copied from DumpRenderTree/AppleScriptController.h.
        * DumpRenderTree/mac/AppleScriptController.m: Copied from DumpRenderTree/AppleScriptController.m.
        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h: Copied from DumpRenderTree/DumpRenderTreeDraggingInfo.h.
        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm: Copied from DumpRenderTree/DumpRenderTreeDraggingInfo.m.
        * DumpRenderTree/mac/EditingDelegate.h: Copied from DumpRenderTree/EditingDelegate.h.
        * DumpRenderTree/mac/EditingDelegate.mm: Copied from DumpRenderTree/EditingDelegate.m.
        (-[EditingDelegate webView:shouldBeginEditingInDOMRange:]):
        (-[EditingDelegate webView:shouldEndEditingInDOMRange:]):
        (-[EditingDelegate webView:shouldInsertNode:replacingDOMRange:givenAction:]):
        (-[EditingDelegate webView:shouldInsertText:replacingDOMRange:givenAction:]):
        (-[EditingDelegate webView:shouldDeleteDOMRange:]):
        (-[EditingDelegate webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:]):
        (-[EditingDelegate webView:shouldApplyStyle:toElementsInDOMRange:]):
        (-[EditingDelegate webView:shouldChangeTypingStyle:toStyle:]):
        (-[EditingDelegate webViewDidBeginEditing:]):
        (-[EditingDelegate webViewDidChange:]):
        (-[EditingDelegate webViewDidEndEditing:]):
        (-[EditingDelegate webViewDidChangeTypingStyle:]):
        (-[EditingDelegate webViewDidChangeSelection:]):
        * DumpRenderTree/mac/EventSendingController.h: Copied from DumpRenderTree/EventSendingController.h.
        * DumpRenderTree/mac/EventSendingController.mm: Copied from DumpRenderTree/EventSendingController.m.
        * DumpRenderTree/mac/FrameLoadDelegate.h: Copied from DumpRenderTree/FrameLoadDelegate.h.
        * DumpRenderTree/mac/FrameLoadDelegate.mm: Copied from DumpRenderTree/FrameLoadDelegate.mm.
        (-[FrameLoadDelegate init]):
        (-[FrameLoadDelegate dealloc]):
        (-[FrameLoadDelegate processWork:]):
        (-[FrameLoadDelegate webView:locationChangeDone:forDataSource:]):
        (-[FrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
        (-[FrameLoadDelegate webView:didCommitLoadForFrame:]):
        (-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
        (-[FrameLoadDelegate webView:didFinishLoadForFrame:]):
        (-[FrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
        (-[FrameLoadDelegate webView:windowScriptObjectAvailable:]):
        (-[FrameLoadDelegate webView:didClearWindowObject:forFrame:]):
        (-[FrameLoadDelegate webView:didReceiveTitle:forFrame:]):
        (-[FrameLoadDelegate webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
        (-[FrameLoadDelegate webView:didReceiveIcon:forFrame:]):
        (-[FrameLoadDelegate webView:didChangeLocationWithinPageForFrame:]):
        (-[FrameLoadDelegate webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
        (-[FrameLoadDelegate webView:didCancelClientRedirectForFrame:]):
        (-[FrameLoadDelegate webView:willCloseFrame:]):
        (-[FrameLoadDelegate webView:didFinishDocumentLoadForFrame:]):
        (-[FrameLoadDelegate webView:didHandleOnloadEventsForFrame:]):
        * DumpRenderTree/mac/GCControllerMac.mm: Copied from DumpRenderTree/GCController.mm.
        * DumpRenderTree/mac/ImageDiff.m: Copied from DumpRenderTree/ImageDiff.m.
        * DumpRenderTree/mac/LayoutTestControllerMac.mm: Copied from DumpRenderTree/LayoutTestControllerMac.mm.
        (LayoutTestController::notifyDone):
        (LayoutTestController::setWindowIsKey):
        (LayoutTestController::setWaitToDump):
        * DumpRenderTree/mac/NavigationController.h: Copied from DumpRenderTree/NavigationController.h.
        * DumpRenderTree/mac/NavigationController.m: Copied from DumpRenderTree/NavigationController.m.
        * DumpRenderTree/mac/ObjCController.h: Copied from DumpRenderTree/ObjCController.h.
        * DumpRenderTree/mac/ObjCController.m: Copied from DumpRenderTree/ObjCController.m.
        * DumpRenderTree/mac/ObjCPlugin.h: Copied from DumpRenderTree/ObjCPlugin.h.
        * DumpRenderTree/mac/ObjCPlugin.m: Copied from DumpRenderTree/ObjCPlugin.m.
        * DumpRenderTree/mac/ObjCPluginFunction.h: Copied from DumpRenderTree/ObjCPluginFunction.h.
        * DumpRenderTree/mac/ObjCPluginFunction.m: Copied from DumpRenderTree/ObjCPluginFunction.m.
        * DumpRenderTree/mac/PolicyDelegate.h: Copied from DumpRenderTree/PolicyDelegate.h.
        * DumpRenderTree/mac/PolicyDelegate.mm: Copied from DumpRenderTree/PolicyDelegate.m.
        * DumpRenderTree/mac/ResourceLoadDelegate.h: Copied from DumpRenderTree/ResourceLoadDelegate.h.
        * DumpRenderTree/mac/ResourceLoadDelegate.mm: Copied from DumpRenderTree/ResourceLoadDelegate.m.
        (-[ResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
        (-[ResourceLoadDelegate webView:resource:willSendRequest:redirectResponse:fromDataSource:]):
        (-[ResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
        (-[ResourceLoadDelegate webView:resource:didFinishLoadingFromDataSource:]):
        (-[ResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
        (-[ResourceLoadDelegate webView:resource:willCacheResponse:fromDataSource:]):
        * DumpRenderTree/mac/TextInputController.h: Copied from DumpRenderTree/TextInputController.h.
        * DumpRenderTree/mac/TextInputController.m: Copied from DumpRenderTree/TextInputController.m.
        * DumpRenderTree/mac/UIDelegate.h: Copied from DumpRenderTree/UIDelegate.h.
        * DumpRenderTree/mac/UIDelegate.mm: Copied from DumpRenderTree/UIDelegate.mm.
        (-[UIDelegate webView:dragImage:at:offset:event:pasteboard:source:slideBack:forView:]):
        (-[UIDelegate webViewFocus:]):
        (-[UIDelegate webView:createWebViewWithRequest:]):
        (-[UIDelegate webViewClose:]):
        * DumpRenderTree/mac/WorkQueueItemMac.mm: Copied from DumpRenderTree/WorkQueueItemMac.mm.

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

36 files changed:
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/DumpRenderTree.h
WebKitTools/DumpRenderTree/DumpRenderTree.mm
WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
WebKitTools/DumpRenderTree/LayoutTestController.cpp
WebKitTools/DumpRenderTree/LayoutTestController.h
WebKitTools/DumpRenderTree/mac/AppleScriptController.h [moved from WebKitTools/DumpRenderTree/AppleScriptController.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/AppleScriptController.m [moved from WebKitTools/DumpRenderTree/AppleScriptController.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h [moved from WebKitTools/DumpRenderTree/DumpRenderTreeDraggingInfo.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm [moved from WebKitTools/DumpRenderTree/DumpRenderTreeDraggingInfo.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/EditingDelegate.h [moved from WebKitTools/DumpRenderTree/EditingDelegate.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/EditingDelegate.mm [moved from WebKitTools/DumpRenderTree/EditingDelegate.m with 88% similarity]
WebKitTools/DumpRenderTree/mac/EventSendingController.h [moved from WebKitTools/DumpRenderTree/EventSendingController.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/EventSendingController.mm [moved from WebKitTools/DumpRenderTree/EventSendingController.m with 99% similarity]
WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.h [moved from WebKitTools/DumpRenderTree/FrameLoadDelegate.h with 95% similarity]
WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm [moved from WebKitTools/DumpRenderTree/FrameLoadDelegate.mm with 89% similarity]
WebKitTools/DumpRenderTree/mac/GCControllerMac.mm [moved from WebKitTools/DumpRenderTree/GCController.mm with 100% similarity]
WebKitTools/DumpRenderTree/mac/ImageDiff.m [moved from WebKitTools/DumpRenderTree/ImageDiff.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm [moved from WebKitTools/DumpRenderTree/LayoutTestControllerMac.mm with 80% similarity]
WebKitTools/DumpRenderTree/mac/NavigationController.h [moved from WebKitTools/DumpRenderTree/NavigationController.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/NavigationController.m [moved from WebKitTools/DumpRenderTree/NavigationController.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCController.h [moved from WebKitTools/DumpRenderTree/ObjCController.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCController.m [moved from WebKitTools/DumpRenderTree/ObjCController.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCPlugin.h [moved from WebKitTools/DumpRenderTree/ObjCPlugin.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCPlugin.m [moved from WebKitTools/DumpRenderTree/ObjCPlugin.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCPluginFunction.h [moved from WebKitTools/DumpRenderTree/ObjCPluginFunction.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/ObjCPluginFunction.m [moved from WebKitTools/DumpRenderTree/ObjCPluginFunction.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/PolicyDelegate.h [moved from WebKitTools/DumpRenderTree/PolicyDelegate.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm [moved from WebKitTools/DumpRenderTree/PolicyDelegate.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.h [moved from WebKitTools/DumpRenderTree/ResourceLoadDelegate.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm [moved from WebKitTools/DumpRenderTree/ResourceLoadDelegate.m with 93% similarity]
WebKitTools/DumpRenderTree/mac/TextInputController.h [moved from WebKitTools/DumpRenderTree/TextInputController.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/TextInputController.m [moved from WebKitTools/DumpRenderTree/TextInputController.m with 100% similarity]
WebKitTools/DumpRenderTree/mac/UIDelegate.h [moved from WebKitTools/DumpRenderTree/UIDelegate.h with 100% similarity]
WebKitTools/DumpRenderTree/mac/UIDelegate.mm [moved from WebKitTools/DumpRenderTree/UIDelegate.mm with 92% similarity]
WebKitTools/DumpRenderTree/mac/WorkQueueItemMac.mm [moved from WebKitTools/DumpRenderTree/WorkQueueItemMac.mm with 100% similarity]

index 7ce5c896b5ab03f99188e3b7debd547d0a482825..64ffde47249c3f21f7fcce5769c9d8cd14cb60fe 100644 (file)
@@ -1,3 +1,188 @@
+2007-09-14  Sam Weinig  <sam@webkit.org>
+
+        Rubber stamped by Adam Roben.
+
+        - Move dump state data to LayoutTestContoller and add getter/setters to accommodate.
+        - Move mac specific DumpRenderTree files to DumpRenderTree/mac
+
+        * DumpRenderTree/AppleScriptController.h: Removed.
+        * DumpRenderTree/AppleScriptController.m: Removed.
+        * DumpRenderTree/DumpRenderTree.h:
+        * DumpRenderTree/DumpRenderTree.mm:
+        (startJavaScriptThreads):
+        (stopJavaScriptThreads):
+        (activateAhemFont):
+        (setDefaultColorProfileToRGB):
+        (makeLargeMallocFailSilently):
+        (dumpFrameScrollPosition):
+        (dumpFramesAsText):
+        (dump):
+        (runTest):
+        (-[DumpRenderTreeWindow isKeyWindow]):
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+        * DumpRenderTree/DumpRenderTreeDraggingInfo.h: Removed.
+        * DumpRenderTree/DumpRenderTreeDraggingInfo.m: Removed.
+        * DumpRenderTree/EditingDelegate.h: Removed.
+        * DumpRenderTree/EditingDelegate.m: Removed.
+        * DumpRenderTree/EventSendingController.h: Removed.
+        * DumpRenderTree/EventSendingController.m: Removed.
+        * DumpRenderTree/FrameLoadDelegate.h: Removed.
+        * DumpRenderTree/FrameLoadDelegate.mm: Removed.
+        * DumpRenderTree/GCController.mm: Removed.
+        * DumpRenderTree/ImageDiff.m: Removed.
+        * DumpRenderTree/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (dumpAsTextCallback):
+        (dumpBackForwardListCallback):
+        (dumpChildFramesAsTextCallback):
+        (dumpChildFrameScrollPositionsCallback):
+        (dumpDOMAsWebArchiveCallback):
+        (dumpEditingCallbacksCallback):
+        (dumpFrameLoadCallbacksCallback):
+        (dumpResourceLoadCallbacksCallback):
+        (dumpSelectionRectCallback):
+        (dumpSourceAsWebArchiveCallback):
+        (dumpTitleChangesCallback):
+        (repaintSweepHorizontallyCallback):
+        (setCallCloseOnWebViewsCallback):
+        (setCanOpenWindowsCallback):
+        (setCloseRemainingWindowsWhenCompleteCallback):
+        (testRepaintCallback):
+        (addFileToPasteboardOnDragCallback):
+        (waitUntilDoneCallback):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController::dumpAsText):
+        (LayoutTestController::setDumpAsText):
+        (LayoutTestController::dumpBackForwardList):
+        (LayoutTestController::setDumpBackForwardList):
+        (LayoutTestController::dumpChildFrameScrollPositions):
+        (LayoutTestController::setDumpChildFrameScrollPositions):
+        (LayoutTestController::dumpChildFramesAsText):
+        (LayoutTestController::setDumpChildFramesAsText):
+        (LayoutTestController::dumpDOMAsWebArchive):
+        (LayoutTestController::setDumpDOMAsWebArchive):
+        (LayoutTestController::dumpSelectionRect):
+        (LayoutTestController::setDumpSelectionRect):
+        (LayoutTestController::dumpSourceAsWebArchive):
+        (LayoutTestController::setDumpSourceAsWebArchive):
+        (LayoutTestController::dumpTitleChanges):
+        (LayoutTestController::setDumpTitleChanges):
+        (LayoutTestController::dumpEditingCallbacks):
+        (LayoutTestController::setDumpEditingCallbacks):
+        (LayoutTestController::dumpResourceLoadCallbacks):
+        (LayoutTestController::setDumpResourceLoadCallbacks):
+        (LayoutTestController::dumpFrameLoadCallbacks):
+        (LayoutTestController::setDumpFrameLoadCallbacks):
+        (LayoutTestController::addFileToPasteboardOnDrag):
+        (LayoutTestController::setAddFileToPasteboardOnDrag):
+        (LayoutTestController::callCloseOnWebViews):
+        (LayoutTestController::setCallCloseOnWebViews):
+        (LayoutTestController::canOpenWindows):
+        (LayoutTestController::setCanOpenWindows):
+        (LayoutTestController::closeRemainingWindowsWhenComplete):
+        (LayoutTestController::setCloseRemainingWindowsWhenComplete):
+        (LayoutTestController::testRepaint):
+        (LayoutTestController::setTestRepaint):
+        (LayoutTestController::testRepaintSweepHorizontally):
+        (LayoutTestController::setTestRepaintSweepHorizontally):
+        (LayoutTestController::waitToDump):
+        (LayoutTestController::windowIsKey):
+        * DumpRenderTree/LayoutTestControllerMac.mm: Removed.
+        * DumpRenderTree/NavigationController.h: Removed.
+        * DumpRenderTree/NavigationController.m: Removed.
+        * DumpRenderTree/ObjCController.h: Removed.
+        * DumpRenderTree/ObjCController.m: Removed.
+        * DumpRenderTree/ObjCPlugin.h: Removed.
+        * DumpRenderTree/ObjCPlugin.m: Removed.
+        * DumpRenderTree/ObjCPluginFunction.h: Removed.
+        * DumpRenderTree/ObjCPluginFunction.m: Removed.
+        * DumpRenderTree/PolicyDelegate.h: Removed.
+        * DumpRenderTree/PolicyDelegate.m: Removed.
+        * DumpRenderTree/ResourceLoadDelegate.h: Removed.
+        * DumpRenderTree/ResourceLoadDelegate.m: Removed.
+        * DumpRenderTree/TextInputController.h: Removed.
+        * DumpRenderTree/TextInputController.m: Removed.
+        * DumpRenderTree/UIDelegate.h: Removed.
+        * DumpRenderTree/UIDelegate.mm: Removed.
+        * DumpRenderTree/WorkQueueItemMac.mm: Removed.
+        * DumpRenderTree/mac: Added.
+        * DumpRenderTree/mac/AppleScriptController.h: Copied from DumpRenderTree/AppleScriptController.h.
+        * DumpRenderTree/mac/AppleScriptController.m: Copied from DumpRenderTree/AppleScriptController.m.
+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.h: Copied from DumpRenderTree/DumpRenderTreeDraggingInfo.h.
+        * DumpRenderTree/mac/DumpRenderTreeDraggingInfo.mm: Copied from DumpRenderTree/DumpRenderTreeDraggingInfo.m.
+        * DumpRenderTree/mac/EditingDelegate.h: Copied from DumpRenderTree/EditingDelegate.h.
+        * DumpRenderTree/mac/EditingDelegate.mm: Copied from DumpRenderTree/EditingDelegate.m.
+        (-[EditingDelegate webView:shouldBeginEditingInDOMRange:]):
+        (-[EditingDelegate webView:shouldEndEditingInDOMRange:]):
+        (-[EditingDelegate webView:shouldInsertNode:replacingDOMRange:givenAction:]):
+        (-[EditingDelegate webView:shouldInsertText:replacingDOMRange:givenAction:]):
+        (-[EditingDelegate webView:shouldDeleteDOMRange:]):
+        (-[EditingDelegate webView:shouldChangeSelectedDOMRange:toDOMRange:affinity:stillSelecting:]):
+        (-[EditingDelegate webView:shouldApplyStyle:toElementsInDOMRange:]):
+        (-[EditingDelegate webView:shouldChangeTypingStyle:toStyle:]):
+        (-[EditingDelegate webViewDidBeginEditing:]):
+        (-[EditingDelegate webViewDidChange:]):
+        (-[EditingDelegate webViewDidEndEditing:]):
+        (-[EditingDelegate webViewDidChangeTypingStyle:]):
+        (-[EditingDelegate webViewDidChangeSelection:]):
+        * DumpRenderTree/mac/EventSendingController.h: Copied from DumpRenderTree/EventSendingController.h.
+        * DumpRenderTree/mac/EventSendingController.mm: Copied from DumpRenderTree/EventSendingController.m.
+        * DumpRenderTree/mac/FrameLoadDelegate.h: Copied from DumpRenderTree/FrameLoadDelegate.h.
+        * DumpRenderTree/mac/FrameLoadDelegate.mm: Copied from DumpRenderTree/FrameLoadDelegate.mm.
+        (-[FrameLoadDelegate init]):
+        (-[FrameLoadDelegate dealloc]):
+        (-[FrameLoadDelegate processWork:]):
+        (-[FrameLoadDelegate webView:locationChangeDone:forDataSource:]):
+        (-[FrameLoadDelegate webView:didStartProvisionalLoadForFrame:]):
+        (-[FrameLoadDelegate webView:didCommitLoadForFrame:]):
+        (-[FrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
+        (-[FrameLoadDelegate webView:didFinishLoadForFrame:]):
+        (-[FrameLoadDelegate webView:didFailLoadWithError:forFrame:]):
+        (-[FrameLoadDelegate webView:windowScriptObjectAvailable:]):
+        (-[FrameLoadDelegate webView:didClearWindowObject:forFrame:]):
+        (-[FrameLoadDelegate webView:didReceiveTitle:forFrame:]):
+        (-[FrameLoadDelegate webView:didReceiveServerRedirectForProvisionalLoadForFrame:]):
+        (-[FrameLoadDelegate webView:didReceiveIcon:forFrame:]):
+        (-[FrameLoadDelegate webView:didChangeLocationWithinPageForFrame:]):
+        (-[FrameLoadDelegate webView:willPerformClientRedirectToURL:delay:fireDate:forFrame:]):
+        (-[FrameLoadDelegate webView:didCancelClientRedirectForFrame:]):
+        (-[FrameLoadDelegate webView:willCloseFrame:]):
+        (-[FrameLoadDelegate webView:didFinishDocumentLoadForFrame:]):
+        (-[FrameLoadDelegate webView:didHandleOnloadEventsForFrame:]):
+        * DumpRenderTree/mac/GCControllerMac.mm: Copied from DumpRenderTree/GCController.mm.
+        * DumpRenderTree/mac/ImageDiff.m: Copied from DumpRenderTree/ImageDiff.m.
+        * DumpRenderTree/mac/LayoutTestControllerMac.mm: Copied from DumpRenderTree/LayoutTestControllerMac.mm.
+        (LayoutTestController::notifyDone):
+        (LayoutTestController::setWindowIsKey):
+        (LayoutTestController::setWaitToDump):
+        * DumpRenderTree/mac/NavigationController.h: Copied from DumpRenderTree/NavigationController.h.
+        * DumpRenderTree/mac/NavigationController.m: Copied from DumpRenderTree/NavigationController.m.
+        * DumpRenderTree/mac/ObjCController.h: Copied from DumpRenderTree/ObjCController.h.
+        * DumpRenderTree/mac/ObjCController.m: Copied from DumpRenderTree/ObjCController.m.
+        * DumpRenderTree/mac/ObjCPlugin.h: Copied from DumpRenderTree/ObjCPlugin.h.
+        * DumpRenderTree/mac/ObjCPlugin.m: Copied from DumpRenderTree/ObjCPlugin.m.
+        * DumpRenderTree/mac/ObjCPluginFunction.h: Copied from DumpRenderTree/ObjCPluginFunction.h.
+        * DumpRenderTree/mac/ObjCPluginFunction.m: Copied from DumpRenderTree/ObjCPluginFunction.m.
+        * DumpRenderTree/mac/PolicyDelegate.h: Copied from DumpRenderTree/PolicyDelegate.h.
+        * DumpRenderTree/mac/PolicyDelegate.mm: Copied from DumpRenderTree/PolicyDelegate.m.
+        * DumpRenderTree/mac/ResourceLoadDelegate.h: Copied from DumpRenderTree/ResourceLoadDelegate.h.
+        * DumpRenderTree/mac/ResourceLoadDelegate.mm: Copied from DumpRenderTree/ResourceLoadDelegate.m.
+        (-[ResourceLoadDelegate webView:identifierForInitialRequest:fromDataSource:]):
+        (-[ResourceLoadDelegate webView:resource:willSendRequest:redirectResponse:fromDataSource:]):
+        (-[ResourceLoadDelegate webView:resource:didReceiveResponse:fromDataSource:]):
+        (-[ResourceLoadDelegate webView:resource:didFinishLoadingFromDataSource:]):
+        (-[ResourceLoadDelegate webView:resource:didFailLoadingWithError:fromDataSource:]):
+        (-[ResourceLoadDelegate webView:resource:willCacheResponse:fromDataSource:]):
+        * DumpRenderTree/mac/TextInputController.h: Copied from DumpRenderTree/TextInputController.h.
+        * DumpRenderTree/mac/TextInputController.m: Copied from DumpRenderTree/TextInputController.m.
+        * DumpRenderTree/mac/UIDelegate.h: Copied from DumpRenderTree/UIDelegate.h.
+        * DumpRenderTree/mac/UIDelegate.mm: Copied from DumpRenderTree/UIDelegate.mm.
+        (-[UIDelegate webView:dragImage:at:offset:event:pasteboard:source:slideBack:forView:]):
+        (-[UIDelegate webViewFocus:]):
+        (-[UIDelegate webView:createWebViewWithRequest:]):
+        (-[UIDelegate webViewClose:]):
+        * DumpRenderTree/mac/WorkQueueItemMac.mm: Copied from DumpRenderTree/WorkQueueItemMac.mm.
+
 2007-09-14  Kevin McCullough  <kmccullough@apple.com>
 
         Reviewed by Adam.
index 325954351c38d463a8249c041306ae97a0f97e6f..5ae1a9d9bb513d6d1808030ed0cef3920e10be97 100644 (file)
 #ifndef DumpRenderTree_h
 #define DumpRenderTree_h
 
+#include <JavascriptCore/Platform.h>
+
+class LayoutTestController;
+
+#if PLATFORM(MAC)
 @class DumpRenderTreeDraggingInfo;
 @class EditingDelegate;
 @class FrameLoadDelegate;
 @class UIDelegate;
 @class WebFrame;
 @class WebView;
+#endif
 
 extern volatile bool done;
 
-extern bool dumpAsText;
-extern bool dumpSelectionRect;
-extern bool dumpTitleChanges;
-extern bool dumpBackForwardList;
-extern bool dumpChildFrameScrollPositions;
-extern bool dumpChildFramesAsText;
-extern bool dumpDOMAsWebArchive;
-extern bool dumpSourceAsWebArchive;
-extern bool shouldDumpEditingCallbacks;
-extern bool shouldDumpResourceLoadCallbacks;
-extern bool shouldDumpFrameLoadCallbacks;
-extern bool shouldDumpResourceLoadCallbacks;
-extern bool shouldDumpFrameLoadCallbacks;
-extern bool addFileToPasteboardOnDrag;
-extern bool canOpenWindows;
-extern bool closeRemainingWindowsWhenComplete;
-extern bool closeWebViews;
-extern bool repaintSweepHorizontally;
-extern bool testRepaint;
-extern bool waitToDump;
-extern bool windowIsKey;
-
 extern CFMutableArrayRef allWindowsRef;
 extern CFMutableSetRef disallowedURLs;
 extern CFRunLoopTimerRef waitToDumpWatchdog;
-extern CFTimeInterval waitToDumpWatchdogInterval;
 
 extern WebFrame* mainFrame;
 extern WebFrame* topLoadingFrame;
@@ -75,6 +58,7 @@ extern DumpRenderTreeDraggingInfo *draggingInfo;
 
 // Global Controllers
 extern NavigationController* navigationController;
+extern LayoutTestController* layoutTestController;
 
 // Delegates
 extern FrameLoadDelegate* frameLoadDelegate;
@@ -85,6 +69,6 @@ extern PolicyDelegate* policyDelegate;
 
 WebView* createWebView();
 void displayWebView();
-void dump(void);
+void dump();
 
-#endif DumpRenderTree_h
+#endif // DumpRenderTree_h
index a22dd281f87cf27524e4efd320b8df201edb55fb..10e7bd0a816635b2e0d3a36b9a226b7667a7ece0 100644 (file)
 #import "EditingDelegate.h"
 #import "EventSendingController.h"
 #import "FrameLoadDelegate.h"
+#import "LayoutTestController.h"
 #import "NavigationController.h"
 #import "ObjCPlugin.h"
 #import "ObjCPluginFunction.h"
 #import "PolicyDelegate.h"
 #import "ResourceLoadDelegate.h"
 #import "UIDelegate.h"
-#import "WorkQueueItem.h"
 #import "WorkQueue.h"
+#import "WorkQueueItem.h"
 
 #import <ApplicationServices/ApplicationServices.h> // for CMSetDefaultProfileBySpace
 #import <CoreFoundation/CoreFoundation.h>
@@ -101,8 +102,8 @@ static NSString *md5HashStringForBitmap(CGImageRef bitmap);
 
 volatile bool done;
 
-LayoutTestController* layoutTestController = 0;
 NavigationController* navigationController = 0;
+LayoutTestController* layoutTestController = 0;
 
 WebFrame *mainFrame = 0;
 // This is the topmost frame that is loading, during a given load, or nil when no load is 
@@ -111,30 +112,10 @@ WebFrame *mainFrame = 0;
 // that child frame is the "topmost frame that is loading".
 WebFrame *topLoadingFrame = nil;     // !nil iff a load is in progress
 
-bool addFileToPasteboardOnDrag = NO;
-bool canOpenWindows;
-bool closeRemainingWindowsWhenComplete = YES;
-bool closeWebViews;
-bool dumpAsText;
-bool dumpBackForwardList;
-bool dumpChildFramesAsText;
-bool dumpChildFrameScrollPositions;
-bool dumpDOMAsWebArchive;
-bool dumpSelectionRect;
-bool dumpSourceAsWebArchive;
-bool dumpTitleChanges = NO;
-bool repaintSweepHorizontally;
-bool shouldDumpEditingCallbacks;
-bool shouldDumpFrameLoadCallbacks;
-bool shouldDumpResourceLoadCallbacks;
-bool testRepaint;
-bool waitToDump;     // TRUE if waitUntilDone() has been called, but notifyDone() has not yet been called
-bool windowIsKey = YES;
 
 CFMutableArrayRef allWindowsRef = 0;
 CFMutableSetRef disallowedURLs = 0;
 CFRunLoopTimerRef waitToDumpWatchdog = 0;
-CFTimeInterval waitToDumpWatchdogInterval = 10.0; // seconds
 
 // Delegates
 FrameLoadDelegate *frameLoadDelegate;
@@ -223,7 +204,7 @@ void* runJavaScriptThread(void* arg)
     }
 }
 
-static void startJavaScriptThreads(void)
+static void startJavaScriptThreads()
 {
     pthread_mutex_lock(&javaScriptThreadsMutex);
 
@@ -237,7 +218,7 @@ static void startJavaScriptThreads(void)
     pthread_mutex_unlock(&javaScriptThreadsMutex);
 }
 
-static void stopJavaScriptThreads(void)
+static void stopJavaScriptThreads()
 {
     pthread_mutex_lock(&javaScriptThreadsMutex);
 
@@ -291,7 +272,7 @@ static void crashHandler(int sig)
     exit(128 + sig);
 }
 
-static void activateAhemFont(void)
+static void activateAhemFont()
 {    
     unsigned long fontDataLength;
     char* fontData = getsectdata("__DATA", "Ahem", &fontDataLength);
@@ -309,7 +290,7 @@ static void activateAhemFont(void)
     }
 }
 
-static void setDefaultColorProfileToRGB(void)
+static void setDefaultColorProfileToRGB()
 {
     CMProfileRef genericProfile = (CMProfileRef)[[NSColorSpace genericRGBColorSpace] colorSyncProfile];
     CMProfileRef previousProfile;
@@ -363,7 +344,7 @@ static void* checkedRealloc(malloc_zone_t* zone, void* ptr, size_t size)
     return savedRealloc(zone, ptr, size);
 }
 
-static void makeLargeMallocFailSilently(void)
+static void makeLargeMallocFailSilently()
 {
     malloc_zone_t* zone = malloc_default_zone();
     savedMalloc = zone->malloc;
@@ -653,7 +634,7 @@ static void dumpFrameScrollPosition(WebFrame *f)
         printf("scrolled to %.f,%.f\n", scrollPosition.x, scrollPosition.y);
     }
 
-    if (dumpChildFrameScrollPositions) {
+    if (layoutTestController->dumpChildFrameScrollPositions()) {
         NSArray *kids = [f childFrames];
         if (kids)
             for (unsigned i = 0; i < [kids count]; i++)
@@ -682,7 +663,7 @@ static NSString *dumpFramesAsText(WebFrame *frame)
 
     [result appendFormat:@"%@\n", [documentElement innerText]];
 
-    if (dumpChildFramesAsText) {
+    if (layoutTestController->dumpChildFramesAsText()) {
         NSArray *kids = [frame childFrames];
         if (kids) {
             for (unsigned i = 0; i < [kids count]; i++)
@@ -847,7 +828,7 @@ static void dumpBackForwardListForWebView(WebView *view)
     printf("===============================================\n");
 }
 
-void dump(void)
+void dump()
 {
     if (waitToDumpWatchdog) {
         CFRunLoopTimerInvalidate(waitToDumpWatchdog);
@@ -857,14 +838,16 @@ void dump(void)
 
     if (dumpTree) {
         NSString *result = nil;
-
+        
+        bool dumpAsText = layoutTestController->dumpAsText();
         dumpAsText |= [[[[mainFrame dataSource] response] MIMEType] isEqualToString:@"text/plain"];
-        if (dumpAsText) {
+        layoutTestController->setDumpAsText(dumpAsText);
+        if (layoutTestController->dumpAsText()) {
             result = dumpFramesAsText(mainFrame);
-        } else if (dumpDOMAsWebArchive) {
+        } else if (layoutTestController->dumpDOMAsWebArchive()) {
             WebArchive *webArchive = [[mainFrame DOMDocument] webArchive];
             result = serializeWebArchiveToXML(webArchive);
-        } else if (dumpSourceAsWebArchive) {
+        } else if (layoutTestController->dumpSourceAsWebArchive()) {
             WebArchive *webArchive = [[mainFrame dataSource] webArchive];
             result = serializeWebArchiveToXML(webArchive);
         } else {
@@ -878,11 +861,11 @@ void dump(void)
 
         if (!result) {
             const char *errorMessage;
-            if (dumpAsText)
+            if (layoutTestController->dumpAsText())
                 errorMessage = "[documentElement innerText]";
-            else if (dumpDOMAsWebArchive)
+            else if (layoutTestController->dumpDOMAsWebArchive())
                 errorMessage = "[[mainFrame DOMDocument] webArchive]";
-            else if (dumpSourceAsWebArchive)
+            else if (layoutTestController->dumpSourceAsWebArchive())
                 errorMessage = "[[mainFrame dataSource] webArchive]";
             else
                 errorMessage = "[mainFrame renderTreeAsExternalRepresentation]";
@@ -890,11 +873,11 @@ void dump(void)
         } else {
             NSData *data = [result dataUsingEncoding:NSUTF8StringEncoding];
             fwrite([data bytes], 1, [data length], stdout);
-            if (!dumpAsText && !dumpDOMAsWebArchive && !dumpSourceAsWebArchive)
+            if (!layoutTestController->dumpAsText() && !layoutTestController->dumpDOMAsWebArchive() && !layoutTestController->dumpSourceAsWebArchive())
                 dumpFrameScrollPosition(mainFrame);
         }
 
-        if (dumpBackForwardList) {
+        if (layoutTestController->dumpBackForwardList()) {
             unsigned count = CFArrayGetCount(allWindowsRef);
             for (unsigned i = 0; i < count; i++) {
                 NSWindow *window = (NSWindow *)CFArrayGetValueAtIndex(allWindowsRef, i);
@@ -908,7 +891,7 @@ void dump(void)
     }
     
     if (dumpPixels) {
-        if (!dumpAsText && !dumpDOMAsWebArchive && !dumpSourceAsWebArchive) {
+        if (!layoutTestController->dumpAsText() && !layoutTestController->dumpDOMAsWebArchive() && !layoutTestController->dumpSourceAsWebArchive()) {
             // grab a bitmap from the view
             WebView* view = [mainFrame webView];
             NSSize webViewSize = [view frame].size;
@@ -927,9 +910,9 @@ void dump(void)
                 [view unlockFocus];
                 [imageRep draw];
                 [imageRep release];
-            } else if (!testRepaint)
+            } else if (!layoutTestController->testRepaint())
                 [view displayRectIgnoringOpacity:NSMakeRect(0, 0, webViewSize.width, webViewSize.height) inContext:nsContext];
-            else if (!repaintSweepHorizontally) {
+            else if (!layoutTestController->testRepaintSweepHorizontally()) {
                 NSRect line = NSMakeRect(0, 0, webViewSize.width, 1);
                 while (line.origin.y < webViewSize.height) {
                     [view displayRectIgnoringOpacity:line inContext:nsContext];
@@ -942,7 +925,7 @@ void dump(void)
                     column.origin.x++;
                 }
             }
-            if (dumpSelectionRect) {
+            if (layoutTestController->dumpSelectionRect()) {
                 NSView *documentView = [[mainFrame frameView] documentView];
                 if ([documentView conformsToProtocol:@protocol(WebDocumentSelection)]) {
                     [[NSColor redColor] set];
@@ -1027,39 +1010,28 @@ static void runTest(const char *pathOrURL)
         return;
     }
 
-    
+    layoutTestController = new LayoutTestController(testRepaintDefault, repaintSweepHorizontallyDefault);
 
     [(EditingDelegate *)[[mainFrame webView] editingDelegate] setAcceptsEditing:YES];
     [[mainFrame webView] makeTextStandardSize:nil];
     [[mainFrame webView] setTabKeyCyclesThroughElements: YES];
     [[mainFrame webView] setPolicyDelegate:nil];
+    [[mainFrame webView] _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO];
     [WebView _setUsesTestModeFocusRingColor:YES];
-    done = NO;
+
     topLoadingFrame = nil;
-    waitToDump = NO;
-    dumpAsText = NO;
-    dumpDOMAsWebArchive = NO;
-    dumpSourceAsWebArchive = NO;
-    dumpChildFrameScrollPositions = NO;
-    dumpChildFramesAsText = NO;
-    shouldDumpEditingCallbacks = NO;
-    shouldDumpResourceLoadCallbacks = NO;
-    shouldDumpFrameLoadCallbacks = NO;
-    dumpSelectionRect = NO;
-    dumpTitleChanges = NO;
-    dumpBackForwardList = NO;
+
+    done = NO;
     readFromWindow = NO;
-    canOpenWindows = NO;
-    closeWebViews = YES;
-    addFileToPasteboardOnDrag = NO;
-    [[mainFrame webView] _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO];
-    testRepaint = testRepaintDefault;
-    repaintSweepHorizontally = repaintSweepHorizontallyDefault;
+
+    if (disallowedURLs)
+        CFSetRemoveAllValues(disallowedURLs);
+    if (shouldLogFrameLoadDelegates(pathOrURL))
+        layoutTestController->setDumpFrameLoadCallbacks(true);
+
     if ([WebHistory optionalSharedHistory])
         [WebHistory setOptionalSharedHistory:nil];
     lastMousePosition = NSMakePoint(0, 0);
-    if (disallowedURLs)
-        CFSetRemoveAllValues(disallowedURLs);
 
     if (currentTest != nil)
         CFRelease(currentTest);
@@ -1075,8 +1047,6 @@ static void runTest(const char *pathOrURL)
         [WebCoreStatistics startIgnoringWebCoreNodeLeaks];
 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    if (shouldLogFrameLoadDelegates(pathOrURL))
-        shouldDumpFrameLoadCallbacks = YES;
     [mainFrame loadRequest:[NSURLRequest requestWithURL:(NSURL *)URL]];
     CFRelease(URL);
     [pool release];
@@ -1088,8 +1058,10 @@ static void runTest(const char *pathOrURL)
     pool = [[NSAutoreleasePool alloc] init];
     [EventSendingController clearSavedEvents];
     [[mainFrame webView] setSelectedDOMRange:nil affinity:NSSelectionAffinityDownstream];
-    
-    if (closeRemainingWindowsWhenComplete) {
+
+    WorkQueue::shared()->clear();
+
+    if (layoutTestController->closeRemainingWindowsWhenComplete()) {
         NSArray* array = [(NSArray *)allWindowsRef copy];
         
         unsigned count = [array count];
@@ -1109,11 +1081,14 @@ static void runTest(const char *pathOrURL)
     }
     
     [pool release];
-    
+
     // We should only have our main window left when we're done
     ASSERT(CFArrayGetCount(allWindowsRef) == 1);
     ASSERT(CFArrayGetValueAtIndex(allWindowsRef, 0) == [[mainFrame webView] window]);
-    
+
+    delete layoutTestController;
+    layoutTestController = 0;
+
     if (_shouldIgnoreWebCoreNodeLeaks)
         [WebCoreStatistics stopIgnoringWebCoreNodeLeaks];
 }
@@ -1343,7 +1318,7 @@ static CFArrayCallBacks NonRetainingArrayCallbacks = {
 
 - (BOOL)isKeyWindow
 {
-    return windowIsKey;
+    return layoutTestController ? layoutTestController->windowIsKey() : YES;
 }
 
 - (void)keyDown:(id)sender
index bc0e9ac71c384010952b73c0af4a8a5ea240100c..def2b197a358f84aecc4f5116722eb40968754b3 100644 (file)
                141BF44B096A45C800E0753C /* PluginObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 141BF446096A45C800E0753C /* PluginObject.c */; };
                141BF44C096A45C800E0753C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 141BF448096A45C800E0753C /* Info.plist */; };
                141BF453096A45EB00E0753C /* PluginObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 141BF447096A45C800E0753C /* PluginObject.h */; };
-               1422A1BA0AF6EDD600E1A883 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1422A1B80AF6EDD600E1A883 /* UIDelegate.h */; };
                14770FE20A22ADF7009342EE /* GCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14770FE00A22ADF7009342EE /* GCController.h */; };
-               14770FE30A22ADF7009342EE /* GCController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 14770FE10A22ADF7009342EE /* GCController.mm */; };
-               14A6FB8A0971CAE5008B014F /* NavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14A6FB880971CAE5008B014F /* NavigationController.h */; };
-               14A6FB8B0971CAE5008B014F /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14A6FB890971CAE5008B014F /* NavigationController.m */; };
-               1A6CA8DE0B7122D100A24B62 /* ResourceLoadDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6CA8640B7120CF00A24B62 /* ResourceLoadDelegate.m */; };
                1A8F02E70BB9B4EC008CFA34 /* TestObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A8F024D0BB9B056008CFA34 /* TestObject.c */; };
                1A8F02E80BB9B4EC008CFA34 /* TestObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F024C0BB9B056008CFA34 /* TestObject.h */; };
-               22181BD109DC8C4B008342E8 /* ObjCPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 22181BCD09DC8C4B008342E8 /* ObjCPlugin.h */; };
-               22181BD209DC8C4B008342E8 /* ObjCPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 22181BCE09DC8C4B008342E8 /* ObjCPlugin.m */; };
-               22181BD309DC8C4B008342E8 /* ObjCPluginFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 22181BCF09DC8C4B008342E8 /* ObjCPluginFunction.h */; };
-               22181BD409DC8C4B008342E8 /* ObjCPluginFunction.m in Sources */ = {isa = PBXBuildFile; fileRef = 22181BD009DC8C4B008342E8 /* ObjCPluginFunction.m */; };
-               6508A2990BFABB8100AD2696 /* FrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 6508A26C0BFAB71B00AD2696 /* FrameLoadDelegate.h */; };
-               6508A29A0BFABB8200AD2696 /* ResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6CA8630B7120CF00A24B62 /* ResourceLoadDelegate.h */; };
                9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; };
                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
-               93442CF608F8BA4900BFE8CA /* TextInputController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93442CF408F8BA4900BFE8CA /* TextInputController.h */; };
-               93442CF708F8BA4900BFE8CA /* TextInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93442CF508F8BA4900BFE8CA /* TextInputController.m */; };
-               A803FCC709CAAB8D009B2A37 /* EventSendingController.m in Sources */ = {isa = PBXBuildFile; fileRef = A803FCB809CAAAB1009B2A37 /* EventSendingController.m */; };
-               A803FCC809CAAB90009B2A37 /* EventSendingController.h in Headers */ = {isa = PBXBuildFile; fileRef = A803FCB709CAAAB0009B2A37 /* EventSendingController.h */; };
-               A803FFBD09CAAE99009B2A37 /* DumpRenderTreeDraggingInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = A803FFB309CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.m */; };
-               A803FFBE09CAAE9C009B2A37 /* DumpRenderTreeDraggingInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = A803FFB209CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.h */; };
-               A803FFF509CAAFE0009B2A37 /* EditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = A803FFF309CAAFE0009B2A37 /* EditingDelegate.h */; };
-               A803FFF609CAAFE0009B2A37 /* EditingDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A803FFF409CAAFE0009B2A37 /* EditingDelegate.m */; };
                A817090008B163EF00CCB9FB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
                A817090208B1643800CCB9FB /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090108B1643800CCB9FB /* WebCore.framework */; };
                A817090408B164D300CCB9FB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090308B164D300CCB9FB /* JavaScriptCore.framework */; };
                A84F608A08B136DA00E9745F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
                AE8259F308D22463000507AB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
                AE8259F408D22463000507AB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
-               B5A752A008AF5CD400138E45 /* ImageDiff.m in Sources */ = {isa = PBXBuildFile; fileRef = B5A7525808AF4A3600138E45 /* ImageDiff.m */; };
                B5A752A208AF5D1F00138E45 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5A752A108AF5D1F00138E45 /* QuartzCore.framework */; };
                BC0131DA0C9772010087317D /* LayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0131D80C9772010087317D /* LayoutTestController.cpp */; };
                BC0131DB0C9772010087317D /* LayoutTestController.h in Headers */ = {isa = PBXBuildFile; fileRef = BC0131D90C9772010087317D /* LayoutTestController.h */; };
-               BC0131EF0C9774700087317D /* WorkQueueItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC0131EE0C9774700087317D /* WorkQueueItemMac.mm */; };
                BC9D90240C97472E0099A4A3 /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */; };
                BC9D90250C97472E0099A4A3 /* WorkQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9D90220C97472E0099A4A3 /* WorkQueue.h */; };
                BC9D90260C97472E0099A4A3 /* WorkQueueItem.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9D90230C97472E0099A4A3 /* WorkQueueItem.h */; };
-               BCA51CFD0C95DFB30076A81A /* FrameLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA51CFC0C95DFB30076A81A /* FrameLoadDelegate.mm */; };
+               BCA18B230C9B014B00114369 /* GCControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B210C9B014B00114369 /* GCControllerMac.mm */; };
+               BCA18B240C9B014B00114369 /* LayoutTestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B220C9B014B00114369 /* LayoutTestControllerMac.mm */; };
+               BCA18B260C9B015C00114369 /* WorkQueueItemMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B250C9B015C00114369 /* WorkQueueItemMac.mm */; };
+               BCA18B310C9B01B400114369 /* ObjCController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B2F0C9B01B400114369 /* ObjCController.h */; };
+               BCA18B320C9B01B400114369 /* ObjCController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B300C9B01B400114369 /* ObjCController.m */; };
+               BCA18B380C9B021900114369 /* AppleScriptController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B360C9B021900114369 /* AppleScriptController.h */; };
+               BCA18B390C9B021900114369 /* AppleScriptController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B370C9B021900114369 /* AppleScriptController.m */; };
+               BCA18B3C0C9B024900114369 /* TextInputController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B3A0C9B024900114369 /* TextInputController.h */; };
+               BCA18B490C9B02C400114369 /* TextInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B480C9B02C400114369 /* TextInputController.m */; };
+               BCA18B610C9B08C200114369 /* EditingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B570C9B08C200114369 /* EditingDelegate.h */; };
+               BCA18B620C9B08C200114369 /* EditingDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B580C9B08C200114369 /* EditingDelegate.mm */; };
+               BCA18B630C9B08C200114369 /* FrameLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B590C9B08C200114369 /* FrameLoadDelegate.h */; };
+               BCA18B640C9B08C200114369 /* FrameLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5A0C9B08C200114369 /* FrameLoadDelegate.mm */; };
+               BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5B0C9B08C200114369 /* PolicyDelegate.h */; };
+               BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5C0C9B08C200114369 /* PolicyDelegate.mm */; };
+               BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5D0C9B08C200114369 /* ResourceLoadDelegate.h */; };
+               BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B5E0C9B08C200114369 /* ResourceLoadDelegate.mm */; };
+               BCA18B690C9B08C200114369 /* UIDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B5F0C9B08C200114369 /* UIDelegate.h */; };
+               BCA18B6A0C9B08C200114369 /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B600C9B08C200114369 /* UIDelegate.mm */; };
+               BCA18B6F0C9B08DB00114369 /* EventSendingController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B6B0C9B08DB00114369 /* EventSendingController.h */; };
+               BCA18B700C9B08DB00114369 /* EventSendingController.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B6C0C9B08DB00114369 /* EventSendingController.mm */; };
+               BCA18B710C9B08DB00114369 /* NavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B6D0C9B08DB00114369 /* NavigationController.h */; };
+               BCA18B720C9B08DB00114369 /* NavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B6E0C9B08DB00114369 /* NavigationController.m */; };
+               BCA18B7A0C9B08F100114369 /* DumpRenderTreeDraggingInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B730C9B08F100114369 /* DumpRenderTreeDraggingInfo.h */; };
+               BCA18B7B0C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B740C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm */; };
+               BCA18B7D0C9B08F100114369 /* ObjCPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B760C9B08F100114369 /* ObjCPlugin.h */; };
+               BCA18B7E0C9B08F100114369 /* ObjCPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B770C9B08F100114369 /* ObjCPlugin.m */; };
+               BCA18B7F0C9B08F100114369 /* ObjCPluginFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA18B780C9B08F100114369 /* ObjCPluginFunction.h */; };
+               BCA18B800C9B08F100114369 /* ObjCPluginFunction.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B790C9B08F100114369 /* ObjCPluginFunction.m */; };
+               BCA18B9C0C9B09B400114369 /* ImageDiff.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA18B750C9B08F100114369 /* ImageDiff.m */; };
                BCA51D090C95DFE80076A81A /* DumpRenderTree.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA51D080C95DFE80076A81A /* DumpRenderTree.mm */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
-               BCA51DE60C95E9BC0076A81A /* UIDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA51DE50C95E9BC0076A81A /* UIDelegate.mm */; };
-               BCA51F970C960CFC0076A81A /* LayoutTestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCA51F960C960CFC0076A81A /* LayoutTestControllerMac.mm */; };
-               BCA876B70C921FA100946E9C /* ObjCController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA876B50C921FA100946E9C /* ObjCController.h */; };
-               BCA876B80C921FA100946E9C /* ObjCController.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA876B60C921FA100946E9C /* ObjCController.m */; };
                BCF6C6500C98E9C000AC063E /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF6C64F0C98E9C000AC063E /* GCController.cpp */; };
-               D23AE9660C56BB2100C47236 /* PolicyDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */; };
-               D23AE9690C56BB2900C47236 /* PolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */; };
-               E1330800099624DA00AC0A91 /* AppleScriptController.h in Headers */ = {isa = PBXBuildFile; fileRef = E13307FE099624DA00AC0A91 /* AppleScriptController.h */; };
-               E1330801099624DA00AC0A91 /* AppleScriptController.m in Sources */ = {isa = PBXBuildFile; fileRef = E13307FF099624DA00AC0A91 /* AppleScriptController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
                141BF446096A45C800E0753C /* PluginObject.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = PluginObject.c; sourceTree = "<group>"; };
                141BF447096A45C800E0753C /* PluginObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginObject.h; sourceTree = "<group>"; };
                141BF448096A45C800E0753C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
-               1422A1B80AF6EDD600E1A883 /* UIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDelegate.h; sourceTree = "<group>"; };
                14770FE00A22ADF7009342EE /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
-               14770FE10A22ADF7009342EE /* GCController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GCController.mm; sourceTree = "<group>"; };
-               14A6FB880971CAE5008B014F /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationController.h; sourceTree = "<group>"; };
-               14A6FB890971CAE5008B014F /* NavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigationController.m; sourceTree = "<group>"; };
-               1A6CA8630B7120CF00A24B62 /* ResourceLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoadDelegate.h; sourceTree = "<group>"; };
-               1A6CA8640B7120CF00A24B62 /* ResourceLoadDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResourceLoadDelegate.m; sourceTree = "<group>"; };
                1A8F024C0BB9B056008CFA34 /* TestObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestObject.h; sourceTree = "<group>"; };
                1A8F024D0BB9B056008CFA34 /* TestObject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TestObject.c; sourceTree = "<group>"; };
-               22181BCD09DC8C4B008342E8 /* ObjCPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ObjCPlugin.h; sourceTree = "<group>"; };
-               22181BCE09DC8C4B008342E8 /* ObjCPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ObjCPlugin.m; sourceTree = "<group>"; };
-               22181BCF09DC8C4B008342E8 /* ObjCPluginFunction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ObjCPluginFunction.h; sourceTree = "<group>"; };
-               22181BD009DC8C4B008342E8 /* ObjCPluginFunction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ObjCPluginFunction.m; sourceTree = "<group>"; };
                32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreePrefix.h; sourceTree = "<group>"; };
-               6508A26C0BFAB71B00AD2696 /* FrameLoadDelegate.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; path = FrameLoadDelegate.h; sourceTree = "<group>"; };
                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-               9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
-               93442CF408F8BA4900BFE8CA /* TextInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInputController.h; sourceTree = "<group>"; };
-               93442CF508F8BA4900BFE8CA /* TextInputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextInputController.m; sourceTree = "<group>"; };
+               9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
                9345229C0BD12B710086EDA0 /* AHEM____.TTF */ = {isa = PBXFileReference; explicitFileType = file; name = AHEM____.TTF; path = DumpRenderTree.qtproj/fonts/AHEM____.TTF; sourceTree = "<group>"; };
-               A803FCB709CAAAB0009B2A37 /* EventSendingController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EventSendingController.h; sourceTree = "<group>"; };
-               A803FCB809CAAAB1009B2A37 /* EventSendingController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = EventSendingController.m; sourceTree = "<group>"; };
-               A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTree.h; sourceTree = "<group>"; };
-               A803FFB209CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreeDraggingInfo.h; sourceTree = "<group>"; };
-               A803FFB309CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = DumpRenderTreeDraggingInfo.m; sourceTree = "<group>"; };
-               A803FFF309CAAFE0009B2A37 /* EditingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EditingDelegate.h; sourceTree = "<group>"; };
-               A803FFF409CAAFE0009B2A37 /* EditingDelegate.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = EditingDelegate.m; sourceTree = "<group>"; };
+               A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DumpRenderTree.h; sourceTree = "<group>"; };
                A817090108B1643800CCB9FB /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                A817090308B164D300CCB9FB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                A84F608908B136DA00E9745F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                AE8257EF08D22389000507AB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-               B5A7525808AF4A3600138E45 /* ImageDiff.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ImageDiff.m; sourceTree = "<group>"; };
                B5A7526708AF4A4A00138E45 /* ImageDiff */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ImageDiff; sourceTree = BUILT_PRODUCTS_DIR; };
                B5A752A108AF5D1F00138E45 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
                BC0131D80C9772010087317D /* LayoutTestController.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = LayoutTestController.cpp; sourceTree = "<group>"; };
                BC0131D90C9772010087317D /* LayoutTestController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutTestController.h; sourceTree = "<group>"; };
-               BC0131EE0C9774700087317D /* WorkQueueItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkQueueItemMac.mm; sourceTree = "<group>"; };
                BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 30; path = WorkQueue.cpp; sourceTree = "<group>"; };
                BC9D90220C97472E0099A4A3 /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
                BC9D90230C97472E0099A4A3 /* WorkQueueItem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WorkQueueItem.h; sourceTree = "<group>"; };
-               BCA51CFC0C95DFB30076A81A /* FrameLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameLoadDelegate.mm; sourceTree = "<group>"; };
+               BCA18B210C9B014B00114369 /* GCControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = GCControllerMac.mm; path = mac/GCControllerMac.mm; sourceTree = "<group>"; };
+               BCA18B220C9B014B00114369 /* LayoutTestControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = LayoutTestControllerMac.mm; path = mac/LayoutTestControllerMac.mm; sourceTree = "<group>"; };
+               BCA18B250C9B015C00114369 /* WorkQueueItemMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = WorkQueueItemMac.mm; path = mac/WorkQueueItemMac.mm; sourceTree = "<group>"; };
+               BCA18B2F0C9B01B400114369 /* ObjCController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ObjCController.h; path = mac/ObjCController.h; sourceTree = "<group>"; };
+               BCA18B300C9B01B400114369 /* ObjCController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ObjCController.m; path = mac/ObjCController.m; sourceTree = "<group>"; };
+               BCA18B360C9B021900114369 /* AppleScriptController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleScriptController.h; path = mac/AppleScriptController.h; sourceTree = "<group>"; };
+               BCA18B370C9B021900114369 /* AppleScriptController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AppleScriptController.m; path = mac/AppleScriptController.m; sourceTree = "<group>"; };
+               BCA18B3A0C9B024900114369 /* TextInputController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextInputController.h; path = mac/TextInputController.h; sourceTree = "<group>"; };
+               BCA18B480C9B02C400114369 /* TextInputController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TextInputController.m; path = mac/TextInputController.m; sourceTree = "<group>"; };
+               BCA18B570C9B08C200114369 /* EditingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EditingDelegate.h; path = mac/EditingDelegate.h; sourceTree = "<group>"; };
+               BCA18B580C9B08C200114369 /* EditingDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = EditingDelegate.mm; path = mac/EditingDelegate.mm; sourceTree = "<group>"; };
+               BCA18B590C9B08C200114369 /* FrameLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FrameLoadDelegate.h; path = mac/FrameLoadDelegate.h; sourceTree = "<group>"; };
+               BCA18B5A0C9B08C200114369 /* FrameLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = FrameLoadDelegate.mm; path = mac/FrameLoadDelegate.mm; sourceTree = "<group>"; };
+               BCA18B5B0C9B08C200114369 /* PolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PolicyDelegate.h; path = mac/PolicyDelegate.h; sourceTree = "<group>"; };
+               BCA18B5C0C9B08C200114369 /* PolicyDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = PolicyDelegate.mm; path = mac/PolicyDelegate.mm; sourceTree = "<group>"; };
+               BCA18B5D0C9B08C200114369 /* ResourceLoadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ResourceLoadDelegate.h; path = mac/ResourceLoadDelegate.h; sourceTree = "<group>"; };
+               BCA18B5E0C9B08C200114369 /* ResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = ResourceLoadDelegate.mm; path = mac/ResourceLoadDelegate.mm; sourceTree = "<group>"; };
+               BCA18B5F0C9B08C200114369 /* UIDelegate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UIDelegate.h; path = mac/UIDelegate.h; sourceTree = "<group>"; };
+               BCA18B600C9B08C200114369 /* UIDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = UIDelegate.mm; path = mac/UIDelegate.mm; sourceTree = "<group>"; };
+               BCA18B6B0C9B08DB00114369 /* EventSendingController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EventSendingController.h; path = mac/EventSendingController.h; sourceTree = "<group>"; };
+               BCA18B6C0C9B08DB00114369 /* EventSendingController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = EventSendingController.mm; path = mac/EventSendingController.mm; sourceTree = "<group>"; };
+               BCA18B6D0C9B08DB00114369 /* NavigationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NavigationController.h; path = mac/NavigationController.h; sourceTree = "<group>"; };
+               BCA18B6E0C9B08DB00114369 /* NavigationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NavigationController.m; path = mac/NavigationController.m; sourceTree = "<group>"; };
+               BCA18B730C9B08F100114369 /* DumpRenderTreeDraggingInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DumpRenderTreeDraggingInfo.h; path = mac/DumpRenderTreeDraggingInfo.h; sourceTree = "<group>"; };
+               BCA18B740C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = DumpRenderTreeDraggingInfo.mm; path = mac/DumpRenderTreeDraggingInfo.mm; sourceTree = "<group>"; };
+               BCA18B750C9B08F100114369 /* ImageDiff.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ImageDiff.m; path = mac/ImageDiff.m; sourceTree = "<group>"; };
+               BCA18B760C9B08F100114369 /* ObjCPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ObjCPlugin.h; path = mac/ObjCPlugin.h; sourceTree = "<group>"; };
+               BCA18B770C9B08F100114369 /* ObjCPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ObjCPlugin.m; path = mac/ObjCPlugin.m; sourceTree = "<group>"; };
+               BCA18B780C9B08F100114369 /* ObjCPluginFunction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ObjCPluginFunction.h; path = mac/ObjCPluginFunction.h; sourceTree = "<group>"; };
+               BCA18B790C9B08F100114369 /* ObjCPluginFunction.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ObjCPluginFunction.m; path = mac/ObjCPluginFunction.m; sourceTree = "<group>"; };
                BCA51D080C95DFE80076A81A /* DumpRenderTree.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = DumpRenderTree.mm; sourceTree = "<group>"; };
-               BCA51DE50C95E9BC0076A81A /* UIDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = UIDelegate.mm; sourceTree = "<group>"; };
-               BCA51F960C960CFC0076A81A /* LayoutTestControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayoutTestControllerMac.mm; sourceTree = "<group>"; };
-               BCA876B50C921FA100946E9C /* ObjCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCController.h; sourceTree = "<group>"; };
-               BCA876B60C921FA100946E9C /* ObjCController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCController.m; sourceTree = "<group>"; };
                BCF6C64F0C98E9C000AC063E /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GCController.cpp; sourceTree = "<group>"; };
-               D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PolicyDelegate.h; sourceTree = "<group>"; };
-               D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PolicyDelegate.m; sourceTree = "<group>"; };
-               E13307FE099624DA00AC0A91 /* AppleScriptController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppleScriptController.h; sourceTree = "<group>"; };
-               E13307FF099624DA00AC0A91 /* AppleScriptController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppleScriptController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
                                141BF1F5096A439800E0753C /* TestNetscapePlugIn.subproj */,
                                A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */,
                                BCA51D080C95DFE80076A81A /* DumpRenderTree.mm */,
-                               A803FFB209CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.h */,
-                               A803FFB309CAAE0B009B2A37 /* DumpRenderTreeDraggingInfo.m */,
-                               B5A7525808AF4A3600138E45 /* ImageDiff.m */,
-                               22181BCD09DC8C4B008342E8 /* ObjCPlugin.h */,
-                               22181BCE09DC8C4B008342E8 /* ObjCPlugin.m */,
-                               22181BCF09DC8C4B008342E8 /* ObjCPluginFunction.h */,
-                               22181BD009DC8C4B008342E8 /* ObjCPluginFunction.m */,
+                               BCA18B730C9B08F100114369 /* DumpRenderTreeDraggingInfo.h */,
+                               BCA18B740C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm */,
+                               BCA18B750C9B08F100114369 /* ImageDiff.m */,
+                               BCA18B760C9B08F100114369 /* ObjCPlugin.h */,
+                               BCA18B770C9B08F100114369 /* ObjCPlugin.m */,
+                               BCA18B780C9B08F100114369 /* ObjCPluginFunction.h */,
+                               BCA18B790C9B08F100114369 /* ObjCPluginFunction.m */,
                                BC9D90210C97472D0099A4A3 /* WorkQueue.cpp */,
                                BC9D90220C97472E0099A4A3 /* WorkQueue.h */,
                                BC9D90230C97472E0099A4A3 /* WorkQueueItem.h */,
-                               BC0131EE0C9774700087317D /* WorkQueueItemMac.mm */,
+                               BCA18B250C9B015C00114369 /* WorkQueueItemMac.mm */,
                                A803FF6409CAACC1009B2A37 /* Frameworks */,
                                9340995508540CAF007F3BC8 /* Products */,
                        );
                1422A2690AF6F45200E1A883 /* Controllers */ = {
                        isa = PBXGroup;
                        children = (
-                               E13307FE099624DA00AC0A91 /* AppleScriptController.h */,
-                               E13307FF099624DA00AC0A91 /* AppleScriptController.m */,
-                               A803FCB709CAAAB0009B2A37 /* EventSendingController.h */,
-                               A803FCB809CAAAB1009B2A37 /* EventSendingController.m */,
+                               BCA18B360C9B021900114369 /* AppleScriptController.h */,
+                               BCA18B370C9B021900114369 /* AppleScriptController.m */,
+                               BCA18B6B0C9B08DB00114369 /* EventSendingController.h */,
+                               BCA18B6C0C9B08DB00114369 /* EventSendingController.mm */,
                                BCF6C64F0C98E9C000AC063E /* GCController.cpp */,
                                14770FE00A22ADF7009342EE /* GCController.h */,
-                               14770FE10A22ADF7009342EE /* GCController.mm */,
+                               BCA18B210C9B014B00114369 /* GCControllerMac.mm */,
                                BC0131D80C9772010087317D /* LayoutTestController.cpp */,
                                BC0131D90C9772010087317D /* LayoutTestController.h */,
-                               BCA51F960C960CFC0076A81A /* LayoutTestControllerMac.mm */,
-                               14A6FB880971CAE5008B014F /* NavigationController.h */,
-                               14A6FB890971CAE5008B014F /* NavigationController.m */,
-                               BCA876B50C921FA100946E9C /* ObjCController.h */,
-                               BCA876B60C921FA100946E9C /* ObjCController.m */,
-                               93442CF408F8BA4900BFE8CA /* TextInputController.h */,
-                               93442CF508F8BA4900BFE8CA /* TextInputController.m */,
+                               BCA18B220C9B014B00114369 /* LayoutTestControllerMac.mm */,
+                               BCA18B6D0C9B08DB00114369 /* NavigationController.h */,
+                               BCA18B6E0C9B08DB00114369 /* NavigationController.m */,
+                               BCA18B2F0C9B01B400114369 /* ObjCController.h */,
+                               BCA18B300C9B01B400114369 /* ObjCController.m */,
+                               BCA18B3A0C9B024900114369 /* TextInputController.h */,
+                               BCA18B480C9B02C400114369 /* TextInputController.m */,
                        );
                        name = Controllers;
                        sourceTree = "<group>";
                1422A2750AF6F4BD00E1A883 /* Delegates */ = {
                        isa = PBXGroup;
                        children = (
-                               6508A26C0BFAB71B00AD2696 /* FrameLoadDelegate.h */,
-                               BCA51CFC0C95DFB30076A81A /* FrameLoadDelegate.mm */,
-                               A803FFF309CAAFE0009B2A37 /* EditingDelegate.h */,
-                               A803FFF409CAAFE0009B2A37 /* EditingDelegate.m */,
-                               D23AE8E00C56B29E00C47236 /* PolicyDelegate.h */,
-                               D23AE8EA0C56B2FF00C47236 /* PolicyDelegate.m */,
-                               1A6CA8630B7120CF00A24B62 /* ResourceLoadDelegate.h */,
-                               1A6CA8640B7120CF00A24B62 /* ResourceLoadDelegate.m */,
-                               1422A1B80AF6EDD600E1A883 /* UIDelegate.h */,
-                               BCA51DE50C95E9BC0076A81A /* UIDelegate.mm */,
+                               BCA18B570C9B08C200114369 /* EditingDelegate.h */,
+                               BCA18B580C9B08C200114369 /* EditingDelegate.mm */,
+                               BCA18B590C9B08C200114369 /* FrameLoadDelegate.h */,
+                               BCA18B5A0C9B08C200114369 /* FrameLoadDelegate.mm */,
+                               BCA18B5B0C9B08C200114369 /* PolicyDelegate.h */,
+                               BCA18B5C0C9B08C200114369 /* PolicyDelegate.mm */,
+                               BCA18B5D0C9B08C200114369 /* ResourceLoadDelegate.h */,
+                               BCA18B5E0C9B08C200114369 /* ResourceLoadDelegate.mm */,
+                               BCA18B5F0C9B08C200114369 /* UIDelegate.h */,
+                               BCA18B600C9B08C200114369 /* UIDelegate.mm */,
                        );
                        name = Delegates;
                        sourceTree = "<group>";
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A803FFBE09CAAE9C009B2A37 /* DumpRenderTreeDraggingInfo.h in Headers */,
-                               A803FCC809CAAB90009B2A37 /* EventSendingController.h in Headers */,
                                9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */,
-                               93442CF608F8BA4900BFE8CA /* TextInputController.h in Headers */,
-                               14A6FB8A0971CAE5008B014F /* NavigationController.h in Headers */,
-                               E1330800099624DA00AC0A91 /* AppleScriptController.h in Headers */,
-                               A803FFF509CAAFE0009B2A37 /* EditingDelegate.h in Headers */,
-                               22181BD109DC8C4B008342E8 /* ObjCPlugin.h in Headers */,
-                               22181BD309DC8C4B008342E8 /* ObjCPluginFunction.h in Headers */,
                                14770FE20A22ADF7009342EE /* GCController.h in Headers */,
-                               1422A1BA0AF6EDD600E1A883 /* UIDelegate.h in Headers */,
-                               6508A2990BFABB8100AD2696 /* FrameLoadDelegate.h in Headers */,
-                               6508A29A0BFABB8200AD2696 /* ResourceLoadDelegate.h in Headers */,
-                               D23AE9690C56BB2900C47236 /* PolicyDelegate.h in Headers */,
-                               BCA876B70C921FA100946E9C /* ObjCController.h in Headers */,
                                BC9D90250C97472E0099A4A3 /* WorkQueue.h in Headers */,
                                BC9D90260C97472E0099A4A3 /* WorkQueueItem.h in Headers */,
                                BC0131DB0C9772010087317D /* LayoutTestController.h in Headers */,
+                               BCA18B310C9B01B400114369 /* ObjCController.h in Headers */,
+                               BCA18B380C9B021900114369 /* AppleScriptController.h in Headers */,
+                               BCA18B3C0C9B024900114369 /* TextInputController.h in Headers */,
+                               BCA18B610C9B08C200114369 /* EditingDelegate.h in Headers */,
+                               BCA18B630C9B08C200114369 /* FrameLoadDelegate.h in Headers */,
+                               BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */,
+                               BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */,
+                               BCA18B690C9B08C200114369 /* UIDelegate.h in Headers */,
+                               BCA18B6F0C9B08DB00114369 /* EventSendingController.h in Headers */,
+                               BCA18B710C9B08DB00114369 /* NavigationController.h in Headers */,
+                               BCA18B7A0C9B08F100114369 /* DumpRenderTreeDraggingInfo.h in Headers */,
+                               BCA18B7D0C9B08F100114369 /* ObjCPlugin.h in Headers */,
+                               BCA18B7F0C9B08F100114369 /* ObjCPluginFunction.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               A803FFBD09CAAE99009B2A37 /* DumpRenderTreeDraggingInfo.m in Sources */,
-                               A803FCC709CAAB8D009B2A37 /* EventSendingController.m in Sources */,
-                               93442CF708F8BA4900BFE8CA /* TextInputController.m in Sources */,
-                               14A6FB8B0971CAE5008B014F /* NavigationController.m in Sources */,
-                               E1330801099624DA00AC0A91 /* AppleScriptController.m in Sources */,
-                               A803FFF609CAAFE0009B2A37 /* EditingDelegate.m in Sources */,
-                               22181BD209DC8C4B008342E8 /* ObjCPlugin.m in Sources */,
-                               22181BD409DC8C4B008342E8 /* ObjCPluginFunction.m in Sources */,
-                               14770FE30A22ADF7009342EE /* GCController.mm in Sources */,
-                               1A6CA8DE0B7122D100A24B62 /* ResourceLoadDelegate.m in Sources */,
-                               D23AE9660C56BB2100C47236 /* PolicyDelegate.m in Sources */,
-                               BCA876B80C921FA100946E9C /* ObjCController.m in Sources */,
-                               BCA51CFD0C95DFB30076A81A /* FrameLoadDelegate.mm in Sources */,
                                BCA51D090C95DFE80076A81A /* DumpRenderTree.mm in Sources */,
-                               BCA51DE60C95E9BC0076A81A /* UIDelegate.mm in Sources */,
-                               BCA51F970C960CFC0076A81A /* LayoutTestControllerMac.mm in Sources */,
                                BC9D90240C97472E0099A4A3 /* WorkQueue.cpp in Sources */,
                                BC0131DA0C9772010087317D /* LayoutTestController.cpp in Sources */,
-                               BC0131EF0C9774700087317D /* WorkQueueItemMac.mm in Sources */,
                                BCF6C6500C98E9C000AC063E /* GCController.cpp in Sources */,
+                               BCA18B230C9B014B00114369 /* GCControllerMac.mm in Sources */,
+                               BCA18B240C9B014B00114369 /* LayoutTestControllerMac.mm in Sources */,
+                               BCA18B260C9B015C00114369 /* WorkQueueItemMac.mm in Sources */,
+                               BCA18B320C9B01B400114369 /* ObjCController.m in Sources */,
+                               BCA18B390C9B021900114369 /* AppleScriptController.m in Sources */,
+                               BCA18B490C9B02C400114369 /* TextInputController.m in Sources */,
+                               BCA18B620C9B08C200114369 /* EditingDelegate.mm in Sources */,
+                               BCA18B640C9B08C200114369 /* FrameLoadDelegate.mm in Sources */,
+                               BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */,
+                               BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */,
+                               BCA18B6A0C9B08C200114369 /* UIDelegate.mm in Sources */,
+                               BCA18B700C9B08DB00114369 /* EventSendingController.mm in Sources */,
+                               BCA18B720C9B08DB00114369 /* NavigationController.m in Sources */,
+                               BCA18B7B0C9B08F100114369 /* DumpRenderTreeDraggingInfo.mm in Sources */,
+                               BCA18B7E0C9B08F100114369 /* ObjCPlugin.m in Sources */,
+                               BCA18B800C9B08F100114369 /* ObjCPluginFunction.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               B5A752A008AF5CD400138E45 /* ImageDiff.m in Sources */,
+                               BCA18B9C0C9B09B400114369 /* ImageDiff.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index 83c456e7e8fbf41dd59e0eda9e42a0a7c197bc75..ef874bbf0dd24af7ac788897ab0467bd9eb11907 100644 (file)
 #include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSRetainPtr.h>
 
-LayoutTestController::LayoutTestController()
+LayoutTestController::LayoutTestController(bool testRepaintDefault, bool testRepaintSweepHorizontallyDefault)
+    : m_dumpAsText(false)
+    , m_dumpBackForwardList(false)
+    , m_dumpChildFrameScrollPositions(false)
+    , m_dumpChildFramesAsText(false)
+    , m_dumpDOMAsWebArchive(false)
+    , m_dumpSelectionRect(false)
+    , m_dumpSourceAsWebArchive(false)
+    , m_dumpTitleChanges(false)
+    , m_dumpEditingCallbacks(false)
+    , m_dumpResourceLoadCallbacks(false)
+    , m_dumpFrameLoadCallbacks(false)
+    , m_addFileToPasteboardOnDrag(false)
+    , m_callCloseOnWebViews(true)
+    , m_canOpenWindows(false)
+    , m_closeRemainingWindowsWhenComplete(true)
+    , m_testRepaint(testRepaintDefault)
+    , m_testRepaintSweepHorizontally(testRepaintSweepHorizontallyDefault)
+    , m_waitToDump(false)
+    , m_windowIsKey(true)
 {
 }
 
@@ -47,83 +66,84 @@ LayoutTestController::~LayoutTestController()
 static JSValueRef dumpAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpAsText();
+    controller->setDumpAsText(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpBackForwardListCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpBackForwardList();
+    controller->setDumpBackForwardList(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpChildFramesAsTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpChildFramesAsText();
+    controller->setDumpChildFramesAsText(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpChildFrameScrollPositionsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpChildFrameScrollPositions();
+    controller->setDumpChildFrameScrollPositions(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpDOMAsWebArchiveCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpDOMAsWebArchive();
+    controller->setDumpDOMAsWebArchive(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpEditingCallbacksCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpEditingCallbacks();
+    controller->setDumpEditingCallbacks(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpFrameLoadCallbacksCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpFrameLoadCallbacks();
+    controller->setDumpFrameLoadCallbacks(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpResourceLoadCallbacksCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpResourceLoadCallbacks();
+    controller->setDumpResourceLoadCallbacks(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpSelectionRectCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpSelectionRect();
+    controller->setDumpSelectionRect(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpSourceAsWebArchiveCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpSourceAsWebArchive();
+    controller->setDumpSourceAsWebArchive(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef dumpTitleChangesCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->dumpTitleChanges();
+    controller->setDumpTitleChanges(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef repaintSweepHorizontallyCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    repaintSweepHorizontally = true;
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setTestRepaintSweepHorizontally(true);
     return JSValueMakeUndefined(context);
 }
 
@@ -132,13 +152,15 @@ static JSValueRef setCallCloseOnWebViewsCallback(JSContextRef context, JSObjectR
     if (argumentCount < 1)
         return JSValueMakeUndefined(context);
 
-    closeWebViews = JSValueToBoolean(context, arguments[0]);
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setCallCloseOnWebViews(JSValueToBoolean(context, arguments[0]));
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef setCanOpenWindowsCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    canOpenWindows = true;
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setCanOpenWindows(true);
     return JSValueMakeUndefined(context);
 }
 
@@ -147,19 +169,22 @@ static JSValueRef setCloseRemainingWindowsWhenCompleteCallback(JSContextRef cont
     if (argumentCount < 1)
         return JSValueMakeUndefined(context);
 
-    closeRemainingWindowsWhenComplete = JSValueToBoolean(context, arguments[0]);
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setCloseRemainingWindowsWhenComplete(JSValueToBoolean(context, arguments[0]));
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef testRepaintCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    testRepaint = true;
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setTestRepaint(true);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef addFileToPasteboardOnDragCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    addFileToPasteboardOnDrag = YES;
+    LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
+    controller->setAddFileToPasteboardOnDrag(true);
     return JSValueMakeUndefined(context);
 }
 
@@ -428,7 +453,7 @@ static JSValueRef waitUntilDoneCallback(JSContextRef context, JSObjectRef functi
 {
     // Has mac & windows implementation
     LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject));
-    controller->waitUntilDone();
+    controller->setWaitToDump(true);
 
     return JSValueMakeUndefined(context);
 }
index c7380f82bc6b8c5ec2eebed836b312d3788f8c4a..8d70e4f4fd9406d3be9c152b63cf987a87b2b8d6 100644 (file)
 
 class LayoutTestController {
 public:
-    LayoutTestController();
+    LayoutTestController(bool testRepaintDefault, bool testRepaintSweepHorizontallyDefault);
     ~LayoutTestController();
 
     void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);
 
     // Controller Methods - platfrom independant implementations
-    void dumpAsText();
-    void dumpBackForwardList();
-    void dumpChildFramesAsText();
-    void dumpChildFrameScrollPositions();
-    void dumpDOMAsWebArchive();
-    void dumpEditingCallbacks();
-    void dumpFrameLoadCallbacks();
-    void dumpResourceLoadCallbacks();
-    void dumpSelectionRect();
-    void dumpSourceAsWebArchive();
-    void dumpTitleChanges();
-    void repaintSweepHorizontally();
-    void setCallCloseOnWebViews();
-    void setCanOpenWindows();
-    void setCloseRemainingWindowsWhenComplete();
-    void testRepaint();
-    void addFileToPasteboardOnDrag();
     void addDisallowedURL(JSStringRef url);
     void clearBackForwardList();
     JSStringRef copyDecodedHostName(JSStringRef name);
@@ -75,12 +58,86 @@ public:
     void setUseDashboardCompatibilityMode(bool flag);
     void setUserStyleSheetEnabled(bool flag);
     void setUserStyleSheetLocation(JSStringRef path);
-    void setWindowIsKey(bool flag);
-    void waitUntilDone();
     int windowCount();
 
+    bool dumpAsText() const { return m_dumpAsText; }
+    void setDumpAsText(bool dumpAsText) { m_dumpAsText = dumpAsText; }
+
+    bool dumpBackForwardList() const { return m_dumpBackForwardList; }
+    void setDumpBackForwardList(bool dumpBackForwardList) { m_dumpBackForwardList = dumpBackForwardList; }
+
+    bool dumpChildFrameScrollPositions() const { return m_dumpChildFrameScrollPositions; }
+    void setDumpChildFrameScrollPositions(bool dumpChildFrameScrollPositions) { m_dumpChildFrameScrollPositions = dumpChildFrameScrollPositions; }
+
+    bool dumpChildFramesAsText() const { return m_dumpChildFramesAsText; }
+    void setDumpChildFramesAsText(bool dumpChildFramesAsText) { m_dumpChildFramesAsText = dumpChildFramesAsText; }
+
+    bool dumpDOMAsWebArchive() const { return m_dumpDOMAsWebArchive; }
+    void setDumpDOMAsWebArchive(bool dumpDOMAsWebArchive) { m_dumpDOMAsWebArchive = dumpDOMAsWebArchive; }
+
+    bool dumpSelectionRect() const { return m_dumpSelectionRect; }
+    void setDumpSelectionRect(bool dumpSelectionRect) { m_dumpSelectionRect = dumpSelectionRect; }
+
+    bool dumpSourceAsWebArchive() const { return m_dumpSourceAsWebArchive; }
+    void setDumpSourceAsWebArchive(bool dumpSourceAsWebArchive) { m_dumpSourceAsWebArchive = dumpSourceAsWebArchive; }
+
+    bool dumpTitleChanges() const { return m_dumpTitleChanges; }
+    void setDumpTitleChanges(bool dumpTitleChanges) { m_dumpTitleChanges = dumpTitleChanges; }
+
+    bool dumpEditingCallbacks() const { return m_dumpEditingCallbacks; }
+    void setDumpEditingCallbacks(bool dumpEditingCallbacks) { m_dumpEditingCallbacks = dumpEditingCallbacks; }
+
+    bool dumpResourceLoadCallbacks() const { return m_dumpResourceLoadCallbacks; }
+    void setDumpResourceLoadCallbacks(bool dumpResourceLoadCallbacks) { m_dumpResourceLoadCallbacks = dumpResourceLoadCallbacks; }
+
+    bool dumpFrameLoadCallbacks() const { return m_dumpFrameLoadCallbacks; }
+    void setDumpFrameLoadCallbacks(bool dumpFrameLoadCallbacks) { m_dumpFrameLoadCallbacks = dumpFrameLoadCallbacks; }
+
+    bool addFileToPasteboardOnDrag() const { return m_addFileToPasteboardOnDrag; }
+    void setAddFileToPasteboardOnDrag(bool addFileToPasteboardOnDrag) { m_addFileToPasteboardOnDrag = addFileToPasteboardOnDrag; }
+
+    bool callCloseOnWebViews() const { return m_callCloseOnWebViews; }
+    void setCallCloseOnWebViews(bool callCloseOnWebViews) { m_callCloseOnWebViews = callCloseOnWebViews; }
+
+    bool canOpenWindows() const { return m_canOpenWindows; }
+    void setCanOpenWindows(bool canOpenWindows) { m_canOpenWindows = canOpenWindows; }
+
+    bool closeRemainingWindowsWhenComplete() const { return m_closeRemainingWindowsWhenComplete; }
+    void setCloseRemainingWindowsWhenComplete(bool closeRemainingWindowsWhenComplete) { m_closeRemainingWindowsWhenComplete = closeRemainingWindowsWhenComplete; }
+
+    bool testRepaint() const { return m_testRepaint; }
+    void setTestRepaint(bool testRepaint) { m_testRepaint = testRepaint; }
+
+    bool testRepaintSweepHorizontally() const { return m_testRepaintSweepHorizontally; }
+    void setTestRepaintSweepHorizontally(bool testRepaintSweepHorizontally) { m_testRepaintSweepHorizontally = testRepaintSweepHorizontally; }
+
+    bool waitToDump() const { return m_waitToDump; }
+    void setWaitToDump(bool waitToDump);
+
+    bool windowIsKey() const { return m_windowIsKey; }
+    void setWindowIsKey(bool windowIsKey);
 
 private:
+    bool m_dumpAsText;
+    bool m_dumpBackForwardList;
+    bool m_dumpChildFrameScrollPositions;
+    bool m_dumpChildFramesAsText;
+    bool m_dumpDOMAsWebArchive;
+    bool m_dumpSelectionRect;
+    bool m_dumpSourceAsWebArchive;
+    bool m_dumpTitleChanges;
+    bool m_dumpEditingCallbacks;
+    bool m_dumpResourceLoadCallbacks;
+    bool m_dumpFrameLoadCallbacks;
+    bool m_addFileToPasteboardOnDrag;
+    bool m_callCloseOnWebViews;
+    bool m_canOpenWindows;
+    bool m_closeRemainingWindowsWhenComplete;
+    bool m_testRepaint;
+    bool m_testRepaintSweepHorizontally;
+    bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
+    bool m_windowIsKey;
+
     static JSClassRef getJSClass();
     static JSStaticFunction* staticFunctions();
 };
similarity index 88%
rename from WebKitTools/DumpRenderTree/EditingDelegate.m
rename to WebKitTools/DumpRenderTree/mac/EditingDelegate.mm
index 6e38938558a8172ba27583606bc9f24c553bacf1..2ae2a2470c6e3c09dee455214eb2ae310b690f79 100644 (file)
  */
  
 #import "EditingDelegate.h"
-#import "DumpRenderTree.h"
 
+#import "DumpRenderTree.h"
+#import "LayoutTestController.h"
 #import <WebKit/WebKit.h>
 
-extern bool shouldDumpEditingCallbacks;
-
 @interface DOMNode (dumpPath)
 - (NSString *)dumpPath;
 @end
@@ -74,14 +73,14 @@ extern bool shouldDumpEditingCallbacks;
 
 - (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldEndEditingInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldEndEditingInDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
@@ -94,7 +93,7 @@ extern bool shouldDumpEditingCallbacks;
         "WebViewInsertActionDropped",
     };
 
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldInsertNode:%s replacingDOMRange:%s givenAction:%s\n", [[node dumpPath] UTF8String], [[range dump] UTF8String], insertactionstring[action]);
     return acceptsEditing;
 }
@@ -107,14 +106,14 @@ extern bool shouldDumpEditingCallbacks;
         "WebViewInsertActionDropped",
     };
 
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldInsertText:%s replacingDOMRange:%s givenAction:%s\n", [[text description] UTF8String], [[range dump] UTF8String], insertactionstring[action]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldDeleteDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldDeleteDOMRange:%s\n", [[range dump] UTF8String]);
     return acceptsEditing;
 }
@@ -135,52 +134,52 @@ extern bool shouldDumpEditingCallbacks;
         "TRUE"
     };
 
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldChangeSelectedDOMRange:%s toDOMRange:%s affinity:%s stillSelecting:%s\n", [[currentRange dump] UTF8String], [[proposedRange dump] UTF8String], affinitystring[selectionAffinity], boolstring[flag]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldApplyStyle:(DOMCSSStyleDeclaration *)style toElementsInDOMRange:(DOMRange *)range
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n", [[style description] UTF8String], [[range dump] UTF8String]);
     return acceptsEditing;
 }
 
 - (BOOL)webView:(WebView *)webView shouldChangeTypingStyle:(DOMCSSStyleDeclaration *)currentStyle toStyle:(DOMCSSStyleDeclaration *)proposedStyle
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: shouldChangeTypingStyle:%s toStyle:%s\n", [[currentStyle description] UTF8String], [[proposedStyle description] UTF8String]);
     return acceptsEditing;
 }
 
 - (void)webViewDidBeginEditing:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: webViewDidBeginEditing:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChange:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: webViewDidChange:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidEndEditing:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: webViewDidEndEditing:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChangeTypingStyle:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: webViewDidChangeTypingStyle:%s\n", [[notification name] UTF8String]);
 }
 
 - (void)webViewDidChangeSelection:(NSNotification *)notification
 {
-    if (shouldDumpEditingCallbacks && !done)
+    if (layoutTestController->dumpEditingCallbacks() && !done)
         printf("EDITING DELEGATE: webViewDidChangeSelection:%s\n", [[notification name] UTF8String]);
 }
 
similarity index 99%
rename from WebKitTools/DumpRenderTree/EventSendingController.m
rename to WebKitTools/DumpRenderTree/mac/EventSendingController.mm
index 1299634253bac4f40a8aef4e4f9038f21ec8cdbf..015fa32254fc78e8f27f73b2b5f5fc22144bdffb 100644 (file)
@@ -38,7 +38,7 @@
 #import <WebKit/WebKit.h>
 #import <WebKit/DOMPrivate.h>
 
-extern void _NSNewKillRingSequence();
+extern "C" void _NSNewKillRingSequence();
 
 NSPoint lastMousePosition;
 NSArray *webkitDomEventNames;
similarity index 95%
rename from WebKitTools/DumpRenderTree/FrameLoadDelegate.h
rename to WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.h
index e5e8ed90599660b21eac027610ecb07ff8b6a55e..3b86fdf0d8b055a90ed99cf221d680193f2fc8a4 100644 (file)
 
 #import <Foundation/Foundation.h>
 
-class LayoutTestController;
 class GCController;
 
 @interface FrameLoadDelegate : NSObject
 {
-    LayoutTestController* layoutTestContoller;
     GCController* gcController;
 }
 @end
similarity index 89%
rename from WebKitTools/DumpRenderTree/FrameLoadDelegate.mm
rename to WebKitTools/DumpRenderTree/mac/FrameLoadDelegate.mm
index a6cb58494e78b4b692182e8f15d92c0b68506e33..b79154e563ee1ea5ad0a72bfa2b5e0a10dca626c 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#import "DumpRenderTree.h"
 #import "FrameLoadDelegate.h"
 
 #import "AppleScriptController.h"
-#import "DumpRenderTree.h"
 #import "EventSendingController.h"
 #import "GCController.h"
 #import "LayoutTestController.h"
 
 - (id)init
 {
-    if ((self = [super init])) {
-        layoutTestContoller = new LayoutTestController;
+    if ((self = [super init]))
         gcController = new GCController;
-    }
     return self;
 }
 
 - (void)dealloc
 {
-    delete layoutTestContoller;
     delete gcController;
     [super dealloc];
 }
         item->invoke();
         delete item;
     }
-    
+
     // if we didn't start a new load, then we finished all the commands, so we're ready to dump state
-    if (!topLoadingFrame && !waitToDump)
+    if (!topLoadingFrame && !layoutTestController->waitToDump())
         dump();
 }
 
     if ([dataSource webFrame] == topLoadingFrame) {
         topLoadingFrame = nil;
         WorkQueue::shared()->setFrozen(true); // first complete load freezes the queue for the rest of this test
-        if (!waitToDump) {
+        if (!layoutTestController->waitToDump()) {
             if (WorkQueue::shared()->count())
                 [self performSelector:@selector(processWork:) withObject:nil afterDelay:0];
             else
 
 - (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didStartProvisionalLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didCommitLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
     ASSERT(![frame provisionalDataSource]);
     ASSERT([frame dataSource]);
     
-    windowIsKey = YES;
+    layoutTestController->setWindowIsKey(true);
     NSView *documentView = [[mainFrame frameView] documentView];
     [[[mainFrame webView] window] makeFirstResponder:documentView];
     if ([documentView isKindOfClass:[WebHTMLView class]])
 
 - (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFailProvisionalLoadWithError", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
     ASSERT([frame dataSource]);
     ASSERT(frame == [[frame dataSource] webFrame]);
     
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFinishLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame;
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFailLoadWithError", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)webView windowScriptObjectAvailable:(WebScriptObject *)windowScriptObject;
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"?? - windowScriptObjectAvailable"];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)obj forFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didClearWindowObjectForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     JSValueRef exception = 0;
 
-    layoutTestContoller->makeWindowObject(context, globalObject, &exception);
+    ASSERT(layoutTestController);
+    layoutTestController->makeWindowObject(context, globalObject, &exception);
     ASSERT(!exception);
 
     gcController->makeWindowObject(context, globalObject, &exception);
 
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didReceiveTitle: %@", [frame _drt_descriptionSuitableForTestResult], title];
         printf ("%s\n", [string UTF8String]);
     }
     
-    if (dumpTitleChanges)
+    if (layoutTestController->dumpTitleChanges())
         printf("TITLE CHANGED: %s\n", [title UTF8String]);
 }
 
 - (void)webView:(WebView *)sender didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didReceiveServerRedirectForProvisionalLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didReceiveIcon:(NSImage *)image forFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didReceiveIconForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didChangeLocationWithinPageForFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didChangeLocationWithinPageForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender willPerformClientRedirectToURL:(NSURL *)URL delay:(NSTimeInterval)seconds fireDate:(NSDate *)date forFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - willPerformClientRedirectToURL: %@ ", [frame _drt_descriptionSuitableForTestResult], [URL _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didCancelClientRedirectForFrame:(WebFrame *)frame
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didCancelClientRedirectForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender willCloseFrame:(WebFrame *)frame;
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - willCloseFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didFinishDocumentLoadForFrame:(WebFrame *)frame;
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFinishDocumentLoadForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 - (void)webView:(WebView *)sender didHandleOnloadEventsForFrame:(WebFrame *)frame;
 {
-    if (shouldDumpFrameLoadCallbacks && !done) {
+    if (layoutTestController->dumpFrameLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didHandleOnloadEventsForFrame", [frame _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
similarity index 80%
rename from WebKitTools/DumpRenderTree/LayoutTestControllerMac.mm
rename to WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index a2ae56151cf8ca5dcb523e8c1349004f19256cfe..75089cc03d20f3c0306cfaac6d18fbc9aa627a33 100644 (file)
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebView.h>
 #import <WebKit/WebViewPrivate.h>
-
 #import <Foundation/Foundation.h>
 
-void LayoutTestController::dumpAsText()
-{
-    ::dumpAsText = true;
-}
-
-void LayoutTestController::dumpBackForwardList()
-{
-    ::dumpBackForwardList = true;
-}
-
-void LayoutTestController::dumpChildFramesAsText()
-{
-    ::dumpChildFramesAsText = true;
-}
-
-void LayoutTestController::dumpChildFrameScrollPositions()
-{
-    ::dumpChildFrameScrollPositions = true;
-}
-
-void LayoutTestController::dumpDOMAsWebArchive()
-{
-    ::dumpDOMAsWebArchive = true;
-}
-
-void LayoutTestController::dumpEditingCallbacks()
-{
-    ::shouldDumpEditingCallbacks = true;
-}
-
-void LayoutTestController::dumpFrameLoadCallbacks()
-{
-    ::shouldDumpFrameLoadCallbacks = true;
-}
-
-void LayoutTestController::dumpResourceLoadCallbacks()
-{
-    ::shouldDumpResourceLoadCallbacks = true;
-}
-
-void LayoutTestController::dumpSelectionRect()
-{
-    ::dumpSelectionRect = true;
-}
-
-void LayoutTestController::dumpSourceAsWebArchive()
-{
-    ::dumpSourceAsWebArchive = true;
-}
-
-void LayoutTestController::dumpTitleChanges()
-{
-    ::dumpTitleChanges = true;
-}
-
-void LayoutTestController::repaintSweepHorizontally()
-{
-    ::repaintSweepHorizontally = true;
-}
-
-void LayoutTestController::setCallCloseOnWebViews()
-{
-    ::closeWebViews = true;
-}
-
-void LayoutTestController::setCanOpenWindows()
-{
-    ::canOpenWindows = true;
-}
-
-void LayoutTestController::setCloseRemainingWindowsWhenComplete()
-{
-    ::closeRemainingWindowsWhenComplete = true;
-}
-
-void LayoutTestController::testRepaint()
-{
-    ::testRepaint = true;
-}
-
-void LayoutTestController::addFileToPasteboardOnDrag()
-{
-    ::addFileToPasteboardOnDrag = true;
-}
-
 void LayoutTestController::addDisallowedURL(JSStringRef url)
 {
     RetainPtr<CFStringRef> urlCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, url));
@@ -191,9 +105,9 @@ void LayoutTestController::keepWebHistory()
 
 void LayoutTestController::notifyDone()
 {
-    if (waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
+    if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
         dump();
-    waitToDump = false;
+    m_waitToDump = false;
 }
 
 void LayoutTestController::queueBackNavigation(int howFarBack)
@@ -274,14 +188,16 @@ void LayoutTestController::setUserStyleSheetLocation(JSStringRef path)
     [[WebPreferences standardPreferences] setUserStyleSheetLocation:url];
 }
 
-void LayoutTestController::setWindowIsKey(bool flag)
+void LayoutTestController::setWindowIsKey(bool windowIsKey)
 {
-    windowIsKey = flag;
+    m_windowIsKey = windowIsKey;
     NSView *documentView = [[mainFrame frameView] documentView];
     if ([documentView isKindOfClass:[WebHTMLView class]])
         [(WebHTMLView *)documentView _updateActiveState];
 }
 
+static const CFTimeInterval waitToDumpWatchdogInterval = 10.0;
+
 static void waitUntilDoneWatchdogFired(CFRunLoopTimerRef timer, void* info)
 {
     const char* message = "FAIL: Timed out waiting for notifyDone to be called\n";
@@ -290,10 +206,10 @@ static void waitUntilDoneWatchdogFired(CFRunLoopTimerRef timer, void* info)
     dump();
 }
 
-void LayoutTestController::waitUntilDone()
+void LayoutTestController::setWaitToDump(bool waitUntilDone)
 {
-    waitToDump = true;
-    if (!waitToDumpWatchdog)
+    m_waitToDump = waitUntilDone;
+    if (m_waitToDump && !waitToDumpWatchdog)
         waitToDumpWatchdog = CFRunLoopTimerCreate(kCFAllocatorDefault, 0, waitToDumpWatchdogInterval, 0, 0, waitUntilDoneWatchdogFired, NULL);
 }
 
similarity index 93%
rename from WebKitTools/DumpRenderTree/ResourceLoadDelegate.m
rename to WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm
index b894e847b9e08025730c158e1a411a738af549f6..8ad355a85566135ddc546f1c1bd64003843cbab7 100644 (file)
@@ -27,8 +27,9 @@
  */
 
 #import "ResourceLoadDelegate.h"
-#import "DumpRenderTree.h"
 
+#import "DumpRenderTree.h"
+#import "LayoutTestController.h"
 #import <WebKit/WebKit.h>
 
 @interface NSURL (DRTExtras)
 
 - webView: (WebView *)wv identifierForInitialRequest: (NSURLRequest *)request fromDataSource: (WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done)
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done)
         return [[request URL] _drt_descriptionSuitableForTestResult];
     
     return @"<unknown>";
 
 -(NSURLRequest *)webView: (WebView *)wv resource:identifier willSendRequest: (NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse fromDataSource:(WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done) {
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - willSendRequest %@ redirectResponse %@", identifier, [newRequest _drt_descriptionSuitableForTestResult],
             [redirectResponse _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
 
 -(void)webView: (WebView *)wv resource:identifier didReceiveResponse: (NSURLResponse *)response fromDataSource:(WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done) {
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didReceiveResponse %@", identifier, [response _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }    
 
 -(void)webView: (WebView *)wv resource:identifier didFinishLoadingFromDataSource:(WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done) {
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFinishLoading", identifier];
         printf ("%s\n", [string UTF8String]);
     }
 
 -(void)webView: (WebView *)wv resource:identifier didFailLoadingWithError:(NSError *)error fromDataSource:(WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done) {
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - didFailLoadingWithError: %@", identifier, [error _drt_descriptionSuitableForTestResult]];
         printf ("%s\n", [string UTF8String]);
     }
 
 -(NSCachedURLResponse *) webView: (WebView *)wv resource:(id)identifier willCacheResponse:(NSCachedURLResponse *)response fromDataSource:(WebDataSource *)dataSource
 {
-    if (shouldDumpResourceLoadCallbacks && !done) {
+    if (layoutTestController->dumpResourceLoadCallbacks() && !done) {
         NSString *string = [NSString stringWithFormat:@"%@ - willCacheResponse: called", identifier];
         printf ("%s\n", [string UTF8String]);
     }
similarity index 92%
rename from WebKitTools/DumpRenderTree/UIDelegate.mm
rename to WebKitTools/DumpRenderTree/mac/UIDelegate.mm
index 06d39051e5ee1a46cd536099718b3cadb6242c8d..cdb3141e7e1a25dc930d396e9d2a571cc8e4c59e 100644 (file)
 
 #import "DumpRenderTree.h"
 #import "DumpRenderTreeDraggingInfo.h"
+#import "LayoutTestController.h"
 #import "EventSendingController.h"
 #import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebHTMLViewPrivate.h>
 #import <WebKit/WebView.h>
+#import <JavascriptCore/Assertions.h>
 
 DumpRenderTreeDraggingInfo *draggingInfo = nil;
 
@@ -66,7 +68,7 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 - (void)webView:(WebView *)sender dragImage:(NSImage *)anImage at:(NSPoint)viewLocation offset:(NSSize)initialOffset event:(NSEvent *)event pasteboard:(NSPasteboard *)pboard source:(id)sourceObj slideBack:(BOOL)slideFlag forView:(NSView *)view
 {
      assert(!draggingInfo);
-     if (addFileToPasteboardOnDrag) {
+     if (layoutTestController->addFileToPasteboardOnDrag()) {
          [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil];
          [pboard setPropertyList:[NSArray arrayWithObject:@"DRTFakeFile"] forType:NSFilenamesPboardType];
      }
@@ -76,7 +78,7 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 
 - (void)webViewFocus:(WebView *)webView
 {
-    windowIsKey = YES;
+    layoutTestController->setWindowIsKey(true);
     NSView *documentView = [[mainFrame frameView] documentView];
     if ([documentView isKindOfClass:[WebHTMLView class]])
         [(WebHTMLView *)documentView _updateActiveState];
@@ -84,11 +86,11 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 
 - (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request
 {
-    if (!canOpenWindows)
+    if (!layoutTestController->canOpenWindows())
         return nil;
     
     // Make sure that waitUntilDone has been called.
-    assert(waitToDump);
+    ASSERT(layoutTestController->waitToDump());
 
     WebView *webView = createWebView();
     
@@ -99,7 +101,7 @@ DumpRenderTreeDraggingInfo *draggingInfo = nil;
 {
     NSWindow* window = [sender window];
  
-    if (closeWebViews)
+    if (layoutTestController->callCloseOnWebViews())
         [sender close];
     
     [window close];