Changeset 141473 in webkit
- Timestamp:
- Jan 31, 2013 1:14:58 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 11 added
- 49 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r141468 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds support in WebCore to new EditorClient methods to support the modified 10 client bundle API in WebKit2. 11 12 * WebCore.exp.in: 13 * editing/Editor.cpp: 14 (WebCore::Editor::cut): Added call to willWriteSelectionToPasteboard. 15 (WebCore::Editor::copy): Ditto. 16 (WebCore::Editor::willWriteSelectionToPasteboard): Added. 17 * editing/Editor.h: 18 * loader/EmptyClients.h: Added empty client implementation 19 for the new methods. 20 (WebCore::EmptyEditorClient::willWriteSelectionToPasteboard): 21 (WebCore::EmptyEditorClient::getClientPasteboardDataForRange): 22 * page/EditorClient.h: 23 * platform/mac/PasteboardMac.mm: 24 (WebCore::Pasteboard::writeSelectionForTypes): Added call to getClientPasteboardDataForRange. 25 1 26 2013-01-31 David Kilzer <ddkilzer@apple.com> 2 27 -
trunk/Source/WebCore/WebCore.exp.in
r141196 r141473 188 188 __ZN7WebCore12SharedBuffer10wrapCFDataEPK8__CFData 189 189 __ZN7WebCore12SharedBuffer10wrapNSDataEP6NSData 190 __ZN7WebCore12SharedBuffer12createCFDataEv 190 191 __ZN7WebCore12SharedBuffer12createNSDataEv 191 192 __ZN7WebCore12SharedBuffer24createWithContentsOfFileERKN3WTF6StringE -
trunk/Source/WebCore/editing/Editor.cpp
r141429 r141473 983 983 } 984 984 RefPtr<Range> selection = selectedRange(); 985 willWriteSelectionToPasteboard(selection); 985 986 if (shouldDeleteRange(selection.get())) { 986 987 updateMarkersForWordsAffectedByEditing(true); … … 1004 1005 } 1005 1006 1007 willWriteSelectionToPasteboard(selectedRange()); 1006 1008 if (enclosingTextFormControl(m_frame->selection()->start())) { 1007 1009 Pasteboard::generalPasteboard()->writePlainText(selectedText(), … … 1274 1276 if (client()) 1275 1277 client()->didEndEditing(); 1278 } 1279 1280 void Editor::willWriteSelectionToPasteboard(PassRefPtr<Range> range) 1281 { 1282 if (client()) 1283 client()->willWriteSelectionToPasteboard(range.get()); 1276 1284 } 1277 1285 -
trunk/Source/WebCore/editing/Editor.h
r139796 r141473 274 274 void didBeginEditing(); 275 275 void didEndEditing(); 276 void willWriteSelectionToPasteboard(PassRefPtr<Range>); 276 277 void didWriteSelectionToPasteboard(); 277 278 -
trunk/Source/WebCore/loader/EmptyClients.h
r139078 r141473 442 442 virtual void respondToChangedSelection(Frame*) { } 443 443 virtual void didEndEditing() { } 444 virtual void willWriteSelectionToPasteboard(Range*) { } 444 445 virtual void didWriteSelectionToPasteboard() { } 446 virtual void getClientPasteboardDataForRange(Range*, Vector<String>&, Vector<RefPtr<SharedBuffer> >&) { } 445 447 virtual void didSetSelectionTypesForPasteboard() { } 446 448 -
trunk/Source/WebCore/page/EditorClient.h
r127862 r141473 53 53 class Node; 54 54 class Range; 55 class SharedBuffer; 55 56 class SpellChecker; 56 57 class StylePropertySet; … … 90 91 virtual void respondToChangedSelection(Frame*) = 0; 91 92 virtual void didEndEditing() = 0; 93 virtual void willWriteSelectionToPasteboard(Range*) = 0; 92 94 virtual void didWriteSelectionToPasteboard() = 0; 95 virtual void getClientPasteboardDataForRange(Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) = 0; 93 96 virtual void didSetSelectionTypesForPasteboard() = 0; 94 97 -
trunk/Source/WebCore/platform/mac/PasteboardMac.mm
r139111 r141473 183 183 attributedString = [converter.get() attributedString]; 184 184 185 const Vector<String> types = !pasteboardTypes.isEmpty() ? pasteboardTypes : selectionPasteboardTypes(canSmartCopyOrDelete, [attributedString containsAttachments]); 185 Vector<String> types = !pasteboardTypes.isEmpty() ? pasteboardTypes : selectionPasteboardTypes(canSmartCopyOrDelete, [attributedString containsAttachments]); 186 187 Vector<String> clientTypes; 188 Vector<RefPtr<SharedBuffer> > clientData; 189 frame->editor()->client()->getClientPasteboardDataForRange(frame->editor()->selectedRange().get(), clientTypes, clientData); 190 types.append(clientTypes); 191 186 192 platformStrategies()->pasteboardStrategy()->setTypes(types, m_pasteboardName); 187 193 frame->editor()->client()->didSetSelectionTypesForPasteboard(); 188 194 195 for (size_t i = 0; i < clientTypes.size(); ++i) 196 platformStrategies()->pasteboardStrategy()->setBufferForType(clientData[i], clientTypes[i], m_pasteboardName); 197 189 198 // Put HTML on the pasteboard. 190 199 if (types.contains(WebArchivePboardType)) -
trunk/Source/WebKit/blackberry/ChangeLog
r141284 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/EditorClientBlackBerry.cpp: 12 (WebCore::EditorClientBlackBerry::willWriteSelectionToPasteboard): 13 (WebCore::EditorClientBlackBerry::getClientPasteboardDataForRange): 14 * WebCoreSupport/EditorClientBlackBerry.h: 15 1 16 2013-01-30 Ed Baker <edbaker@rim.com> 2 17 -
trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.cpp
r138839 r141473 250 250 251 251 void EditorClientBlackBerry::didWriteSelectionToPasteboard() 252 { 253 notImplemented(); 254 } 255 256 void EditorClientBlackBerry::willWriteSelectionToPasteboard(WebCore::Range*) 257 { 258 notImplemented(); 259 } 260 261 void EditorClientBlackBerry::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 252 262 { 253 263 notImplemented(); -
trunk/Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h
r123809 r141473 60 60 virtual void respondToSelectionAppearanceChange(); 61 61 virtual void didEndEditing(); 62 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 62 63 virtual void didWriteSelectionToPasteboard(); 64 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 63 65 virtual void didSetSelectionTypesForPasteboard(); 64 66 virtual void registerUndoStep(PassRefPtr<UndoStep>); -
trunk/Source/WebKit/chromium/ChangeLog
r141470 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * src/EditorClientImpl.cpp: 12 (WebKit::EditorClientImpl::willWriteSelectionToPasteboard): 13 (WebKit::EditorClientImpl::getClientPasteboardDataForRange): 14 * src/EditorClientImpl.h: 15 1 16 2013-01-31 Chris Hopman <cjhopman@chromium.org> 2 17 -
trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp
r138220 r141473 287 287 288 288 void EditorClientImpl::didWriteSelectionToPasteboard() 289 { 290 } 291 292 void EditorClientImpl::willWriteSelectionToPasteboard(WebCore::Range*) 293 { 294 } 295 296 void EditorClientImpl::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 289 297 { 290 298 } -
trunk/Source/WebKit/chromium/src/EditorClientImpl.h
r127862 r141473 76 76 virtual void respondToChangedSelection(WebCore::Frame*); 77 77 virtual void didEndEditing(); 78 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 78 79 virtual void didWriteSelectionToPasteboard(); 80 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 79 81 virtual void didSetSelectionTypesForPasteboard(); 80 82 virtual void registerUndoStep(PassRefPtr<WebCore::UndoStep>); -
trunk/Source/WebKit/efl/ChangeLog
r141439 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/EditorClientEfl.cpp: 12 (WebCore::EditorClientEfl::willWriteSelectionToPasteboard): 13 (WebCore::EditorClientEfl::getClientPasteboardDataForRange): 14 * WebCoreSupport/EditorClientEfl.h: 15 1 16 2013-01-31 Christophe Dumez <dchris@gmail.com> 2 17 -
trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
r129212 r141473 171 171 { 172 172 notImplemented(); 173 } 174 175 void EditorClientEfl::willWriteSelectionToPasteboard(WebCore::Range*) 176 { 177 } 178 179 void EditorClientEfl::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 180 { 173 181 } 174 182 -
trunk/Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
r141387 r141473 109 109 virtual void respondToChangedSelection(Frame*); 110 110 virtual void didEndEditing(); 111 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 111 112 virtual void didWriteSelectionToPasteboard(); 113 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 112 114 virtual void didSetSelectionTypesForPasteboard(); 113 115 -
trunk/Source/WebKit/gtk/ChangeLog
r141238 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/EditorClientGtk.cpp: 12 (WebKit::EditorClient::willWriteSelectionToPasteboard): 13 (WebKit::EditorClient::getClientPasteboardDataForRange): 14 * WebCoreSupport/EditorClientGtk.h: 15 1 16 2013-01-30 Huang Dongsung <luxtella@company100.net> 2 17 -
trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
r140336 r141473 282 282 } 283 283 284 void EditorClient::willWriteSelectionToPasteboard(WebCore::Range*) 285 { 286 } 287 288 void EditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 289 { 290 } 291 284 292 void EditorClient::didSetSelectionTypesForPasteboard() 285 293 { -
trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
r129750 r141473 99 99 virtual void respondToChangedSelection(WebCore::Frame*); 100 100 virtual void didEndEditing(); 101 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 101 102 virtual void didWriteSelectionToPasteboard(); 103 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 102 104 virtual void didSetSelectionTypesForPasteboard(); 103 105 -
trunk/Source/WebKit/mac/ChangeLog
r141447 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/WebEditorClient.h: 12 * WebCoreSupport/WebEditorClient.mm: 13 (WebEditorClient::willWriteSelectionToPasteboard): 14 (WebEditorClient::getClientPasteboardDataForRange): 15 1 16 2013-01-31 Brady Eidson <beidson@apple.com> 2 17 -
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h
r119687 r141473 68 68 virtual void didBeginEditing() OVERRIDE; 69 69 virtual void didEndEditing() OVERRIDE; 70 virtual void willWriteSelectionToPasteboard(WebCore::Range*) OVERRIDE; 70 71 virtual void didWriteSelectionToPasteboard() OVERRIDE; 72 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) OVERRIDE; 71 73 virtual void didSetSelectionTypesForPasteboard() OVERRIDE; 72 74 -
trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
r127757 r141473 310 310 { 311 311 [[m_webView _editingDelegateForwarder] webView:m_webView didWriteSelectionToPasteboard:[NSPasteboard generalPasteboard]]; 312 } 313 314 void WebEditorClient::willWriteSelectionToPasteboard(WebCore::Range*) 315 { 316 // Not implemented WebKit, only WebKit2. 317 } 318 319 void WebEditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 320 { 321 // Not implemented WebKit, only WebKit2. 312 322 } 313 323 -
trunk/Source/WebKit/qt/ChangeLog
r141268 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/EditorClientQt.cpp: 12 (WebCore::EditorClientQt::willWriteSelectionToPasteboard): 13 (WebCore::EditorClientQt::getClientPasteboardDataForRange): 14 * WebCoreSupport/EditorClientQt.h: 15 1 16 2013-01-30 Allan Sandfeld Jensen <allan.jensen@digia.com> 2 17 -
trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
r135515 r141473 234 234 } 235 235 236 void EditorClientQt::willWriteSelectionToPasteboard(Range*) 237 { 238 } 239 240 void EditorClientQt::getClientPasteboardDataForRange(Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) 241 { 242 } 243 236 244 void EditorClientQt::didSetSelectionTypesForPasteboard() 237 245 { -
trunk/Source/WebKit/qt/WebCoreSupport/EditorClientQt.h
r135515 r141473 74 74 virtual void respondToChangedSelection(Frame*); 75 75 virtual void didEndEditing(); 76 virtual void willWriteSelectionToPasteboard(Range*); 76 77 virtual void didWriteSelectionToPasteboard(); 78 virtual void getClientPasteboardDataForRange(Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 77 79 virtual void didSetSelectionTypesForPasteboard(); 78 80 -
trunk/Source/WebKit/win/ChangeLog
r141196 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/WebEditorClient.cpp: 12 (WebEditorClient::willWriteSelectionToPasteboard): 13 (WebEditorClient::getClientPasteboardDataForRange): 14 * WebCoreSupport/WebEditorClient.h: 15 1 16 2013-01-29 Shinya Kawanaka <shinyak@chromium.org> 2 17 -
trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp
r128988 r141473 224 224 225 225 void WebEditorClient::didWriteSelectionToPasteboard() 226 { 227 notImplemented(); 228 } 229 230 void WebEditorClient::willWriteSelectionToPasteboard(WebCore::Range*) 231 { 232 notImplemented(); 233 } 234 235 void WebEditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 226 236 { 227 237 notImplemented(); -
trunk/Source/WebKit/win/WebCoreSupport/WebEditorClient.h
r119192 r141473 56 56 virtual void didBeginEditing(); 57 57 virtual void didEndEditing(); 58 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 58 59 virtual void didWriteSelectionToPasteboard(); 60 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 59 61 virtual void didSetSelectionTypesForPasteboard(); 60 62 -
trunk/Source/WebKit/wince/ChangeLog
r140909 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebCoreSupport/EditorClientWinCE.cpp: 12 (WebKit::EditorClientWinCE::willWriteSelectionToPasteboard): 13 (WebKit::EditorClientWinCE::getClientPasteboardDataForRange): 14 * WebCoreSupport/EditorClientWinCE.h: 15 1 16 2013-01-24 Patrick Gansterer <paroga@webkit.org> 2 17 -
trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp
r117470 r141473 136 136 137 137 void EditorClientWinCE::didWriteSelectionToPasteboard() 138 { 139 notImplemented(); 140 } 141 142 void EditorClientWinCE::willWriteSelectionToPasteboard(WebCore::Range*) 143 { 144 notImplemented(); 145 } 146 147 void EditorClientWinCE::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 138 148 { 139 149 notImplemented(); -
trunk/Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h
r119192 r141473 64 64 virtual void respondToChangedSelection(WebCore::Frame*); 65 65 virtual void didEndEditing(); 66 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 66 67 virtual void didWriteSelectionToPasteboard(); 68 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 67 69 virtual void didSetSelectionTypesForPasteboard(); 68 70 -
trunk/Source/WebKit/wx/ChangeLog
r140718 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adds stub implementation for WebKit of the new EditorClient methods. 10 11 * WebKitSupport/EditorClientWx.cpp: 12 (WebCore::EditorClientWx::willWriteSelectionToPasteboard): 13 (WebCore::EditorClientWx::getClientPasteboardDataForRange): 14 * WebKitSupport/EditorClientWx.h: 15 1 16 2013-01-24 Mark Hahnenberg <mhahnenberg@apple.com> 2 17 -
trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.cpp
r127757 r141473 274 274 } 275 275 276 void EditorClientWx::willWriteSelectionToPasteboard(WebCore::Range*) 277 { 278 notImplemented(); 279 } 280 281 void EditorClientWx::getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) 282 { 283 notImplemented(); 284 } 285 276 286 void EditorClientWx::didSetSelectionTypesForPasteboard() 277 287 { -
trunk/Source/WebKit/wx/WebKitSupport/EditorClientWx.h
r119192 r141473 76 76 virtual void respondToChangedSelection(Frame*); 77 77 virtual void didEndEditing(); 78 virtual void willWriteSelectionToPasteboard(WebCore::Range*); 78 79 virtual void didWriteSelectionToPasteboard(); 80 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 79 81 virtual void didSetSelectionTypesForPasteboard(); 80 82 -
trunk/Source/WebKit2/ChangeLog
r141472 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 This patch adds new bundle client API to receive notifications 10 relative the pasteboard activity. There are 2 new API added to 11 InjectedBundleEditorClient, to receive notification before and 12 after the pasteboard content is added and one API to provide 13 additional content to add to the pasteboard. 14 In order to create content to add to the pasteboard, WKWebArchiveRef 15 and WKWebArchiveResourcesRef have been added to the set of API level 16 object. 17 This work is a joint effort with Sam Weinig who contributed the 18 support for WKWebArchiveRef, WKWebArchiveResourcesRef and related 19 files. Sam is the author of the first chunk of changes listed below. 20 21 * Shared/API/c/WKBase.h: 22 * Shared/API/c/WKSharedAPICast.h: 23 * Shared/API/c/mac/WKWebArchive.cpp: Added. 24 (WKWebArchiveGetTypeID): 25 (WKWebArchiveCreate): 26 (WKWebArchiveCreateWithData): 27 (WKWebArchiveCreateFromRange): 28 (WKWebArchiveCopyMainResource): 29 (WKWebArchiveCopySubresources): 30 (WKWebArchiveCopySubframeArchives): 31 (WKWebArchiveCopyData): 32 * Shared/API/c/mac/WKWebArchive.h: Added. 33 * Shared/API/c/mac/WKWebArchiveResource.cpp: Added. 34 (WKWebArchiveResourceGetTypeID): 35 (WKWebArchiveResourceCreate): 36 (WKWebArchiveResourceCopyData): 37 (WKWebArchiveResourceCopyURL): 38 (WKWebArchiveResourceCopyMIMEType): 39 (WKWebArchiveResourceCopyTextEncoding): 40 * Shared/API/c/mac/WKWebArchiveResource.h: Added. 41 * Shared/APIObject.h: 42 * Shared/WebArchive.cpp: Added. 43 (WebKit::WebArchive::create): 44 (WebKit::WebArchive::WebArchive): 45 (WebKit::WebArchive::~WebArchive): 46 (WebKit::WebArchive::mainResource): 47 (WebKit::WebArchive::subresources): 48 (WebKit::WebArchive::subframeArchives): 49 (WebKit::releaseCFData): 50 (WebKit::WebArchive::data): 51 (WebKit::WebArchive::coreLegacyWebArchive): 52 * Shared/WebArchive.h: Added. 53 (WebKit::WebArchive::type): 54 * Shared/WebArchiveResource.cpp: Added. 55 (WebKit::WebArchiveResource::create): 56 (WebKit::WebArchiveResource::WebArchiveResource): 57 (WebKit::WebArchiveResource::~WebArchiveResource): 58 (WebKit::releaseCFData): 59 (WebKit::WebArchiveResource::data): 60 (WebKit::WebArchiveResource::URL): 61 (WebKit::WebArchiveResource::MIMEType): 62 (WebKit::WebArchiveResource::textEncoding): 63 (WebKit::WebArchiveResource::coreArchiveResource): 64 * Shared/WebArchiveResource.h: Added. 65 (WebKit::WebArchiveResource::type): 66 * WebKit2.xcodeproj/project.pbxproj: 67 68 * Shared/APIClientTraits.cpp: Added versioning to InjectedBundlePageEditorClient. 69 * Shared/APIClientTraits.h: 70 * WebProcess/InjectedBundle/API/c/WKBundlePage.h: 71 * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp: 72 (WebKit::InjectedBundlePageEditorClient::willWriteToPasteboard): Added. 73 (WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange): Added. 74 (WebKit::InjectedBundlePageEditorClient::didWriteToPasteboard): Added. 75 * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h: 76 * WebProcess/WebCoreSupport/WebEditorClient.cpp: 77 (WebKit::WebEditorClient::didWriteSelectionToPasteboard): 78 (WebKit::WebEditorClient::willWriteSelectionToPasteboard): 79 (WebKit::WebEditorClient::getClientPasteboardDataForRange): 80 * WebProcess/WebCoreSupport/WebEditorClient.h: 81 1 82 2013-01-31 Anders Carlsson <andersca@apple.com> 2 83 -
trunk/Source/WebKit2/Shared/API/c/WKBase.h
r141448 r141473 79 79 typedef const struct OpaqueWKURLResponse* WKURLResponseRef; 80 80 typedef const struct OpaqueWKUserContentURLPattern* WKUserContentURLPatternRef; 81 typedef const struct OpaqueWKWebArchive* WKWebArchiveRef; 82 typedef const struct OpaqueWKWebArchiveResource* WKWebArchiveResourceRef; 81 83 82 84 enum WKUserContentInjectedFrames { -
trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h
r141010 r141473 63 63 class MutableArray; 64 64 class MutableDictionary; 65 class WebArchive; 66 class WebArchiveResource; 65 67 class WebCertificateInfo; 66 68 class WebConnection; … … 110 112 WK_ADD_API_MAPPING(WKURLResponseRef, WebURLResponse) 111 113 WK_ADD_API_MAPPING(WKUserContentURLPatternRef, WebUserContentURLPattern) 114 115 #if PLATFORM(MAC) 116 WK_ADD_API_MAPPING(WKWebArchiveRef, WebArchive) 117 WK_ADD_API_MAPPING(WKWebArchiveResourceRef, WebArchiveResource) 118 #endif 112 119 113 120 template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType> -
trunk/Source/WebKit2/Shared/APIClientTraits.cpp
r141448 r141473 78 78 }; 79 79 80 const size_t APIClientTraits<WKBundlePageEditorClient>::interfaceSizesByVersion[] = { 81 offsetof(WKBundlePageEditorClient, willWriteToPasteboard), 82 sizeof(WKBundlePageEditorClient) 83 }; 84 80 85 const size_t APIClientTraits<WKBundlePageUIClient>::interfaceSizesByVersion[] = { 81 86 offsetof(WKBundlePageUIClient, didReachApplicationCacheOriginQuota), -
trunk/Source/WebKit2/Shared/APIClientTraits.h
r129810 r141473 76 76 }; 77 77 78 template<> struct APIClientTraits<WKBundlePageEditorClient> { 79 static const size_t interfaceSizesByVersion[2]; 80 }; 81 78 82 template<> struct APIClientTraits<WKContextInjectedBundleClient> { 79 83 static const size_t interfaceSizesByVersion[2]; -
trunk/Source/WebKit2/Shared/APIObject.h
r141448 r141473 58 58 TypeURLResponse, 59 59 TypeUserContentURLPattern, 60 TypeWebArchive, 61 TypeWebArchiveResource, 60 62 61 63 // Base numeric types -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r141472 r141473 1024 1024 C574A58112E66681002DFE98 /* PasteboardTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = C574A57F12E66681002DFE98 /* PasteboardTypes.h */; }; 1025 1025 C574A58212E66681002DFE98 /* PasteboardTypes.mm in Sources */ = {isa = PBXBuildFile; fileRef = C574A58012E66681002DFE98 /* PasteboardTypes.mm */; }; 1026 C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */; }; 1027 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DA616ACE5A900316DE2 /* WKWebArchive.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1028 C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */; }; 1029 C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1030 C5E1AFEC16B21012006CC1F2 /* WebArchive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9916ACCE9900316DE2 /* WebArchive.cpp */; }; 1031 C5E1AFED16B21017006CC1F2 /* WebArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9A16ACCE9900316DE2 /* WebArchive.h */; }; 1032 C5E1AFEE16B21025006CC1F2 /* WebArchiveResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC329D9E16ACD47800316DE2 /* WebArchiveResource.cpp */; }; 1033 C5E1AFEF16B21029006CC1F2 /* WebArchiveResource.h in Headers */ = {isa = PBXBuildFile; fileRef = BC329D9F16ACD47800316DE2 /* WebArchiveResource.h */; }; 1026 1034 CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; }; 1027 1035 CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; }; … … 2023 2031 BC306822125A6B9400E71278 /* WebProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessCreationParameters.h; sourceTree = "<group>"; }; 2024 2032 BC306823125A6B9400E71278 /* WebProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessCreationParameters.cpp; sourceTree = "<group>"; }; 2033 BC329D9916ACCE9900316DE2 /* WebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebArchive.cpp; sourceTree = "<group>"; }; 2034 BC329D9A16ACCE9900316DE2 /* WebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebArchive.h; sourceTree = "<group>"; }; 2035 BC329D9E16ACD47800316DE2 /* WebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebArchiveResource.cpp; sourceTree = "<group>"; }; 2036 BC329D9F16ACD47800316DE2 /* WebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebArchiveResource.h; sourceTree = "<group>"; }; 2037 BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchive.cpp; sourceTree = "<group>"; }; 2038 BC329DA616ACE5A900316DE2 /* WKWebArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchive.h; sourceTree = "<group>"; }; 2039 BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKWebArchiveResource.cpp; sourceTree = "<group>"; }; 2040 BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebArchiveResource.h; sourceTree = "<group>"; }; 2025 2041 BC33DD671238464600360F3F /* WebNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNumber.h; sourceTree = "<group>"; }; 2026 2042 BC33E0CF12408E8600360F3F /* InjectedBundleRangeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleRangeHandle.h; sourceTree = "<group>"; }; … … 2982 2998 1A0F29C9120B37160053D1B9 /* VisitedLinkTable.cpp */, 2983 2999 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */, 3000 BC329D9916ACCE9900316DE2 /* WebArchive.cpp */, 3001 BC329D9A16ACCE9900316DE2 /* WebArchive.h */, 3002 BC329D9E16ACD47800316DE2 /* WebArchiveResource.cpp */, 3003 BC329D9F16ACD47800316DE2 /* WebArchiveResource.h */, 2984 3004 518D2CAB12D5153B003BB93B /* WebBackForwardListItem.cpp */, 2985 3005 518D2CAC12D5153B003BB93B /* WebBackForwardListItem.h */, … … 4145 4165 BC407625124FF0400068F20A /* WKURLResponseNS.h */, 4146 4166 BC407626124FF0400068F20A /* WKURLResponseNS.mm */, 4167 BC329DA516ACE5A900316DE2 /* WKWebArchive.cpp */, 4168 BC329DA616ACE5A900316DE2 /* WKWebArchive.h */, 4169 BC329DA916ACE5BF00316DE2 /* WKWebArchiveResource.cpp */, 4170 BC329DAA16ACE5C000316DE2 /* WKWebArchiveResource.h */, 4147 4171 ); 4148 4172 path = mac; … … 5320 5344 519B4FF516A9EA970066874D /* SchedulableLoader.h in Headers */, 5321 5345 E1E552C516AE065F004ED653 /* SandboxInitializationParameters.h in Headers */, 5346 C5E1AFE916B20B75006CC1F2 /* WKWebArchive.h in Headers */, 5347 C5E1AFEB16B20B7E006CC1F2 /* WKWebArchiveResource.h in Headers */, 5348 C5E1AFED16B21017006CC1F2 /* WebArchive.h in Headers */, 5349 C5E1AFEF16B21029006CC1F2 /* WebArchiveResource.h in Headers */, 5322 5350 1AAC4DE716B1CBF6009425E3 /* WebKeyValueStorageManager.h in Headers */, 5323 5351 1AD3306F16B1D991004F60E7 /* StorageAreaProxy.h in Headers */, … … 6430 6458 519B4FF416A9EA970066874D /* SchedulableLoader.cpp in Sources */, 6431 6459 E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */, 6460 C5E1AFE816B20B67006CC1F2 /* WKWebArchive.cpp in Sources */, 6461 C5E1AFEA16B20B7B006CC1F2 /* WKWebArchiveResource.cpp in Sources */, 6462 C5E1AFEC16B21012006CC1F2 /* WebArchive.cpp in Sources */, 6463 C5E1AFEE16B21025006CC1F2 /* WebArchiveResource.cpp in Sources */, 6432 6464 1AAC4DE616B1CBF6009425E3 /* WebKeyValueStorageManager.cpp in Sources */, 6433 6465 1AD3306E16B1D991004F60E7 /* StorageAreaProxy.cpp in Sources */, -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h
r141448 r141473 293 293 typedef bool (*WKBundlePageShouldApplyStyle)(WKBundlePageRef page, WKBundleCSSStyleDeclarationRef style, WKBundleRangeHandleRef range, const void* clientInfo); 294 294 typedef void (*WKBundlePageEditingNotification)(WKBundlePageRef page, WKStringRef notificationName, const void* clientInfo); 295 typedef void (*WKBundlePageWillWriteToPasteboard)(WKBundlePageRef page, WKBundleRangeHandleRef range, const void* clientInfo); 296 typedef void (*WKBundlePageGetPasteboardDataForRange)(WKBundlePageRef page, WKBundleRangeHandleRef range, WKArrayRef* pasteboardTypes, WKArrayRef* pasteboardData, const void* clientInfo); 297 typedef void (*WKBundlePageDidWriteToPasteboard)(WKBundlePageRef page, const void* clientInfo); 295 298 296 299 struct WKBundlePageEditorClient { … … 308 311 WKBundlePageEditingNotification didChange; 309 312 WKBundlePageEditingNotification didChangeSelection; 313 // Version 1. 314 WKBundlePageWillWriteToPasteboard willWriteToPasteboard; 315 WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange; 316 WKBundlePageDidWriteToPasteboard didWriteToPasteboard; 310 317 }; 311 318 typedef struct WKBundlePageEditorClient WKBundlePageEditorClient; 312 319 313 enum { kWKBundlePageEditorClientCurrentVersion = 0};320 enum { kWKBundlePageEditorClientCurrentVersion = 1 }; 314 321 315 322 // Form client -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
r95901 r141473 27 27 #include "InjectedBundlePageEditorClient.h" 28 28 29 #include "ImmutableArray.h" 29 30 #include "InjectedBundleNodeHandle.h" 30 31 #include "InjectedBundleRangeHandle.h" 31 32 #include "WKAPICast.h" 32 33 #include "WKBundleAPICast.h" 34 #include "WKString.h" 35 #include "WebData.h" 33 36 #include <wtf/text/WTFString.h> 34 37 … … 126 129 } 127 130 131 void InjectedBundlePageEditorClient::willWriteToPasteboard(WebPage* page, Range* range) 132 { 133 if (m_client.willWriteToPasteboard) { 134 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 135 m_client.willWriteToPasteboard(toAPI(page), toAPI(rangeHandle.get()), m_client.clientInfo); 136 } 137 } 138 139 void InjectedBundlePageEditorClient::getPasteboardDataForRange(WebPage* page, Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) 140 { 141 if (m_client.getPasteboardDataForRange) { 142 RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(range); 143 WKArrayRef types = 0; 144 WKArrayRef data = 0; 145 m_client.getPasteboardDataForRange(toAPI(page), toAPI(rangeHandle.get()), &types, &data, m_client.clientInfo); 146 RefPtr<ImmutableArray> typesArray = adoptRef(toImpl(types)); 147 RefPtr<ImmutableArray> dataArray = adoptRef(toImpl(data)); 148 149 pasteboardTypes.clear(); 150 pasteboardData.clear(); 151 152 if (!typesArray || !dataArray) 153 return; 154 155 ASSERT(typesArray->size() == dataArray->size()); 156 157 size_t size = typesArray->size(); 158 for (size_t i = 0; i < size; ++i) { 159 WebString* type = typesArray->at<WebString>(i); 160 if (type) 161 pasteboardTypes.append(type->string()); 162 } 163 164 size = dataArray->size(); 165 for (size_t i = 0; i < size; ++i) { 166 WebData* item = dataArray->at<WebData>(i); 167 if (item) { 168 RefPtr<SharedBuffer> buffer = SharedBuffer::create(item->bytes(), item->size()); 169 pasteboardData.append(buffer); 170 } 171 } 172 } 173 } 174 175 void InjectedBundlePageEditorClient::didWriteToPasteboard(WebPage* page) 176 { 177 if (m_client.didWriteToPasteboard) 178 m_client.didWriteToPasteboard(toAPI(page), m_client.clientInfo); 179 } 180 128 181 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h
r95901 r141473 30 30 #include "WKBundlePage.h" 31 31 #include <WebCore/EditorInsertAction.h> 32 #include <WebCore/SharedBuffer.h> 32 33 #include <WebCore/TextAffinity.h> 33 34 #include <wtf/Forward.h> … … 37 38 class Node; 38 39 class Range; 40 class SharedBuffer; 39 41 } 40 42 … … 57 59 void didChange(WebPage*, StringImpl* notificationName); 58 60 void didChangeSelection(WebPage*, StringImpl* notificationName); 61 void willWriteToPasteboard(WebPage*, WebCore::Range*); 62 void getPasteboardDataForRange(WebPage*, WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData); 63 void didWriteToPasteboard(WebPage*); 59 64 }; 60 65 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
r139023 r141473 221 221 void WebEditorClient::didWriteSelectionToPasteboard() 222 222 { 223 notImplemented(); 223 m_page->injectedBundleEditorClient().didWriteToPasteboard(m_page); 224 } 225 226 void WebEditorClient::willWriteSelectionToPasteboard(Range* range) 227 { 228 m_page->injectedBundleEditorClient().willWriteToPasteboard(m_page, range); 229 } 230 231 void WebEditorClient::getClientPasteboardDataForRange(Range* range, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) 232 { 233 m_page->injectedBundleEditorClient().getPasteboardDataForRange(m_page, range, pasteboardTypes, pasteboardData); 224 234 } 225 235 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
r141387 r141473 68 68 virtual void respondToChangedSelection(WebCore::Frame*) OVERRIDE; 69 69 virtual void didEndEditing() OVERRIDE; 70 virtual void willWriteSelectionToPasteboard(WebCore::Range*) OVERRIDE; 70 71 virtual void didWriteSelectionToPasteboard() OVERRIDE; 72 virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) OVERRIDE; 71 73 virtual void didSetSelectionTypesForPasteboard() OVERRIDE; 72 74 -
trunk/Tools/ChangeLog
r141471 r141473 1 2013-01-31 Enrica Casucci <enrica@apple.com> 2 3 WebKit2: provide new bundle APIs to allow bundle clients to be notified of pasteboard access. 4 https://bugs.webkit.org/show_bug.cgi?id=108396. 5 <rdar://problem/12920461> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Adding new WebKit2 test with relevant bundle, to test the new APIs. 10 11 * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: 12 * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications.mm: Added. 13 (TestWebKitAPI::didReceiveMessageFromInjectedBundle): 14 (TestWebKitAPI::setInjectedBundleClient): 15 * TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp: Added. 16 (PasteboardNotificationsTest): 17 (TestWebKitAPI::willWriteToPasteboard): 18 (TestWebKitAPI::getPasteboardDataForRange): 19 (TestWebKitAPI::didWriteToPasteboard): 20 (TestWebKitAPI::PasteboardNotificationsTest::PasteboardNotificationsTest): 21 (TestWebKitAPI::PasteboardNotificationsTest::didCreatePage): 22 * TestWebKitAPI/Tests/WebKit2/execCopy.html: Added. 23 * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp: Updated to reflect 24 changes in InjectedBundleEditorClient. 25 (WTR::InjectedBundlePage::InjectedBundlePage): 26 1 27 2013-01-31 Rouslan Solomakhin <rouslan@chromium.org> 2 28 -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
r141011 r141473 184 184 C540F776152E4DA000A40C8C /* SimplifyMarkup.mm in Sources */ = {isa = PBXBuildFile; fileRef = C540F775152E4DA000A40C8C /* SimplifyMarkup.mm */; }; 185 185 C540F784152E5A9A00A40C8C /* verboseMarkup.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C540F783152E5A7800A40C8C /* verboseMarkup.html */; }; 186 C54237F016B8955800E638FC /* PasteboardNotifications.mm in Sources */ = {isa = PBXBuildFile; fileRef = C54237EE16B8955800E638FC /* PasteboardNotifications.mm */; }; 187 C54237F116B8957D00E638FC /* PasteboardNotifications_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C54237ED16B8955800E638FC /* PasteboardNotifications_Bundle.cpp */; }; 188 C5E1AFFE16B221F1006CC1F2 /* execCopy.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C5E1AFFD16B22179006CC1F2 /* execCopy.html */; }; 186 189 CD5497B415857F0C00B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497B315857F0C00B5BC30 /* MediaTime.cpp */; }; 187 190 E1220DA0155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1220D9F155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm */; }; … … 227 230 dstSubfolderSpec = 7; 228 231 files = ( 232 C5E1AFFE16B221F1006CC1F2 /* execCopy.html in Copy Resources */, 229 233 1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */, 230 234 379028B914FAC24C007E6B43 /* acceptsFirstMouse.html in Copy Resources */, … … 457 461 C540F775152E4DA000A40C8C /* SimplifyMarkup.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SimplifyMarkup.mm; sourceTree = "<group>"; }; 458 462 C540F783152E5A7800A40C8C /* verboseMarkup.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = verboseMarkup.html; sourceTree = "<group>"; }; 463 C54237ED16B8955800E638FC /* PasteboardNotifications_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PasteboardNotifications_Bundle.cpp; sourceTree = "<group>"; }; 464 C54237EE16B8955800E638FC /* PasteboardNotifications.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PasteboardNotifications.mm; sourceTree = "<group>"; }; 465 C5E1AFFD16B22179006CC1F2 /* execCopy.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = execCopy.html; sourceTree = "<group>"; }; 459 466 CD5497B315857F0C00B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MediaTime.cpp; path = WTF/MediaTime.cpp; sourceTree = "<group>"; }; 460 467 E1220D9F155B25480013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryCacheDisableWithinResourceLoadDelegate.mm; sourceTree = "<group>"; }; … … 656 663 52E5CE4514D21E9D003B2BD8 /* ParentFrame.cpp */, 657 664 52E5CE4814D21EAB003B2BD8 /* ParentFrame_Bundle.cpp */, 665 C54237EE16B8955800E638FC /* PasteboardNotifications.mm */, 666 C54237ED16B8955800E638FC /* PasteboardNotifications_Bundle.cpp */, 658 667 333B9CE11277F23100FEFCE3 /* PreventEmptyUserAgent.cpp */, 659 668 F6FDDDD214241AD4004F1729 /* PrivateBrowsingPushStateNoHistoryCallback.cpp */, … … 717 726 C045F9461385C2F800C0F3CD /* 18-characters.html */, 718 727 76E182DE15475A8300F1FADD /* auto-submitting-form.html */, 728 C5E1AFFD16B22179006CC1F2 /* execCopy.html */, 719 729 BC2D004A12A9FEB300E732A3 /* file-with-anchor.html */, 720 730 1A02C84B125D4A5E00E3F4BD /* find.html */, … … 1075 1085 BC9099941256ACF100083756 /* WKStringJSString.cpp in Sources */, 1076 1086 265AF55015D1E48A00B0CB4A /* WTFString.cpp in Sources */, 1087 C54237F016B8955800E638FC /* PasteboardNotifications.mm in Sources */, 1077 1088 ); 1078 1089 runOnlyForDeploymentPostprocessing = 0; … … 1110 1121 76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */, 1111 1122 BC901E331492AF390074A667 /* WKConnection_Bundle.cpp in Sources */, 1123 C54237F116B8957D00E638FC /* PasteboardNotifications_Bundle.cpp in Sources */, 1112 1124 ); 1113 1125 runOnlyForDeploymentPostprocessing = 0; -
trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
r141448 r141473 389 389 didEndEditing, 390 390 didChange, 391 didChangeSelection 391 didChangeSelection, 392 0, /* willWriteToPasteboard */ 393 0, /* getPasteboardDataForRange */ 394 0 /* didWriteToPasteboard */ 392 395 }; 393 396 WKBundlePageSetEditorClient(m_page, &editorClient);
Note: See TracChangeset
for help on using the changeset viewer.