Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: webkit/api/src/ChromiumBridge.cpp

Issue 174367: Change the ChromiumPasteboard to have a notion of an alternate clipboard... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/api/src/AssertMatchingEnums.cpp ('k') | webkit/glue/webclipboard_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include <wtf/Assertions.h> 65 #include <wtf/Assertions.h>
66 66
67 // We are part of the WebKit implementation. 67 // We are part of the WebKit implementation.
68 using namespace WebKit; 68 using namespace WebKit;
69 69
70 namespace WebCore { 70 namespace WebCore {
71 71
72 // Clipboard ------------------------------------------------------------------ 72 // Clipboard ------------------------------------------------------------------
73 73
74 bool ChromiumBridge::clipboardIsFormatAvailable( 74 bool ChromiumBridge::clipboardIsFormatAvailable(
75 PasteboardPrivate::ClipboardFormat format) 75 PasteboardPrivate::ClipboardFormat format,
76 PasteboardPrivate::ClipboardBuffer buffer)
76 { 77 {
77 return webKitClient()->clipboard()->isFormatAvailable( 78 return webKitClient()->clipboard()->isFormatAvailable(
78 static_cast<WebClipboard::Format>(format)); 79 static_cast<WebClipboard::Format>(format),
80 static_cast<WebClipboard::Buffer>(buffer));
79 } 81 }
80 82
81 String ChromiumBridge::clipboardReadPlainText() 83 String ChromiumBridge::clipboardReadPlainText(
84 PasteboardPrivate::ClipboardBuffer buffer)
82 { 85 {
83 return webKitClient()->clipboard()->readPlainText(); 86 return webKitClient()->clipboard()->readPlainText(
87 static_cast<WebClipboard::Buffer>(buffer));
84 } 88 }
85 89
86 void ChromiumBridge::clipboardReadHTML(String* htmlText, KURL* sourceURL) 90 void ChromiumBridge::clipboardReadHTML(
91 PasteboardPrivate::ClipboardBuffer buffer,
92 String* htmlText, KURL* sourceURL)
87 { 93 {
88 WebURL url; 94 WebURL url;
89 *htmlText = webKitClient()->clipboard()->readHTML(&url); 95 *htmlText = webKitClient()->clipboard()->readHTML(
96 static_cast<WebClipboard::Buffer>(buffer), &url);
90 *sourceURL = url; 97 *sourceURL = url;
91 } 98 }
92 99
93 void ChromiumBridge::clipboardWriteSelection(const String& htmlText, 100 void ChromiumBridge::clipboardWriteSelection(const String& htmlText,
94 const KURL& sourceURL, 101 const KURL& sourceURL,
95 const String& plainText, 102 const String& plainText,
96 bool writeSmartPaste) 103 bool writeSmartPaste)
97 { 104 {
98 webKitClient()->clipboard()->writeHTML( 105 webKitClient()->clipboard()->writeHTML(
99 htmlText, sourceURL, plainText, writeSmartPaste); 106 htmlText, sourceURL, plainText, writeSmartPaste);
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 499
493 return webKitClient()->visitedLinkHash(buffer.data(), buffer.length()); 500 return webKitClient()->visitedLinkHash(buffer.data(), buffer.length());
494 } 501 }
495 502
496 bool ChromiumBridge::isLinkVisited(WebCore::LinkHash visitedLinkHash) 503 bool ChromiumBridge::isLinkVisited(WebCore::LinkHash visitedLinkHash)
497 { 504 {
498 return webKitClient()->isLinkVisited(visitedLinkHash); 505 return webKitClient()->isLinkVisited(visitedLinkHash);
499 } 506 }
500 507
501 } // namespace WebCore 508 } // namespace WebCore
OLDNEW
« no previous file with comments | « webkit/api/src/AssertMatchingEnums.cpp ('k') | webkit/glue/webclipboard_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698