Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout 327d9e9efbf7 (bug 773760) for bustage

Browse Source
This commit is contained in:
Ed Morley 2012-08-14 16:23:02 +01:00
parent 8441153d6c
commit 5381ebd3cb
6 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/ipc/ContentParent.cpp
View File

@ -686,9 +686,7 @@ ContentParent::RecvReadPermissions(InfallibleTArray<IPC::Permission>* aPermissio
}
bool
ContentParent::RecvSetClipboardText(const nsString& text,
const bool& isPrivateData,
const PRInt32& whichClipboard)
ContentParent::RecvSetClipboardText(const nsString& text, const PRInt32& whichClipboard)
{
nsresult rv;
nsCOMPtr<nsIClipboard> clipboard(do_GetService(kCClipboardCID, &rv));
@ -707,7 +705,6 @@ ContentParent::RecvSetClipboardText(const nsString& text,
// If our data flavor has already been added, this will fail. But we don't care
trans->AddDataFlavor(kUnicodeMime);
trans->SetIsPrivateData(isPrivateData);
nsCOMPtr<nsISupports> nsisupportsDataWrapper =
do_QueryInterface(dataWrapper);

2
dom/ipc/ContentParent.h
View File

@ -201,7 +201,7 @@ private:
virtual bool RecvReadPermissions(InfallibleTArray<IPC::Permission>* aPermissions);
virtual bool RecvSetClipboardText(const nsString& text, const bool& isPrivateData, const PRInt32& whichClipboard);
virtual bool RecvSetClipboardText(const nsString& text, const PRInt32& whichClipboard);
virtual bool RecvGetClipboardText(const PRInt32& whichClipboard, nsString* text);
virtual bool RecvEmptyClipboard();
virtual bool RecvClipboardHasText(bool* hasText);

2
dom/ipc/PContent.ipdl
View File

@ -279,7 +279,7 @@ parent:
// These clipboard methods are only really used on Android since
// the clipboard is not available in the content process.
SetClipboardText(nsString text, bool isPrivateData, PRInt32 whichClipboard);
SetClipboardText(nsString text, PRInt32 whichClipboard);
sync GetClipboardText(PRInt32 whichClipboard)
returns (nsString text);
EmptyClipboard();

4
widget/android/nsClipboard.cpp
View File

@ -50,9 +50,7 @@ nsClipboard::SetData(nsITransferable *aTransferable,
return NS_ERROR_NOT_IMPLEMENTED;
} else {
ContentChild::GetSingleton()->SendSetClipboardText(buffer,
aTransferable->GetIsPrivateData(),
aWhichClipboard);
ContentChild::GetSingleton()->SendSetClipboardText(buffer, aWhichClipboard);
}
return NS_OK;

9
widget/nsITransferable.idl
View File

@ -81,7 +81,7 @@ interface nsIFlavorDataProvider : nsISupports
};
[scriptable, uuid(5a611a60-e5b5-11e1-aff1-0800200c9a66)]
[scriptable, uuid(983cb266-535b-4ca5-8ef2-2cee08d061e6)]
interface nsITransferable : nsISupports
{
const long kFlavorHasDataProvider = 0;
@ -172,12 +172,7 @@ interface nsITransferable : nsISupports
attribute nsIFormatConverter converter;
/**
* Use of the SetIsPrivateData() method generated by isPrivateData attribute should
* be avoided as much as possible because the value set may not reflect the status
* of the context in which the transferable was created.
*/
[noscript] attribute boolean isPrivateData;
[noscript] readonly attribute boolean isPrivateData;
};

11
widget/xpwidgets/nsTransferable.cpp
View File

@ -621,14 +621,3 @@ nsTransferable::GetIsPrivateData(bool *aIsPrivateData)
return NS_OK;
}
NS_IMETHODIMP
nsTransferable::SetIsPrivateData(bool aIsPrivateData)
{
MOZ_ASSERT(mInitialized);
mPrivateData = aIsPrivateData;
return NS_OK;
}