Turn on d&d emulation in the layout tests on mac/linux.

This is already in the windows build, this just enables
it for the other two platforms.

Review URL: http://codereview.chromium.org/12458


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6041 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 55 deletions

diff --git a/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
index 6194b1b..52b862c 100644
--- a/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
@@ -1210,82 +1210,33 @@ LayoutTests/editing/inserting/typing-tab-designmode-forms.html = FAIL
 LayoutTests/editing/inserting/typing-tab-designmode.html = FAIL
 LayoutTests/editing/pasteboard/4641033.html = FAIL
 LayoutTests/editing/pasteboard/4806874.html = FAIL
-LayoutTests/editing/pasteboard/4861080.html = FAIL
 LayoutTests/editing/pasteboard/4944770-1.html = FAIL
 LayoutTests/editing/pasteboard/4944770-2.html = FAIL
-LayoutTests/editing/pasteboard/4947130.html = FAIL
-LayoutTests/editing/pasteboard/drag-drop-dead-frame.html = FAIL
-LayoutTests/editing/pasteboard/drag-drop-modifies-page.html = FAIL
-LayoutTests/editing/pasteboard/drag-image-in-about-blank-frame.html = FAIL
-LayoutTests/editing/pasteboard/drag-image-to-contenteditable-in-iframe.html = FAIL
-LayoutTests/editing/pasteboard/drag-selected-image-to-contenteditable.html = FAIL
-LayoutTests/editing/pasteboard/drop-link.html = FAIL
 LayoutTests/editing/pasteboard/drop-text-without-selection.html = FAIL
 LayoutTests/editing/pasteboard/input-field-1.html = FAIL
-LayoutTests/editing/pasteboard/nested-blocks-with-text-area.html = FAIL
 LayoutTests/editing/pasteboard/nested-blocks-with-text-field.html = FAIL
 LayoutTests/editing/pasteboard/paste-plaintext-user-select-none.html = FAIL
 LayoutTests/editing/pasteboard/paste-text-011.html = FAIL
-LayoutTests/editing/pasteboard/pasting-tabs.html = FAIL
 LayoutTests/editing/pasteboard/select-element-1.html = FAIL
 LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
-LayoutTests/editing/selection/14971.html = FAIL
 LayoutTests/editing/selection/3690703-2.html = FAIL
 LayoutTests/editing/selection/3690703.html = FAIL
 LayoutTests/editing/selection/3690719.html = FAIL
-LayoutTests/editing/selection/4397952.html = FAIL
-LayoutTests/editing/selection/4895428-1.html = FAIL
-LayoutTests/editing/selection/4895428-2.html = FAIL
 LayoutTests/editing/selection/4895428-3.html = FAIL
-LayoutTests/editing/selection/4895428-4.html = FAIL
 LayoutTests/editing/selection/4975120.html = FAIL
-LayoutTests/editing/selection/5057506-2.html = FAIL
-LayoutTests/editing/selection/5057506.html = FAIL
-LayoutTests/editing/selection/5131716-1.html = FAIL
-LayoutTests/editing/selection/5131716-2.html = FAIL
-LayoutTests/editing/selection/5131716-3.html = FAIL
-LayoutTests/editing/selection/5131716-4.html = FAIL
 LayoutTests/editing/selection/5136696.html = FAIL
-LayoutTests/editing/selection/5209984.html = FAIL
 LayoutTests/editing/selection/5213963.html = FAIL
-LayoutTests/editing/selection/5232159.html = FAIL
-LayoutTests/editing/selection/5240265.html = FAIL
-LayoutTests/editing/selection/5333725.html = FAIL
-LayoutTests/editing/selection/5354455-1.html = FAIL
-LayoutTests/editing/selection/6476.html = FAIL
-LayoutTests/editing/selection/after-line-break.html = FAIL
-LayoutTests/editing/selection/anchor-focus1.html = FAIL
-LayoutTests/editing/selection/anchor-focus2.html = FAIL
-LayoutTests/editing/selection/anchor-focus3.html = FAIL
 LayoutTests/editing/selection/caret-before-select.html = FAIL
-LayoutTests/editing/selection/caret-rtl.html = FAIL
-LayoutTests/editing/selection/click-start-of-line.html = FAIL
-LayoutTests/editing/selection/contains-boundaries.html = FAIL
-LayoutTests/editing/selection/contenteditable-click-inside.html = FAIL
-LayoutTests/editing/selection/contenteditable-click-outside.html = FAIL
-LayoutTests/editing/selection/doubleclick-crash.html = FAIL
 LayoutTests/editing/selection/drag-select-1.html = FAIL
 LayoutTests/editing/selection/drag-text-delay.html = FAIL
-LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = FAIL
-LayoutTests/editing/selection/editable-links.html = FAIL
-LayoutTests/editing/selection/expanding-selections.html = FAIL
-LayoutTests/editing/selection/expanding-selections2.html = FAIL
 LayoutTests/editing/selection/extend-by-word-002.html = FAIL
 LayoutTests/editing/selection/fake-doubleclick.html = FAIL
-LayoutTests/editing/selection/fake-drag.html = FAIL
-LayoutTests/editing/selection/inline-closest-leaf-child.html = FAIL
-LayoutTests/editing/selection/mixed-editability-1.html = FAIL
 LayoutTests/editing/selection/move-past-trailing-space.html = FAIL
-LayoutTests/editing/selection/paragraph-granularity.html = FAIL
 LayoutTests/editing/selection/replaced-boundaries-3.html = FAIL
-LayoutTests/editing/selection/select-all-iframe.html = FAIL
 LayoutTests/editing/selection/select-box.html = FAIL
 LayoutTests/editing/selection/select-element-paragraph-boundary.html = FAIL
 LayoutTests/editing/selection/select-from-textfield-outwards.html = FAIL
 LayoutTests/editing/selection/selection-3748164-fix.html = FAIL
-LayoutTests/editing/selection/selection-actions.html = FAIL
-LayoutTests/editing/selection/triple-click-in-pre.html = FAIL
-LayoutTests/editing/selection/word-granularity.html = FAIL
 LayoutTests/editing/style/smoosh-styles-002.html = FAIL
 LayoutTests/fast/block/basic/001.html = FAIL
 LayoutTests/fast/block/basic/011.html = FAIL
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 28e6a29..e6166b4 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -408,11 +408,6 @@ bool TestWebViewDelegate::RunJavaScriptPrompt(WebView* webview,
 
 void TestWebViewDelegate::StartDragging(WebView* webview,
                                         const WebDropData& drop_data) {
-#if defined(OS_WIN)
-  // TODO(port): make this work on all platforms.
-  if (!drag_delegate_)
-    drag_delegate_ = new TestDragDelegate(shell_->webViewWnd(),
-                                          shell_->webView());
   if (webkit_glue::IsLayoutTestMode()) {
     WebDropData mutable_drop_data = drop_data;
     if (shell_->layout_test_controller()->ShouldAddFileToPasteboard()) {
@@ -426,6 +421,9 @@ void TestWebViewDelegate::StartDragging(WebView* webview,
   } else {
     // TODO(tc): Drag and drop is disabled in the test shell because we need
     // to be able to convert from WebDragData to an IDataObject.
+    //if (!drag_delegate_)
+    //  drag_delegate_ = new TestDragDelegate(shell_->webViewWnd(),
+    //                                        shell_->webView());
     //const DWORD ok_effect = DROPEFFECT_COPY | DROPEFFECT_LINK | DROPEFFECT_MOVE;
     //DWORD effect;
     //HRESULT res = DoDragDrop(drop_data.data_object, drag_delegate_.get(),
@@ -433,7 +431,6 @@ void TestWebViewDelegate::StartDragging(WebView* webview,
     //DCHECK(DRAGDROP_S_DROP == res || DRAGDROP_S_CANCEL == res);
   }
   webview->DragSourceSystemDragEnded();
-#endif
 }
 
 void TestWebViewDelegate::ShowContextMenu(WebView* webview,