diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/platform/android/DragDataAndroid.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/platform/android/DragDataAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/android/DragDataAndroid.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/android/DragDataAndroid.cpp b/Source/WebCore/platform/android/DragDataAndroid.cpp index 4e99b2c..2c341b0 100644 --- a/Source/WebCore/platform/android/DragDataAndroid.cpp +++ b/Source/WebCore/platform/android/DragDataAndroid.cpp @@ -47,7 +47,7 @@ bool DragData::containsPlainText() const return false; } -String DragData::asPlainText() const +String DragData::asPlainText(Frame*) const { return String(); } @@ -62,18 +62,18 @@ bool DragData::containsCompatibleContent() const return false; } -bool DragData::containsURL(FilenameConversionPolicy) const +bool DragData::containsURL(Frame*, FilenameConversionPolicy) const { return false; } -String DragData::asURL(FilenameConversionPolicy, String*) const +String DragData::asURL(Frame*, FilenameConversionPolicy, String*) const { return String(); } -PassRefPtr<DocumentFragment> DragData::asFragment(Document*) const +PassRefPtr<DocumentFragment> DragData::asFragment(Frame*, PassRefPtr<Range>, bool, bool&) const { return 0; } |