| Index: webkit/port/page/chromium/EventHandlerChromium.cpp
|
| ===================================================================
|
| --- webkit/port/page/chromium/EventHandlerChromium.cpp (revision 0)
|
| +++ webkit/port/page/chromium/EventHandlerChromium.cpp (working copy)
|
| @@ -26,7 +26,6 @@
|
| #include "config.h"
|
| #include "EventHandler.h"
|
|
|
| -#include "ClipboardWin.h"
|
| #include "Cursor.h"
|
| #include "FloatPoint.h"
|
| #include "FocusController.h"
|
| @@ -41,9 +40,13 @@
|
| #include "PlatformWheelEvent.h"
|
| #include "RenderWidget.h"
|
| #include "SelectionController.h"
|
| -#include "WCDataObject.h"
|
| #include "NotImplemented.h"
|
|
|
| +#if PLATFORM(WIN)
|
| +#include "ClipboardWin.h"
|
| +#include "WCDataObject.h"
|
| +#endif
|
| +
|
| namespace WebCore {
|
|
|
| unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
|
| @@ -136,9 +139,13 @@
|
|
|
| PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
|
| {
|
| +#if PLATFORM(WIN)
|
| COMPtr<WCDataObject> dataObject;
|
| WCDataObject::createInstance(&dataObject);
|
| return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);
|
| +#else
|
| + return PassRefPtr<Clipboard>(0);
|
| +#endif
|
| }
|
|
|
| void EventHandler::focusDocumentView()
|
|
|
| Property changes on: webkit\port\page\chromium\EventHandlerChromium.cpp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/webkit/port/page/EventHandlerWin.cpp:r69-2775
|
|
|
|
|