diff options
Diffstat (limited to 'WebCore/platform/mac/ClipboardMac.mm')
| -rw-r--r-- | WebCore/platform/mac/ClipboardMac.mm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/WebCore/platform/mac/ClipboardMac.mm b/WebCore/platform/mac/ClipboardMac.mm index 01ec573..8117b2b 100644 --- a/WebCore/platform/mac/ClipboardMac.mm +++ b/WebCore/platform/mac/ClipboardMac.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. + * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,27 +26,18 @@ #import "config.h" #import "ClipboardMac.h" -#import "CachedImage.h" -#import "Document.h" #import "DOMElementInternal.h" #import "DragClient.h" #import "DragController.h" #import "Editor.h" -#import "EventHandler.h" -#import "FloatRect.h" #import "FoundationExtras.h" #import "Frame.h" -#import "HTMLImageElement.h" #import "Image.h" #import "Page.h" #import "Pasteboard.h" -#import "Range.h" #import "RenderImage.h" -#import "WebCoreFrameBridge.h" #import "WebCoreSystemInterface.h" -@class WebArchive; - namespace WebCore { ClipboardMac::ClipboardMac(bool forDragging, NSPasteboard *pasteboard, ClipboardAccessPolicy policy, Frame *frame) @@ -284,10 +275,10 @@ void ClipboardMac::setDragImage(CachedImage* image, Node *node, const IntPoint & { if (policy() == ClipboardImageWritable || policy() == ClipboardWritable) { if (m_dragImage) - m_dragImage->deref(this); + m_dragImage->removeClient(this); m_dragImage = image; if (m_dragImage) - m_dragImage->ref(this); + m_dragImage->addClient(this); m_dragLoc = loc; m_dragImageElement = node; @@ -332,7 +323,7 @@ void ClipboardMac::declareAndWriteDragImage(Element* element, const KURL& url, c { ASSERT(frame); if (Page* page = frame->page()) - page->dragController()->client()->declareAndWriteDragImage(m_pasteboard.get(), [DOMElement _wrapElement:element], url.getNSURL(), title, frame); + page->dragController()->client()->declareAndWriteDragImage(m_pasteboard.get(), [DOMElement _wrapElement:element], url, title, frame); } DragImageRef ClipboardMac::createDragImage(IntPoint& loc) const |