diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-17 14:04:11 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
| commit | 18d7b4abf1327aa03ca786980e1c547321cad3da (patch) | |
| tree | 646bfb7e8d57b38a652746a185c411fae5962c77 /Source/WebCore | |
| parent | 21e5a8c1ef0e857b93742093a0b034f9368cfe60 (diff) | |
| download | external_webkit-18d7b4abf1327aa03ca786980e1c547321cad3da.zip external_webkit-18d7b4abf1327aa03ca786980e1c547321cad3da.tar.gz external_webkit-18d7b4abf1327aa03ca786980e1c547321cad3da.tar.bz2 | |
Merge WebKit at r76408: Fix EventHandlerAndroid.cpp
See http://trac.webkit.org/changeset/76248 which introduced
an include of Clipboard.h, causing the real definition of
WebCore::Clipboard to be included in EventHandlerAndroid.cpp. Remove
the stub that was there.
Change-Id: I5bc04bf573aa1da19cbdd282d3611f571e46c6fa
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/page/android/EventHandlerAndroid.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebCore/page/android/EventHandlerAndroid.cpp b/Source/WebCore/page/android/EventHandlerAndroid.cpp index bdc5f2a..f8a048c 100644 --- a/Source/WebCore/page/android/EventHandlerAndroid.cpp +++ b/Source/WebCore/page/android/EventHandlerAndroid.cpp @@ -106,9 +106,6 @@ bool EventHandler::passMouseReleaseEventToSubframe(MouseEventWithHitTestResults& return true; } -class Clipboard : public RefCounted<Clipboard> { -}; - PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const { return PassRefPtr<Clipboard>(0); |