Paste should be implemented in WebCore like Copy and Cut for Mac also.
https://bugs.webkit.org/show_bug.cgi?id=45494
<rdar://problem/7660537>
WebCore:
Reviewed by Sam Weining.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* editing/Editor.cpp:
(WebCore::Editor::shouldInsertFragment):
* editing/mac/EditorMac.mm: extended to support Mail specific scenarios.
(WebCore::Editor::pasteWithPasteboard):
* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::canShowMIMETypeAsHTML): Added.
(WebCore::EmptyEditorClient::documentFragmentFromAttributedString): Added.
(WebCore::EmptyEditorClient::setInsertionPasteboard): Added to support Mail.
* loader/FrameLoaderClient.h:
* page/EditorClient.h:
* platform/Pasteboard.h:
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::writeSelection): replaced call to Appkit with one that
doesn't calll back into WebKit.
(WebCore::Pasteboard::documentFragmentWithImageResource): Re-implemented at the
WebCore level.
(WebCore::Pasteboard::documentFragmentWithRtf): Re-implemented at the
WebCore level.
(WebCore::uniqueURLWithRelativePart): Added.
(WebCore::Pasteboard::documentFragment): Extended to include all the functionality
provided in documentFragmentFromPasteboard in WebHTMLView.mm.
WebKit/chromium:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::canShowMIMETypeAsHTML): Added stub.
* src/FrameLoaderClientImpl.h:
WebKit/efl:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::canShowMIMETypeAsHTML): Added stub.
* WebCoreSupport/FrameLoaderClientEfl.h:
WebKit/gtk:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::canShowMIMETypeAsHTML): Added stub.
* WebCoreSupport/FrameLoaderClientGtk.h:
WebKit/haiku:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebCoreSupport/FrameLoaderClientHaiku.cpp:
(WebCore::FrameLoaderClientHaiku::canShowMIMETypeAsHTML): Added stub.
* WebCoreSupport/FrameLoaderClientHaiku.h:
WebKit/mac:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
(excludedElementsForAttributedStringConversion):
(WebEditorClient::documentFragmentFromAttributedString): Added.
(WebEditorClient::setInsertionPasteboard):
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::canShowMIMETypeAsHTML): Re-implemented at the level
of the editor client.
* WebView/WebHTMLView.mm: Removed paste method.
WebKit/qt:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::canShowMIMETypeAsHTML): Added stub.
* WebCoreSupport/FrameLoaderClientQt.h:
WebKit/win:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebFrame.cpp:
(WebFrame::canShowMIMETypeASHTML): Added.
WebKit/wx:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebKitSupport/FrameLoaderClientWx.cpp:
(WebCore::FrameLoaderClientWx::canShowMIMETypeAsHTML): Added stub.
* WebKitSupport/FrameLoaderClientWx.h:
WebKit2:
Reviewed by Sam Weinig.
On the Mac platform, the implementation of the paste operation is all done
at the WebKit level. In order to support it on WebKit2 it is necessary to
refactor the code and move this functionality at the level of WebCore like
we already have on Windows.
The original code relies on some in AppKit functions that call back into
WebKit causing problems in WebKit2. All this functionality has been moved
at the level of the editor client where it can be dealt with appropriately.
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::documentFragmentFromAttributedString): Added.
(WebKit::WebEditorClient::setInsertionPasteboard): Added.
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::canShowMIMETypeAsHTML): Added.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67403 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/page/EditorClient.h b/WebCore/page/EditorClient.h
index 4a192d7..d50a1f5 100644
--- a/WebCore/page/EditorClient.h
+++ b/WebCore/page/EditorClient.h
@@ -37,12 +37,16 @@
#if PLATFORM(MAC)
#ifdef __OBJC__
@class NSArray;
+@class NSAttributedString;
@class NSData;
+@class NSPasteboard;
@class NSString;
@class NSURL;
#else
class NSArray;
+class NSAttributedString;
class NSData;
+class NSPasteboard;
class NSString;
class NSURL;
#endif
@@ -50,7 +54,9 @@
namespace WebCore {
+class ArchiveResource;
class CSSStyleDeclaration;
+class DocumentFragment;
class EditCommand;
class Editor;
class Element;
@@ -147,6 +153,8 @@
#if PLATFORM(MAC)
virtual NSString* userVisibleString(NSURL*) = 0;
+ virtual DocumentFragment* documentFragmentFromAttributedString(NSAttributedString*, Vector<ArchiveResource*>&) = 0;
+ virtual void setInsertionPasteboard(NSPasteboard*) = 0;
#ifdef BUILDING_ON_TIGER
virtual NSArray* pasteboardTypesForSelection(Frame*) = 0;
#endif
