summaryrefslogtreecommitdiffstats
path: root/WebCore/page/android/DragControllerAndroid.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-11-11 18:22:33 -0800
committerBen Murdoch <benm@google.com>2009-11-12 09:41:52 -0800
commit3e34395828593d66c12bae3d43c414cdf8d3c9b2 (patch)
tree5316d0a6fca61e1abfc0a31aac6da9f8e6b26f42 /WebCore/page/android/DragControllerAndroid.cpp
parenta2bbe04f16fb11132b3318fb0aecb290f232c563 (diff)
downloadexternal_webkit-3e34395828593d66c12bae3d43c414cdf8d3c9b2.zip
external_webkit-3e34395828593d66c12bae3d43c414cdf8d3c9b2.tar.gz
external_webkit-3e34395828593d66c12bae3d43c414cdf8d3c9b2.tar.bz2
Bring page/android in line with the versions on WebKit.org.
Changes in this CL that require upstreaming: The deletion of InspectorControllerAndroid DragController::cleanupAfterSystemDrag Change-Id: I219a7aa49e3fc3d4193157593b90b11705d98fde
Diffstat (limited to 'WebCore/page/android/DragControllerAndroid.cpp')
-rw-r--r--WebCore/page/android/DragControllerAndroid.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebCore/page/android/DragControllerAndroid.cpp b/WebCore/page/android/DragControllerAndroid.cpp
index e67a277..b20ab60 100644
--- a/WebCore/page/android/DragControllerAndroid.cpp
+++ b/WebCore/page/android/DragControllerAndroid.cpp
@@ -28,6 +28,7 @@
#include "DragController.h"
#include "DragData.h"
+#include "NotImplemented.h"
namespace WebCore {
@@ -39,12 +40,12 @@ bool DragController::isCopyKeyDown()
DragOperation DragController::dragOperation(DragData* dragData)
{
// FIXME: This logic is incomplete
- ASSERT(0);
+ notImplemented();
if (dragData->containsURL())
return DragOperationCopy;
return DragOperationNone;
-}
+}
void DragController::cleanupAfterSystemDrag()
{