wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1221151 - use [infallible] in nsILoadInfo.idl instead of manual %{C++ blocks; r=jduell

Browse Source 
Using [infallible] generates the exact same code as we already have in
the %{C++ blocks.  Let's get rid of the %{C++ blocks.
This commit is contained in:
Nathan Froyd 2015-11-03 10:51:24 -05:00
parent 47e170b140
commit ca779d91d5
1 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
netwerk/base/nsILoadInfo.idl
View File

@ -26,7 +26,7 @@ typedef unsigned long nsSecurityFlags;
/**
* An nsILoadOwner represents per-load information about who started the load.
*/
[scriptable, builtinclass, uuid(99abb145-29d2-4a0a-8bca-213fa6211cc9)]
[scriptable, builtinclass, uuid(45a4a9e1-b50d-468a-a01c-43de5c38c8db)]
interface nsILoadInfo : nsISupports
{
/**
@ -293,17 +293,7 @@ interface nsILoadInfo : nsISupports
* Warning: If the loadingDocument is null, then the
* upgradeInsecureRequests is false.
*/
readonly attribute boolean upgradeInsecureRequests;
%{ C++
inline bool GetUpgradeInsecureRequests()
{
bool result;
mozilla::DebugOnly<nsresult> rv = GetUpgradeInsecureRequests(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
%}
[infallible] readonly attribute boolean upgradeInsecureRequests;
/**
* Typically these are the window IDs of the window in which the element being
@ -317,35 +307,9 @@ interface nsILoadInfo : nsISupports
* available. parentOuterWindowID will be the same as outerWindowID if the
* window has no parent.
*/
readonly attribute unsigned long long innerWindowID;
readonly attribute unsigned long long outerWindowID;
readonly attribute unsigned long long parentOuterWindowID;
%{ C++
inline uint64_t GetInnerWindowID()
{
uint64_t result;
mozilla::DebugOnly<nsresult> rv = GetInnerWindowID(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
inline uint64_t GetOuterWindowID()
{
uint64_t result;
mozilla::DebugOnly<nsresult> rv = GetOuterWindowID(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
inline uint64_t GetParentOuterWindowID()
{
uint64_t result;
mozilla::DebugOnly<nsresult> rv = GetParentOuterWindowID(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
%}
[infallible] readonly attribute unsigned long long innerWindowID;
[infallible] readonly attribute unsigned long long outerWindowID;
[infallible] readonly attribute unsigned long long parentOuterWindowID;
/**
* Customized OriginAttributes within LoadInfo to allow overwriting of the
@ -380,17 +344,7 @@ interface nsILoadInfo : nsISupports
* to anything else than true will be discareded.
*
*/
attribute bool enforceSecurity;
%{ C++
inline bool GetEnforceSecurity()
{
bool result;
mozilla::DebugOnly<nsresult> rv = GetEnforceSecurity(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
%}
[infallible] attribute boolean enforceSecurity;
/**
* Whenever a channel is evaluated by the ContentSecurityManager
@ -405,20 +359,10 @@ interface nsILoadInfo : nsISupports
*
* Please note, once the flag is set to true it must remain true
* throughout the lifetime of the channel. Trying to set it
* to anything else than true will be discareded.
* to anything else than true will be discarded.
*
*/
attribute bool initialSecurityCheckDone;
%{ C++
inline bool GetInitialSecurityCheckDone()
{
bool result;
mozilla::DebugOnly<nsresult> rv = GetInitialSecurityCheckDone(&result);
MOZ_ASSERT(NS_SUCCEEDED(rv));
return result;
}
%}
[infallible] attribute boolean initialSecurityCheckDone;
/**
* Whenever a channel gets redirected, append the principal of the