Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1879631 part 2 - also check clipboard contents in HTML format r=dlp-reviewers,handyman

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D207193
This commit is contained in:
Greg Stoll 2024-05-02 13:41:52 +00:00
parent d1036b03a9
commit dbb58806f6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toolkit/components/contentanalysis/ContentAnalysis.cpp
View File

@ -1769,10 +1769,10 @@ ClipboardContentAnalysisResult CheckClipboardContentAnalysisAsText(
uint64_t aInnerWindowId,
ContentAnalysis::SafeContentAnalysisResultCallback* aResolver,
nsIURI* aDocumentURI, nsIContentAnalysis* aContentAnalysis,
nsITransferable* aTextTrans) {
nsITransferable* aTextTrans, const char* aFlavor) {
nsCOMPtr<nsISupports> transferData;
if (NS_FAILED(aTextTrans->GetTransferData(kTextMime,
getter_AddRefs(transferData)))) {
if (NS_FAILED(
aTextTrans->GetTransferData(aFlavor, getter_AddRefs(transferData)))) {
return false;
}
nsCOMPtr<nsISupportsString> textData = do_QueryInterface(transferData);
@ -1923,14 +1923,27 @@ void ContentAnalysis::CheckClipboardContentAnalysis(
if (keepChecking) {
// Failed to get the clipboard data as a file, so try as text
auto textResult = CheckClipboardContentAnalysisAsText(
innerWindowId, aResolver, currentURI, contentAnalysis, aTransferable);
innerWindowId, aResolver, currentURI, contentAnalysis, aTransferable,
kTextMime);
if (textResult.isErr()) {
aResolver->Callback(
ContentAnalysisResult::FromNoResult(textResult.unwrapErr()));
return;
}
if (!textResult.unwrap()) {
// Couldn't get file or text data from this
keepChecking = !textResult.unwrap();
}
if (keepChecking) {
// Failed to get the clipboard data as a file or text, so try as html
auto htmlResult = CheckClipboardContentAnalysisAsText(
innerWindowId, aResolver, currentURI, contentAnalysis, aTransferable,
kHTMLMime);
if (htmlResult.isErr()) {
aResolver->Callback(
ContentAnalysisResult::FromNoResult(htmlResult.unwrapErr()));
return;
}
if (!htmlResult.unwrap()) {
// Couldn't get file or text or html data from this
aResolver->Callback(ContentAnalysisResult::FromNoResult(
NoContentAnalysisResult::ALLOW_DUE_TO_COULD_NOT_GET_DATA));
return;